188 files changed, 52900 insertions, 44935 deletions

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 2637b73069..f123d751ff 100644
--- a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
@@ -49,7 +49,7 @@ msgstr "ERROR:"
 msgid "Firmware/OS (Kernel)"
 msgstr "Firmware"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: 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!"
 
@@ -88,12 +88,12 @@ msgstr "Reiniciar a partición alternativa ..."
 msgid "Reboot to current partition"
 msgstr "Reiniciar a la partición actual"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: 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:198
+#: 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:93
+#: 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:165
+#: 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:199
+#: 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 "
@@ -138,29 +138,29 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
 #: 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:120
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: 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: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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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 06e95ae159..5d66917ed1 100644
--- a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
@@ -50,7 +50,7 @@ msgstr "ОШИБК�:"
 msgid "Firmware/OS (Kernel)"
 msgstr "Прошивка/ОС (Ядро)"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: 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:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: 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:198
+#: 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:93
+#: 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:165
+#: 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:199
+#: 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 "
@@ -138,27 +138,27 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
 #: 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:120
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: 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: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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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 fdb5a84451..a793c24e99 100644
--- a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
@@ -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:113
+#: 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:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: 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:198
+#: 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:93
+#: 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:165
+#: 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:199
+#: 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 "
@@ -118,27 +118,27 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
 #: 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:120
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: 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: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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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 8f33fc9aa4..ab1ef12ff2 100644
--- a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
+++ b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Firmware/OS (Kernel)"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: 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:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: 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:198
+#: 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:93
+#: 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:165
+#: 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:199
+#: 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 "
@@ -115,27 +115,27 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
 #: 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:120
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: 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: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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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 c794d58b8b..a9a20e4937 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
@@ -48,7 +48,7 @@ msgstr "错误："
 msgid "Firmware/OS (Kernel)"
 msgstr "固件/OS（内核）"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: 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:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: 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:198
+#: 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:93
+#: 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:165
+#: 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:199
+#: 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 "
@@ -132,27 +132,27 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
 #: 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:120
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: 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: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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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 489bad2cf8..0ddcec8fd2 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
@@ -48,7 +48,7 @@ msgstr "錯誤："
 msgid "Firmware/OS (Kernel)"
 msgstr "韌體/OS（核心）"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: 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:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: 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:198
+#: 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:93
+#: 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:165
+#: 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:199
+#: 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 "
@@ -132,27 +132,27 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
 #: 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:120
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: 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: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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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:126
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: 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-banip/luasrc/controller/banip.lua b/applications/luci-app-banip/luasrc/controller/banip.lua
index 42328d7ea4..6ada1d5167 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 277b8363ed..9ce6703a4e 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,38 +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
+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
 
-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
-
-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
 
-e7 = e:option(Flag, "ban_autoblacklist", translate("Local Save Blacklist Addons"),
+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."))
-e7.default = e7.enabled
-e7.rmempty = true
+e6.default = e6.enabled
+e6.rmempty = true
 
-e8 = e:option(Flag, "ban_autowhitelist", translate("Local Save Whitelist Addons"),
+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."))
-e8.default = e8.enabled
-e8.rmempty = true
+e7.default = e7.enabled
+e7.rmempty = true
 
 -- Optional Extra Options
 
@@ -149,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 410528130c..44682206b7 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 d0985d4d6e..e1a2015fd9 100644
--- a/applications/luci-app-banip/po/es/banip.po
+++ b/applications/luci-app-banip/po/es/banip.po
@@ -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:147
+#: 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,15 +38,12 @@ 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:135
+#: 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 "
@@ -68,28 +65,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:182
+#: 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:214
+#: 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"
 
@@ -101,15 +89,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:152
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
 msgid "Download Options"
 msgstr "Opciones de descarga"
 
@@ -117,7 +97,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)"
 
@@ -133,15 +113,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 "
@@ -151,7 +127,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"
 
@@ -163,7 +139,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."
@@ -179,18 +155,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 ""
+
 #: applications/luci-app-banip/luasrc/controller/banip.lua:18
 msgid "IPSet-Lookup"
 msgstr "Búsqueda de IPSet"
@@ -206,23 +182,23 @@ msgstr ""
 msgid "Interface Selection"
 msgstr "Selección de interfaz"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
+#: 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:203
+#: 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:166
+#: 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:198
+#: 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"
 
@@ -236,7 +212,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"
 
@@ -245,32 +221,28 @@ msgstr "Cargando"
 msgid "Loading ..."
 msgstr "CArgando..."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+#: 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:139
+#: 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:104
+#: 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 ""
@@ -300,34 +272,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 ""
+
+#: 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 "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 ""
 
-#: 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:176
+#: 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:208
+#: 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 ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
 #: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:26
@@ -335,7 +316,15 @@ 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 ""
+
+#: 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."
@@ -347,7 +336,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')."
@@ -355,7 +344,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:153
+#: 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'."
@@ -363,13 +352,15 @@ 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 ""
+
+#: 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."
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
 msgid ""
@@ -394,7 +385,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 "
@@ -484,11 +475,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:146
+#: 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"
 
@@ -496,23 +487,23 @@ 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:161
+#: 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:193
+#: 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:156
+#: 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:188
+#: 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:140
+#: 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 "
@@ -523,31 +514,69 @@ msgstr ""
 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 eed4393dc6..b477622eed 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:147
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
 msgid "Additional trigger delay in seconds before banIP processing begins."
 msgstr ""
 
@@ -25,15 +25,12 @@ 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"
-msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+#: 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 "
@@ -53,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:182
+#: 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:214
+#: 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 ""
 
@@ -81,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:152
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
 msgid "Download Options"
 msgstr ""
 
@@ -95,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 ""
 
@@ -111,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 ""
 
@@ -127,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 ""
 
@@ -137,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."
@@ -151,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 ""
@@ -177,23 +158,23 @@ msgstr ""
 msgid "Interface Selection"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
+#: 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:203
+#: 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:166
+#: 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:198
+#: 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 ""
 
@@ -206,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 ""
 
@@ -215,32 +196,28 @@ msgstr ""
 msgid "Loading ..."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+#: 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:139
+#: 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:104
+#: 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:127
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
 msgid "Max. Download Queue"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
-msgstr ""
-
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:65
 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 ""
@@ -266,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:176
+#: 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:208
+#: 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
@@ -301,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."
@@ -311,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:153
+#: 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
@@ -346,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 ""
 
@@ -410,11 +408,11 @@ msgid ""
 "file (/etc/config/banip)."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: 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 ""
 
@@ -422,23 +420,23 @@ msgstr ""
 msgid "View Logfile"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: 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:193
+#: 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:156
+#: 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:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
 msgid "WAN Input Chain IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:140
+#: 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 "
@@ -449,31 +447,23 @@ msgstr ""
 msgid "Whois Information"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
-msgstr ""
-
 #: applications/luci-app-banip/luasrc/controller/banip.lua:16
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:10
 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-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 62b792da1f..78a6626266 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
@@ -84,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 + '"');
 		};
@@ -92,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);
 		};
 
@@ -165,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.'));
@@ -254,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>:'));
@@ -268,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++)
@@ -279,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 38f36b49c8..0000000000
--- 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 e0092a7a56..0000000000
--- 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 0b4774ccc0..0000000000
--- 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 b0c26cf6b0..b5b395fb9e 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -62,26 +62,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -93,15 +81,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Ajusts avançats"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -114,11 +102,11 @@ msgstr "Qualsevol"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -127,19 +115,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -167,8 +155,6 @@ msgid "Destination port"
 msgstr "Port de destí"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -235,7 +216,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr "Habilita protecció contra la inundació SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -243,7 +224,7 @@ msgstr "Habilita el registre d'aquesta zona"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -252,21 +233,15 @@ msgid "External IP address"
 msgstr "Adreça IP extern"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -274,7 +249,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -298,12 +273,12 @@ msgstr "Tallafocs - Regles de tràfic"
 msgid "Firewall - Zone Settings"
 msgstr "Tallafocs - Ajusts de zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Reenvia"
 
@@ -375,12 +350,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Només IPv4"
 
@@ -389,31 +364,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Adreça IP interna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Port intern"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limita els missatges de registre"
 
@@ -427,11 +399,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Mascarada"
 
@@ -463,11 +435,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nom"
 
@@ -475,28 +443,6 @@ 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: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."
@@ -517,17 +463,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Sortida"
 
@@ -536,7 +473,7 @@ msgstr "Sortida"
 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:230
+#: 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 "
@@ -558,7 +495,7 @@ 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:202
+#: 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."
@@ -566,8 +503,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -603,16 +538,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: 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"
 
@@ -660,8 +595,6 @@ msgstr "Port d'origen"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona d'origen"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -754,14 +687,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -791,17 +716,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -823,7 +748,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenviaments"
 
@@ -833,7 +758,7 @@ msgstr "Zones"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accepta"
 
@@ -882,7 +807,7 @@ msgstr "no rastregis"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "descarta"
 
@@ -915,7 +840,7 @@ msgstr ""
 
 #: 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:117
+#: 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 ea0f2a8259..b465d137f7 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -89,15 +77,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Pokro�ilé nastavení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -110,11 +98,11 @@ msgstr "Libovolné"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -123,19 +111,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -162,8 +150,6 @@ msgid "Destination port"
 msgstr "Cílový port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -230,7 +211,7 @@ msgstr "Povolit NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Povolit ochranu proti SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -238,7 +219,7 @@ msgstr "Povolit logování v této oblasti"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -247,21 +228,15 @@ msgid "External IP address"
 msgstr "Vnější IP adresa"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -269,7 +244,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -293,12 +268,12 @@ msgstr "Firewall - Pravidla síťového provozu"
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Nastavení zón"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Přesměrování"
 
@@ -370,12 +345,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "pouze IPv4"
 
@@ -384,31 +359,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Vnitřní IP adresa"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Vnitřní port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Vnitřní zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Omezit logovací zprávy"
 
@@ -422,11 +394,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Maškárádování"
 
@@ -458,11 +430,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Název"
 
@@ -470,28 +438,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
@@ -512,17 +458,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Výstup"
 
@@ -531,7 +468,7 @@ msgstr "Výstup"
 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:230
+#: 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 "
@@ -554,7 +491,7 @@ 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:202
+#: 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."
@@ -562,8 +499,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -600,16 +535,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Omezit na rodinu adres"
 
@@ -657,8 +592,6 @@ msgstr "Zdrojový port"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zdrojová zóna"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -750,14 +683,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -787,17 +712,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -819,7 +744,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Přesměrování"
 
@@ -829,7 +754,7 @@ msgstr "Zóny"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "přijmout"
 
@@ -878,7 +803,7 @@ msgstr "nesledovat"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "zahodit"
 
@@ -911,7 +836,7 @@ msgstr ""
 
 #: 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:117
+#: 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 3b287bc227..23ab725a58 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -112,11 +100,11 @@ msgstr "beliebig"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -165,8 +153,6 @@ msgid "Destination port"
 msgstr "Zielport"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -233,7 +214,7 @@ msgstr "NAT-Loopback aktivieren"
 msgid "Enable SYN-flood protection"
 msgstr "Schutz vor SYN-flood-Attacken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -241,7 +222,7 @@ msgstr "Protokollierung innerhalb der Zone aktivieren"
 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:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -250,21 +231,15 @@ msgid "External IP address"
 msgstr "Externe IP-Adresse"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -272,7 +247,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -296,12 +271,12 @@ msgstr "Firewall - Traffic-Regeln"
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Zoneneinstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Weitergeleitet"
 
@@ -373,12 +348,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "nur IPv4"
 
@@ -387,31 +362,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Eingehend"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Interne IP-Adresse"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Interner Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Interne Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Protokollnachrichten limitieren"
 
@@ -425,11 +397,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "NAT aktivieren"
 
@@ -461,11 +433,7 @@ msgstr "Monatstage"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Name"
 
@@ -473,28 +441,6 @@ 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 "Neue Weiterleitungsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Neue eingehende 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 "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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Selektiere nur Traffic der an die angegebene IP-Adresse gerichtet ist."
@@ -513,17 +459,8 @@ msgid ""
 "range on the client host"
 msgstr "Selektiere nur Traffic 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"
-
-#: 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Ausgehend"
 
@@ -534,7 +471,7 @@ msgstr ""
 "Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
 "benutzen!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +493,7 @@ 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:202
+#: 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."
@@ -564,8 +501,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -604,16 +539,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Beschränke auf Adressfamilie"
 
@@ -661,8 +596,6 @@ msgstr "Quellport"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Quell-Zone"
 
@@ -694,8 +627,8 @@ msgstr ""
 "Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
 "den Netzwerk-Traffic zu trennen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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 "
@@ -713,7 +646,7 @@ msgstr ""
 "<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:88
+#: 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 "
@@ -757,14 +690,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -794,17 +719,17 @@ msgstr "Unbenannte Portweiterleitung"
 msgid "Unnamed rule"
 msgstr "Unbennante Regel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -826,7 +751,7 @@ msgstr "Mittwoch"
 msgid "Week Days"
 msgstr "Wochentage"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Weiterleitungen"
 
@@ -838,7 +763,7 @@ msgstr "Zonen"
 # 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "zulassen"
 
@@ -887,7 +812,7 @@ msgstr "nicht verfolgen"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "verwerfen"
 
@@ -920,7 +845,7 @@ msgstr ""
 
 #: 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:117
+#: 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 7e22a93958..04cb7c343e 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Ρυθμίσεις για π�οχω�ημένους"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -112,11 +100,11 @@ msgstr "Οποιοδήποτε"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -161,8 +149,6 @@ msgid "Destination port"
 msgstr "Θ��α π�οο�ισμο�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 #, 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:205
+#: 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"
@@ -231,7 +212,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr "Π�οστασία SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -239,7 +220,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -248,21 +229,15 @@ msgid "External IP address"
 msgstr "Εξωτε�ική διε�θυνση IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -270,7 +245,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -294,12 +269,12 @@ msgstr "Τείχος π�οστασίας - Κανόνες Κίνησεις"
 msgid "Firewall - Zone Settings"
 msgstr "Τείχος π�οστασίας - Ρυθμίσεις Ζώνης"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Π�οώθηση"
 
@@ -371,12 +346,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Μόνο IPv4"
 
@@ -385,33 +360,30 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Εσωτε�ική διε�θυνση"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 #, fuzzy
 msgid "Internal port"
 msgstr "Εξωτε�ική θ��α"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Εσωτε�ική ζώνη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Πε�ιο�ισμός καταγ�αφών συστήματος"
 
@@ -425,12 +397,12 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -460,11 +432,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Όνομα"
 
@@ -472,28 +440,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -512,17 +458,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Έξοδος"
 
@@ -531,7 +468,7 @@ msgstr "Έξοδος"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -551,7 +488,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -559,8 +496,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Π�ωτόκολλο"
 
@@ -596,16 +531,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -655,8 +590,6 @@ msgstr "Θ��α πηγής"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 #, fuzzy
 msgid "Source zone"
 msgstr "Θ��α πηγής"
@@ -689,8 +622,8 @@ msgstr ""
 "Το τείχος π�οστασίας δημιου�γεί ζώνες πάνω στις διεπαφές δικτ�ου για να "
 "ελέγχει την δικτυακή κίνηση."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -737,14 +670,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +728,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -813,7 +738,7 @@ msgstr "Ζώνες"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "αποδοχή"
 
@@ -862,7 +787,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "αγνόηση"
 
@@ -895,7 +820,7 @@ msgstr ""
 
 #: 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:117
+#: 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 c089c8a27d..e38a33d2a6 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -89,15 +77,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -110,11 +98,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -123,19 +111,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -159,8 +147,6 @@ msgid "Destination port"
 msgstr "Destination port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -227,7 +208,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr "Enable SYN-flood protection"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -235,7 +216,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -244,21 +225,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -266,7 +241,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -294,12 +269,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Forward"
 
@@ -371,12 +346,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -385,31 +360,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Internal IP address"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Internal port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -423,11 +395,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Masquerading"
 
@@ -459,11 +431,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Name"
 
@@ -471,28 +439,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -511,17 +457,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Output"
 
@@ -530,7 +467,7 @@ msgstr "Output"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -550,7 +487,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -558,8 +495,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -596,16 +531,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -683,8 +618,6 @@ msgstr "Source port"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Source zone"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -764,14 +697,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -798,17 +723,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -830,7 +755,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -840,7 +765,7 @@ msgstr "Zones"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accept"
 
@@ -889,7 +814,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "drop"
 
@@ -922,7 +847,7 @@ msgstr ""
 
 #: 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:117
+#: 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 54bd644674..a2a6b2a379 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -61,19 +61,7 @@ msgstr "Aceptar salida"
 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:243
+#: 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:233
+#: 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."
@@ -98,15 +86,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -119,11 +107,11 @@ msgstr "Cualquiera"
 msgid "Any day"
 msgstr "Cualquier día"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -134,19 +122,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr "Configuraciones de Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "Subredes cubiertas"
 
@@ -174,8 +162,6 @@ msgid "Destination port"
 msgstr "Puerto de destino"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -245,7 +226,7 @@ msgstr "Habilitar bucle NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Habilitar protección contra inundaciones SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -253,7 +234,7 @@ msgstr "Habilitar registro en esta zona"
 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:212
+#: 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 "
@@ -264,21 +245,15 @@ msgid "External IP address"
 msgstr "Dirección IP externa"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "Argumentos de destino adicionales"
 
@@ -286,7 +261,7 @@ msgstr "Argumentos de destino adicionales"
 msgid "Extra iptables arguments"
 msgstr "Argumentos adicionales de iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "Argumentos fuente adicionales"
 
@@ -310,12 +285,12 @@ msgstr "Firewall - Reglas de tráfico"
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configuración de la zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Reenviar"
 
@@ -387,12 +362,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Sólo IPv4"
 
@@ -401,31 +376,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Dirección IP interna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Puerto interno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limitar registro de mensajes"
 
@@ -439,11 +411,11 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MACs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Enmascaramiento"
 
@@ -475,11 +447,7 @@ msgstr "Días del mes"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nombre"
 
@@ -487,28 +455,6 @@ 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: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."
@@ -529,17 +475,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Salida"
 
@@ -548,7 +485,7 @@ msgstr "Salida"
 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:230
+#: 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 "
@@ -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:202
+#: 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,8 +523,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -627,16 +562,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: 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"
 
@@ -684,8 +619,6 @@ msgstr "Puerto de origen"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona de origen"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -778,14 +711,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -815,11 +740,11 @@ msgstr "Reenvío sin nombre"
 msgid "Unnamed rule"
 msgstr "Regla sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -851,7 +776,7 @@ msgstr "Miércoles"
 msgid "Week Days"
 msgstr "Días de la semana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenvíos"
 
@@ -861,7 +786,7 @@ msgstr "Zonas"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "Aceptar"
 
@@ -910,7 +835,7 @@ msgstr "No seguir"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "Descartar"
 
@@ -943,7 +868,7 @@ msgstr "Puertos"
 
 #: 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:117
+#: 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 ""
+
 #: 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 64f7f3a383..7da22682bd 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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> :"
 
@@ -112,11 +100,11 @@ msgstr "N'importe lequel"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -161,8 +149,6 @@ msgid "Destination port"
 msgstr "Port de destination"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -229,7 +210,7 @@ msgstr "Activer le NAT sur la boucle-locale"
 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:218
+#: 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"
 
@@ -237,7 +218,7 @@ msgstr "Activer les traces (logs) sur cette zone"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -246,21 +227,15 @@ msgid "External IP address"
 msgstr "Adresse IP externe"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -268,7 +243,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -296,12 +271,12 @@ msgstr "Pare-feu -- Règles de trafic"
 msgid "Firewall - Zone Settings"
 msgstr "Pare-feu - Configuration des zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Transfert"
 
@@ -373,12 +348,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "IPv4 seulement"
 
@@ -387,31 +362,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Adresse IP interne"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Port interne"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zone interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limiter les messages de journalisation"
 
@@ -425,11 +397,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Masquage"
 
@@ -461,11 +433,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nom"
 
@@ -473,28 +441,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -513,17 +459,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Sortie"
 
@@ -532,7 +469,7 @@ msgstr "Sortie"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -554,7 +491,7 @@ 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:202
+#: 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."
@@ -562,8 +499,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -601,20 +536,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Restreindre à cette famille d'adresses"
 
@@ -692,8 +627,6 @@ msgstr "Port source"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zone source"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -787,14 +720,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -821,17 +746,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -853,7 +778,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Transmissions"
 
@@ -863,7 +788,7 @@ msgstr "Zones"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accepter"
 
@@ -913,7 +838,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "ignorer"
 
@@ -946,7 +871,7 @@ msgstr ""
 
 #: 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:117
+#: 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 169711141b..b5e2e9a8d4 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -86,15 +74,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -107,11 +95,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -120,19 +108,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -156,8 +144,6 @@ msgid "Destination port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -224,7 +205,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -232,7 +213,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -241,21 +222,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -263,7 +238,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -287,12 +262,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -364,12 +339,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -378,31 +353,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -416,11 +388,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -450,11 +422,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -462,28 +430,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -502,17 +448,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -521,7 +458,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +478,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -549,8 +486,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -586,16 +521,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -643,8 +578,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -674,8 +607,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -722,14 +655,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -788,7 +713,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -798,7 +723,7 @@ msgstr ""
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
@@ -847,7 +772,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -880,7 +805,7 @@ msgstr ""
 
 #: 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:117
+#: 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 202217a854..000c19f3d0 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -89,15 +77,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -110,11 +98,11 @@ msgstr "Bármelyik"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -123,19 +111,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -163,8 +151,6 @@ msgid "Destination port"
 msgstr "Cél port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -231,7 +212,7 @@ msgstr "NAT visszacsatolás engedélyezése"
 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:218
+#: 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"
 
@@ -239,7 +220,7 @@ msgstr "Naplózás engeélyezése ezen a zónán"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -248,21 +229,15 @@ msgid "External IP address"
 msgstr "Külső IP cím"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -270,7 +245,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -294,12 +269,12 @@ msgstr "Tűzfal - Forgalmi szabályok"
 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:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Továbbítás"
 
@@ -371,12 +346,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "csak IPv4"
 
@@ -385,31 +360,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Belső IP cím"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Belső port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Belső zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Napló üzenetek korlátozása"
 
@@ -423,11 +395,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "�lcázás"
 
@@ -459,11 +431,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Név"
 
@@ -471,28 +439,6 @@ 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: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."
@@ -515,17 +461,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Kimenet"
 
@@ -535,7 +472,7 @@ 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:230
+#: 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 "
@@ -558,7 +495,7 @@ 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:202
+#: 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."
@@ -566,8 +503,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -603,16 +538,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: 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"
 
@@ -660,8 +595,6 @@ msgstr "Forrás port"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Forrás zóna"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -755,14 +688,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -792,17 +717,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -824,7 +749,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Továbbítások"
 
@@ -834,7 +759,7 @@ msgstr "Zónák"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "elfogadás"
 
@@ -883,7 +808,7 @@ msgstr "ne kövesse"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "eldobás"
 
@@ -916,7 +841,7 @@ msgstr ""
 
 #: 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:117
+#: 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 107a4d3a1c..aa522e2f24 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Opzioni Avanzate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -112,11 +100,11 @@ msgstr "Qualsiasi"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -165,8 +153,6 @@ msgid "Destination port"
 msgstr "Porta di destinazione"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -233,7 +214,7 @@ msgstr "Attiva NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Attiva protezione SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -241,7 +222,7 @@ msgstr "Attiva registro su questa zona"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -250,21 +231,15 @@ msgid "External IP address"
 msgstr "Indirizzo IP Esterno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -272,7 +247,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -296,12 +271,12 @@ msgstr "Firewall - Regole Traffico"
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Opzioni delle Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Inoltra"
 
@@ -373,12 +348,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Solo IPv4"
 
@@ -387,31 +362,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Indirizzo IP interno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Porta interna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limita messaggi del registro"
 
@@ -425,11 +397,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -461,11 +433,7 @@ msgstr "Giorni del Mese"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nome"
 
@@ -473,28 +441,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
@@ -515,17 +461,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -534,7 +471,7 @@ msgstr ""
 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:230
+#: 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,7 +493,7 @@ 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:202
+#: 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."
@@ -564,8 +501,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -601,16 +536,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Riavvia Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Limita agli indirizzi famiglia"
 
@@ -679,8 +614,6 @@ msgstr "Porta di origine"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona di origine"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -773,14 +706,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -810,17 +735,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -842,7 +767,7 @@ msgstr "Mercoledì"
 msgid "Week Days"
 msgstr "Giorni della Settimana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Inoltri"
 
@@ -852,7 +777,7 @@ msgstr "Zone"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accetta"
 
@@ -901,7 +826,7 @@ msgstr "non tracciare"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "scarta"
 
@@ -934,7 +859,7 @@ msgstr ""
 
 #: 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:117
+#: 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 8a1b4f2506..85702e60de 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -61,19 +61,7 @@ msgstr "出力を許�"
 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:243
+#: 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:233
+#: 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."
@@ -98,15 +86,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em>宛先ゾーン</em>��転�を許��る:"
 
@@ -119,11 +107,11 @@ msgstr "全�"
 msgid "Any day"
 msgstr "全日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -134,19 +122,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr "Conntrack 設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "カ�ー�れるサブ�ット"
 
@@ -174,8 +162,6 @@ msgid "Destination port"
 msgstr "宛先�ート"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -245,7 +226,7 @@ msgstr "NATループ�ックを有効��る"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-Floodプロテクションを有効��る"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "��ゾーン�ログ記録を有効��る"
 
@@ -253,7 +234,7 @@ msgstr "��ゾーン�ログ記録を有効��る"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "実験的�機能��。 QoS/SQM ��完全�互�性��り��ん。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "ゾーン トラフィック�コ�クション追跡ヘルパーを明示的��択���。"
 
@@ -262,21 +243,15 @@ msgid "External IP address"
 msgstr "外部IPアドレス"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "追加��信先引数"
 
@@ -284,7 +259,7 @@ msgstr "追加��信先引数"
 msgid "Extra iptables arguments"
 msgstr "追加� iptables 引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "追加��信元引数"
 
@@ -308,12 +283,12 @@ msgstr "ファイアウォール - トラフィック・ルール"
 msgid "Firewall - Zone Settings"
 msgstr "ファイアウォール - ゾーン設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "転�"
 
@@ -385,12 +360,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "IPv4��"
 
@@ -399,31 +374,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "内部IPアドレス"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "内部�ート"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "内部ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "ログメッセージを制�"
 
@@ -437,11 +409,11 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "マスカレード"
 
@@ -473,11 +445,7 @@ msgstr "月間"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "��"
 
@@ -485,28 +453,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "設定�れ�宛先IPアドレス�一致���信トラフィック�対象��り��。"
@@ -529,17 +475,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "�信"
 
@@ -550,7 +487,7 @@ msgstr ""
 "iptables�パススルー�る追加�引数を設定������。����注���設定�"
 "�����!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -578,7 +515,7 @@ msgstr ""
 "ベート��ットワーク上��特定�コンピュータやサービス��アクセスを�能��"
 "��。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -588,8 +525,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -627,16 +562,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "ファイアウォール��起動"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "アドレスファミリ�制�"
 
@@ -684,8 +619,6 @@ msgstr "�信元�ート"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "�信元ゾーン"
 
@@ -717,8 +650,8 @@ msgstr ""
 "ファイアウォール機能����ットワークインターフェース上�ゾーンを作���ト"
 "ラフィック�制御を行���。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -776,14 +709,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -813,11 +738,11 @@ msgstr "�称未設定�転�"
 msgid "Unnamed rule"
 msgstr "�称未設定�ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -849,7 +774,7 @@ msgstr "水曜日"
 msgid "Week Days"
 msgstr "曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "ゾーン ⇒ 転�"
 
@@ -859,7 +784,7 @@ msgstr "ゾーン"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "許�"
 
@@ -908,7 +833,7 @@ msgstr "コ�クション追跡を行���"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "破棄"
 
@@ -941,7 +866,7 @@ msgstr "�ート"
 
 #: 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:117
+#: 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 a7dd7801a4..c916d1122f 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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 허용:"
 
@@ -112,11 +100,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -164,8 +152,6 @@ msgid "Destination port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -232,7 +213,7 @@ msgstr "NAT Loopback 활성화"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood protection 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "zone � logging 활성화"
 
@@ -240,7 +221,7 @@ msgstr "zone � logging 활성화"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -249,21 +230,15 @@ msgid "External IP address"
 msgstr "외부 IP 주소"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -271,7 +246,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -295,12 +270,12 @@ msgstr "방화벽 - Traffic Rules"
 msgid "Firewall - Zone Settings"
 msgstr "방화벽 - Zone 설정"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -372,12 +347,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -386,31 +361,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "내부 IP 주소"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "내부 port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "내부 zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -424,11 +396,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -458,11 +430,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "�름"
 
@@ -470,28 +438,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -510,17 +456,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -529,7 +466,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "iptables 명령� 추가 ��들� �합니다.  조심해 사용하세요!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -551,7 +488,7 @@ msgstr ""
 "Port forwarding 기능� �터넷 �� �격 컴퓨터가 내부 LAN � �한 특정 컴퓨터"
 "나 서비스� 접�할 수 있�� 합니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -559,8 +496,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -596,16 +531,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Address family 제한"
 
@@ -653,8 +588,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -686,8 +619,8 @@ msgstr ""
 "방화벽 기능� �용하여 네트워� �터페�스와 연결� zone � �성할 수 있고 �"
 "를 �용하여 네트워� traffic flow 를 제어할 수 있습니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -746,14 +679,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -783,17 +708,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +740,7 @@ msgstr "수요�"
 msgid "Week Days"
 msgstr "주�"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -825,7 +750,7 @@ msgstr "Zone ë‚´ì—­"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
@@ -874,7 +799,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -907,7 +832,7 @@ msgstr ""
 
 #: 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:117
+#: 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 7a93f6b661..56a0f053ef 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -54,26 +54,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -85,15 +73,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -106,11 +94,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -119,19 +107,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -155,8 +143,6 @@ msgid "Destination port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -223,7 +204,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -231,7 +212,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -240,21 +221,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -262,7 +237,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -286,12 +261,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -363,12 +338,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -377,31 +352,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -415,11 +387,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -449,11 +421,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -461,28 +429,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -501,17 +447,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -520,7 +457,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +477,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -548,8 +485,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -585,16 +520,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -642,8 +577,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -673,8 +606,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -721,14 +654,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -755,17 +680,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -787,7 +712,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -797,7 +722,7 @@ msgstr ""
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
@@ -846,7 +771,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -879,7 +804,7 @@ msgstr ""
 
 #: 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:117
+#: 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 b9c3b1a809..625a6a363b 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -86,15 +74,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -107,11 +95,11 @@ msgstr "Enhver"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -120,19 +108,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -159,8 +147,6 @@ msgid "Destination port"
 msgstr "Destinasjon port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -227,7 +208,7 @@ msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
 msgid "Enable SYN-flood protection"
 msgstr "Aktiver SYN-flood beskyttelse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -235,7 +216,7 @@ msgstr "Aktiver logging av denne sonen"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -244,21 +225,15 @@ msgid "External IP address"
 msgstr "Ekstern IP adressse"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -266,7 +241,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -290,13 +265,13 @@ msgstr "Brannmur - Trafikk Regler"
 msgid "Firewall - Zone Settings"
 msgstr "Brannmur - Sone Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Videresend"
 
@@ -368,12 +343,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Kun IPv4"
 
@@ -382,31 +357,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Intern IP adresse"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Intern port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Intern sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Begrens logging"
 
@@ -420,11 +392,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Masquerading"
 
@@ -456,11 +428,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Navn"
 
@@ -468,28 +436,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
@@ -510,17 +456,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Utdata"
 
@@ -529,7 +466,7 @@ msgstr "Utdata"
 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:230
+#: 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 "
@@ -551,7 +488,7 @@ 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:202
+#: 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."
@@ -559,8 +496,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -598,16 +533,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Begrens til adresse familie"
 
@@ -655,8 +590,6 @@ msgstr "Kilde port"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Kilde sone"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -749,14 +682,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -786,17 +711,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +743,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Sone = Videresendinger"
 
@@ -828,7 +753,7 @@ msgstr "Soner"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "godta"
 
@@ -877,7 +802,7 @@ msgstr "ikke track"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "forkast"
 
@@ -910,7 +835,7 @@ msgstr ""
 
 #: 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:117
+#: 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 242adf48e0..5c96d57b79 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -62,26 +62,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -93,15 +81,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -114,11 +102,11 @@ msgstr "Każdy"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -127,19 +115,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -166,8 +154,6 @@ msgid "Destination port"
 msgstr "Port docelowy"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -234,7 +215,7 @@ msgstr "WÅ‚Ä…cz NAT Loopback"
 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:218
+#: 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"
 
@@ -242,7 +223,7 @@ msgstr "WÅ‚Ä…cz logowanie na tej strefy"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -251,21 +232,15 @@ msgid "External IP address"
 msgstr "Zewnętrzne adresy IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -273,7 +248,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -300,12 +275,12 @@ msgstr "Zapora - Reguły ruchu"
 msgid "Firewall - Zone Settings"
 msgstr "Zapora - Ustawienia strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Przekazuj"
 
@@ -377,12 +352,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Tylko IPv4"
 
@@ -391,31 +366,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Wewnętrzny adres IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Wewnętrzny port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Strefa wewnętrzna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Ograniczenie logowania"
 
@@ -429,11 +401,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Maskarada"
 
@@ -465,11 +437,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nazwa"
 
@@ -477,28 +445,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Dopasuj tylko przychodzÄ…cy ruch skierowany do danego adresu IP."
@@ -519,17 +465,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Wyjście (Output)"
 
@@ -539,7 +476,7 @@ 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:230
+#: 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 "
@@ -561,7 +498,7 @@ 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:202
+#: 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."
@@ -569,8 +506,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -608,18 +543,18 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Ogranicz do rodziny adresów"
 
@@ -667,8 +602,6 @@ msgstr "Port źródłowy"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Strefa źródłowa"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -760,14 +693,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -797,17 +722,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -829,7 +754,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Strefa ⇒ Przekazywanie"
 
@@ -839,7 +764,7 @@ msgstr "Strefy"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "akceptuj"
 
@@ -888,7 +813,7 @@ msgstr "nie śledź"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "porzucaj"
 
@@ -921,7 +846,7 @@ msgstr ""
 
 #: 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:117
+#: 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 608dfbc520..6926402548 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -60,26 +60,14 @@ msgstr "Aceitar a saída"
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -112,11 +100,11 @@ msgstr "Qualquer"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -164,8 +152,6 @@ msgid "Destination port"
 msgstr "Porta de destino"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -232,7 +213,7 @@ msgstr "Habilite o Loopback do NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Habilite proteção contra SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -241,7 +222,7 @@ 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:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -250,21 +231,15 @@ msgid "External IP address"
 msgstr "Endereço IP externo"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -272,7 +247,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -296,12 +271,12 @@ msgstr "Firewall - Regras de Tráfego"
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configurações de Zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Encaminhar"
 
@@ -373,12 +348,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Somente IPv4"
 
@@ -387,31 +362,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Endereço IP interno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Porta Interna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limita as mensagens de registro"
 
@@ -425,11 +397,11 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MACs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Mascaramento"
 
@@ -461,11 +433,7 @@ msgstr "Dias do mês"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nome"
 
@@ -473,28 +441,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -516,17 +462,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Saída"
 
@@ -535,7 +472,7 @@ msgstr "Saída"
 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:230
+#: 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 "
@@ -557,7 +494,7 @@ 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:202
+#: 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."
@@ -565,8 +502,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -603,16 +538,16 @@ 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:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: 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"
 
@@ -660,8 +595,6 @@ msgstr "Porta de origem"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona de origem"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -753,14 +686,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -790,17 +715,17 @@ msgstr "Encaminhamento sem nome"
 msgid "Unnamed rule"
 msgstr "Regra sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +747,7 @@ msgstr "Quarta-feira"
 msgid "Week Days"
 msgstr "Dias da semana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
@@ -832,7 +757,7 @@ msgstr "Zonas"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "aceitar"
 
@@ -881,7 +806,7 @@ msgstr "não rastrear"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "descartar"
 
@@ -914,7 +839,7 @@ msgstr "portas"
 
 #: 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:117
+#: 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 349f4c369f..281c6b17b3 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Definições Avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>"
 
@@ -112,11 +100,11 @@ msgstr "Qualquer"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -165,8 +153,6 @@ msgid "Destination port"
 msgstr "Porta de destino"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -233,7 +214,7 @@ msgstr "Ativar NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Ativar a Proteção SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Ativar registo nesta zona"
 
@@ -241,7 +222,7 @@ msgstr "Ativar registo nesta zona"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -250,21 +231,15 @@ msgid "External IP address"
 msgstr "Endereço IP externo"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -272,7 +247,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -296,12 +271,12 @@ msgstr "Firewall - Regras de Tráfego"
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Definições de Zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Encaminhar"
 
@@ -373,12 +348,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Só IPv4"
 
@@ -387,31 +362,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Endereço IP interno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Porta interna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limitar registo de mensagens"
 
@@ -425,12 +397,12 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -462,11 +434,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nome"
 
@@ -474,28 +442,6 @@ 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: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."
@@ -516,17 +462,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Saída"
 
@@ -535,7 +472,7 @@ msgstr "Saída"
 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:230
+#: 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 "
@@ -557,7 +494,7 @@ 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:202
+#: 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."
@@ -565,8 +502,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -604,16 +539,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: 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"
 
@@ -661,8 +596,6 @@ msgstr "Porta de origem"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona de origem"
 
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -742,14 +675,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -779,17 +704,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +736,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
@@ -821,7 +746,7 @@ msgstr "Zonas"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "aceitar"
 
@@ -870,7 +795,7 @@ msgstr "não seguir"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "drop"
 
@@ -903,7 +828,7 @@ msgstr ""
 
 #: 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:117
+#: 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 472948d4b7..30d3d89e5d 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -59,26 +59,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -90,15 +78,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Setări avansate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>."
 
@@ -111,11 +99,11 @@ msgstr "Oricare"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -124,19 +112,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -160,8 +148,6 @@ msgid "Destination port"
 msgstr "Portul destinatie"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -228,7 +209,7 @@ msgstr "Activează loopback NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Activează protecţia SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -236,7 +217,7 @@ msgstr "Activeaza log in aceasta zona"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -245,21 +226,15 @@ msgid "External IP address"
 msgstr "Adresă IP externă"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -267,7 +242,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -291,12 +266,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Setari zona la firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Forward"
 
@@ -368,12 +343,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "doar IPv4"
 
@@ -382,31 +357,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Adresa IP interna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Port intern"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zonă internă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limitează mesaje în log"
 
@@ -420,11 +392,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Translatare"
 
@@ -454,11 +426,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Nume"
 
@@ -466,28 +434,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -506,17 +452,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "IeÅŸire"
 
@@ -525,7 +462,7 @@ msgstr "IeÅŸire"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +482,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -553,8 +490,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -590,16 +525,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -647,8 +582,6 @@ msgstr "Port sursa"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona sursa"
 
@@ -678,8 +611,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -726,14 +659,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -760,17 +685,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -792,7 +717,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -802,7 +727,7 @@ msgstr "Zone"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accept"
 
@@ -851,7 +776,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -884,7 +809,7 @@ msgstr ""
 
 #: 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:117
+#: 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 1ddb6a580e..ca8dc439c0 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -62,19 +62,7 @@ msgstr "Принимать и�ход�щий трафик"
 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:243
+#: 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,7 +72,7 @@ msgstr ""
 "назначени�, например <code>-p tcp --dport 443</code> дл� �оответ�тви� только "
 "и�ход�щему HTTPS трафику."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: 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."
@@ -99,15 +87,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Дополнительные на�тройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Разрешить перенаправление в <em>'зоны назначени�'</em>:"
 
@@ -120,11 +108,11 @@ msgstr "Любой"
 msgid "Any day"
 msgstr "Любой день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -135,19 +123,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr "От�леживание �оединений (conntrack)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "Охватываемые под�ети"
 
@@ -175,8 +163,6 @@ msgid "Destination port"
 msgstr "Порт назначени�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Зона назначени�"
 
@@ -199,7 +185,7 @@ msgstr "Отклон�ть вход�щий трафик"
 msgid "Discard output"
 msgstr "Отклон�ть и�ход�щий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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."
@@ -208,11 +194,6 @@ 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 "�е перезапи�ывать"
-
 #: 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"
@@ -246,7 +227,7 @@ msgstr "Включить NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Включить защиту от SYN-flood атак"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Включить журналирование в �той зоне"
 
@@ -254,7 +235,7 @@ msgstr "Включить журналирование в �той зоне"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Эк�периментальный функционал. �е полно�тью �овме�тим � QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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) от�леживани� "
@@ -265,21 +246,15 @@ msgid "External IP address"
 msgstr "Внешний IP-адре�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "Дополнительные аргументы дл� назначени�"
 
@@ -287,7 +262,7 @@ msgstr "Дополнительные аргументы длÑ� назначенÐ
 msgid "Extra iptables arguments"
 msgstr "Дополнительные аргументы iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "Дополнительные аргументы дл� и�точника"
 
@@ -311,12 +286,12 @@ msgstr "Меж�етевой �кран - Правила дл� трафика"
 msgid "Firewall - Zone Settings"
 msgstr "Меж�етевой �кран - �а�тройка зон"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Перенаправление"
 
@@ -388,12 +363,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Только IPv4"
 
@@ -402,31 +377,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Внутренний IP-адре�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Внутренний порт"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Внутренн�� зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Ограничить журнал �ообщений"
 
@@ -440,11 +412,11 @@ msgstr "MAC-адре�"
 msgid "MACs"
 msgstr "MAC-адре�а"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Ма�карадинг"
 
@@ -476,11 +448,7 @@ msgstr "Дни ме��ца"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Им�"
 
@@ -488,28 +456,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -533,17 +479,8 @@ 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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "И�ход�щий трафик"
 
@@ -554,7 +491,7 @@ msgstr ""
 "Передаёт дополнительные аргументы таблице iptables. И�пользуйте � "
 "о�торожно�тью!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -581,7 +518,7 @@ msgstr ""
 "Перенаправленные портов позвол�ет удалённым компьютерам из Интернета "
 "�оедин�ть�� � компьютером или �лужбой внутри ча�тной локальной �ети."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -591,8 +528,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -631,16 +566,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Перезапу�тить меж�етевой �кран"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "И�пользовать протокол"
 
@@ -688,8 +623,6 @@ msgstr "Порт и�точника"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Зона и�точника"
 
@@ -719,8 +652,8 @@ msgid ""
 "traffic flow."
 msgstr "Меж�етевой �кран �оздает зоны в вашей �ети дл� контрол� трафика."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -780,14 +713,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -817,11 +742,11 @@ msgstr "Перенаправление без имени"
 msgid "Unnamed rule"
 msgstr "Правило без имени"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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,7 +754,7 @@ msgstr ""
 "И�пользуйте �ту опцию дл� кла��ификации трафика зоны по �етевым у�трой�твам, "
 "управл�емым не через <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: 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."
@@ -853,7 +778,7 @@ msgstr "Среда"
 msgid "Week Days"
 msgstr "Дни недели"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Перенаправлени�"
 
@@ -863,7 +788,7 @@ msgstr "Зоны"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "принимать"
 
@@ -912,7 +837,7 @@ msgstr "не от�леживать"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "не обрабатывать"
 
@@ -945,7 +870,7 @@ msgstr "порты"
 
 #: 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:117
+#: 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 fa91b5605a..40ea67f271 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -86,15 +74,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -107,11 +95,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -120,19 +108,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -156,8 +144,6 @@ msgid "Destination port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -224,7 +205,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -232,7 +213,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -241,21 +222,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -263,7 +238,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -287,12 +262,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -364,12 +339,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -378,31 +353,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -416,11 +388,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -450,11 +422,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -462,28 +430,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -502,17 +448,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -521,7 +458,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +478,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -549,8 +486,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -586,16 +521,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -643,8 +578,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -674,8 +607,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -722,14 +655,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -788,7 +713,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -798,7 +723,7 @@ msgstr ""
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
@@ -847,7 +772,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -880,7 +805,7 @@ msgstr ""
 
 #: 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:117
+#: 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 4d81c1ae9c..d885c03986 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -56,26 +56,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -87,15 +75,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: 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>:"
 
@@ -108,11 +96,11 @@ msgstr "Alla"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -121,19 +109,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -157,8 +145,6 @@ msgid "Destination port"
 msgstr "Destinationsport"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -225,7 +206,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: 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"
 
@@ -233,7 +214,7 @@ msgstr "Aktivera loggning i den här zonen"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -242,21 +223,15 @@ msgid "External IP address"
 msgstr "Extern IP-adress"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -264,7 +239,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -288,12 +263,12 @@ msgstr "Brandvägg - Trafikregler"
 msgid "Firewall - Zone Settings"
 msgstr "Brandvägg - Zoninställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Vidarebefordra"
 
@@ -365,12 +340,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Endast IPv4"
 
@@ -379,31 +354,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Intern IP-adress"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Intern port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Intern zon"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Begränsa loggmeddelanden"
 
@@ -417,11 +389,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Maskering"
 
@@ -453,11 +425,7 @@ msgstr "Dagar i månaden"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "Namn"
 
@@ -465,28 +433,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -506,17 +452,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Utmatning"
 
@@ -525,7 +462,7 @@ msgstr "Utmatning"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +482,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -553,8 +490,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -590,16 +525,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Starta om brandvägg"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Begränsa till adressfamilj"
 
@@ -647,8 +582,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -678,8 +611,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -726,14 +659,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -760,17 +685,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -792,7 +717,7 @@ msgstr "Onsdag"
 msgid "Week Days"
 msgstr "Veckodagar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -802,7 +727,7 @@ msgstr "Zoner"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "acceptera"
 
@@ -851,7 +776,7 @@ msgstr "spåra inte"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "släpp"
 
@@ -884,7 +809,7 @@ msgstr ""
 
 #: 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:117
+#: 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 753309b69d..492d8aa8e4 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -48,26 +48,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -79,15 +67,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -100,11 +88,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -113,19 +101,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -149,8 +137,6 @@ msgid "Destination port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -217,7 +198,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -225,7 +206,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -234,21 +215,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -256,7 +231,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -280,12 +255,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -357,12 +332,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -371,31 +346,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -409,11 +381,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -443,11 +415,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -455,28 +423,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -495,17 +441,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -514,7 +451,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +471,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -542,8 +479,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -579,16 +514,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -636,8 +571,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -667,8 +600,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -715,14 +648,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -749,17 +674,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -781,7 +706,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -791,7 +716,7 @@ msgstr ""
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
@@ -840,7 +765,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -873,7 +798,7 @@ msgstr ""
 
 #: 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:117
+#: 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 5dc58f7810..1113306375 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -86,15 +74,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -107,11 +95,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -120,19 +108,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -156,8 +144,6 @@ msgid "Destination port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -224,7 +205,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -232,7 +213,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -241,21 +222,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -263,7 +238,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -287,12 +262,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -364,12 +339,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -378,31 +353,28 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -416,11 +388,11 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -450,11 +422,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -462,28 +430,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -502,17 +448,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
@@ -521,7 +458,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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,7 +478,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -549,8 +486,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -586,16 +521,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -643,8 +578,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
@@ -674,8 +607,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -722,14 +655,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -788,7 +713,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -798,7 +723,7 @@ msgstr ""
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
@@ -847,7 +772,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -880,7 +805,7 @@ msgstr ""
 
 #: 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:117
+#: 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 f1a9a084b7..10386f52a1 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -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"
@@ -955,3 +888,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 "�овий NAT джерела"
+
+#~ 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/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 6cda161c22..31868bac62 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
 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:243
+#: 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:233
+#: 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."
@@ -91,15 +79,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -112,11 +100,11 @@ msgstr ""
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -125,19 +113,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -161,8 +149,6 @@ msgid "Destination port"
 msgstr "Cổng điểm đến"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 #, 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:205
+#: 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"
@@ -231,7 +212,7 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood bảo vệ "
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
@@ -239,7 +220,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -248,21 +229,15 @@ msgid "External IP address"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -270,7 +245,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -294,12 +269,12 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
@@ -371,12 +346,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -385,33 +360,30 @@ msgid "IPv6"
 msgstr ""
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Internal address"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 #, fuzzy
 msgid "Internal port"
 msgstr "External port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -425,12 +397,12 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
@@ -460,11 +432,7 @@ msgstr ""
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -472,28 +440,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -512,17 +458,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Output"
 
@@ -531,7 +468,7 @@ msgstr "Output"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -551,7 +488,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -559,8 +496,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
@@ -596,16 +531,16 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
@@ -655,8 +590,6 @@ msgstr "Cổng nguồn"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 #, fuzzy
 msgid "Source zone"
 msgstr "Cổng nguồn"
@@ -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:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -737,14 +670,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr ""
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +728,7 @@ msgstr ""
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
@@ -813,7 +738,7 @@ msgstr "Zones"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "chấp nhận"
 
@@ -862,7 +787,7 @@ msgstr ""
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "drop"
 
@@ -895,7 +820,7 @@ msgstr ""
 
 #: 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:117
+#: 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 5264f5105e..28cd88b5c9 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -58,26 +58,14 @@ msgstr "接�出站"
 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:243
+#: 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:233
+#: 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."
@@ -89,15 +77,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "�许转�到<em>目标区域</em>："
 
@@ -110,11 +98,11 @@ msgstr "任何"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -123,19 +111,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -161,8 +149,6 @@ msgid "Destination port"
 msgstr "目标端�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -229,7 +210,7 @@ msgstr "�用 NAT 环回"
 msgid "Enable SYN-flood protection"
 msgstr "�用 SYN-flood 防御"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "�用此区域的日志记录"
 
@@ -237,7 +218,7 @@ msgstr "�用此区域的日志记录"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "实验特性。与 QoS/SQM �完全兼容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -246,21 +227,15 @@ msgid "External IP address"
 msgstr "外部 IP 地�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -268,7 +243,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -292,12 +267,12 @@ msgstr "防�墙 - 通信规则"
 msgid "Firewall - Zone Settings"
 msgstr "防�墙 - 区域设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "转�"
 
@@ -369,12 +344,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "ä»… IPv4"
 
@@ -383,31 +358,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "内部 IP 地�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "内部端�"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "内部区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "�制日志信�"
 
@@ -421,11 +393,11 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "IP 动�伪装"
 
@@ -455,11 +427,7 @@ msgstr "日期"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "�字"
 
@@ -467,28 +435,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "仅匹�指定目的 IP 地�的入站��。"
@@ -507,17 +453,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "出站数�"
 
@@ -526,7 +463,7 @@ msgstr "出站数�"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "传递到 iptables 的�外�数。�心使用�"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -547,7 +484,7 @@ msgid ""
 msgstr ""
 "端�转��许 Internet 上的远程计算机连接到内部网络中的特定计算机或�务。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -555,8 +492,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "�议"
 
@@ -592,16 +527,16 @@ msgstr "需�硬件 NAT 支�。目� mt7621 已实现"
 msgid "Restart Firewall"
 msgstr "��防�墙"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "�制地�"
 
@@ -649,8 +584,6 @@ msgstr "�端�"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "�区域"
 
@@ -680,8 +613,8 @@ msgid ""
 "traffic flow."
 msgstr "防�墙通过在网络接�上创建区域�控制网络��。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -735,14 +668,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr "未命�转�"
 msgid "Unnamed rule"
 msgstr "未命�规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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,7 +728,7 @@ msgstr "星期三"
 msgid "Week Days"
 msgstr "星期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "区域 ⇒ 转�"
 
@@ -813,7 +738,7 @@ msgstr "区域"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "接�"
 
@@ -862,7 +787,7 @@ msgstr "�跟踪"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "丢弃"
 
@@ -895,7 +820,7 @@ msgstr "端�"
 
 #: 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:117
+#: 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 de8aa416e6..9754bc7a57 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -58,26 +58,14 @@ msgstr "接�出站"
 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:243
+#: 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:233
+#: 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."
@@ -89,15 +77,15 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr "高階設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: 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:302
+#: 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:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "�許轉發到<em>目標�域</em>："
 
@@ -110,11 +98,11 @@ msgstr "任何"
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: 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:208
+#: 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 ""
@@ -123,19 +111,19 @@ msgstr ""
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: 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:173
+#: 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:133
+#: 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:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -161,8 +149,6 @@ msgid "Destination port"
 msgstr "目標埠"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 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:205
+#: 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"
@@ -229,7 +210,7 @@ msgstr "啟用 NAT 環回"
 msgid "Enable SYN-flood protection"
 msgstr "啟用 SYN-flood 防禦"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "啟用此�域的日誌記錄"
 
@@ -237,7 +218,7 @@ msgstr "啟用此�域的日誌記錄"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "實驗特性。與 QoS/SQM �完全相容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -246,21 +227,15 @@ msgid "External IP address"
 msgstr "外部 IP ��"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 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: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:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
@@ -268,7 +243,7 @@ msgstr ""
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -292,12 +267,12 @@ msgstr "防�牆 - 通訊�則"
 msgid "Firewall - Zone Settings"
 msgstr "防�牆 - �域設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "轉發"
 
@@ -369,12 +344,12 @@ 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:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: 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:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "僅 IPv4"
 
@@ -383,31 +358,28 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: 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:185
+#: 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:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: 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:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "內部 IP ��"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "內部埠"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "內部�域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "�制日誌資訊"
 
@@ -421,11 +393,11 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: 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:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "IP 動態��"
 
@@ -455,11 +427,7 @@ msgstr "日期"
 #: 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:92
-#: 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/zones.js:93
 msgid "Name"
 msgstr "�字"
 
@@ -467,28 +435,6 @@ 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:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "僅匹�指定目的 IP ��的入站��。"
@@ -507,17 +453,8 @@ msgid ""
 "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:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "出站資料"
 
@@ -526,7 +463,7 @@ msgstr "出站資料"
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "傳�到 iptables 的�外引數。�心使用�"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: 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 "
@@ -546,7 +483,7 @@ msgid ""
 "specific computer or service within the private LAN."
 msgstr "埠轉發�許 Internet 上的�端計算機連線到內部網路中的特定計算機或�務。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: 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."
@@ -554,8 +491,6 @@ msgstr ""
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "�議"
 
@@ -591,16 +526,16 @@ msgstr "需�硬體 NAT 支�。目� mt7621 已實�"
 msgid "Restart Firewall"
 msgstr "�啟防�牆"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: 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:188
+#: 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:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "�制��"
 
@@ -648,8 +583,6 @@ msgstr "�埠"
 
 #: 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
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "��域"
 
@@ -679,8 +612,8 @@ msgid ""
 "traffic flow."
 msgstr "防�牆通�在網路介�上建立�域來控制網路��。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: 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:88
+#: 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 "
@@ -734,14 +667,6 @@ 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:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
@@ -770,17 +695,17 @@ msgstr "未命�轉發"
 msgid "Unnamed rule"
 msgstr "未命��則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: 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:173
+#: 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:177
+#: 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."
@@ -802,7 +727,7 @@ msgstr "星期三"
 msgid "Week Days"
 msgstr "星期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "�域 ⇒ 轉發"
 
@@ -812,7 +737,7 @@ msgstr "�域"
 
 #: 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:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "接�"
 
@@ -861,7 +786,7 @@ msgstr "�跟蹤"
 
 #: 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:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "丟棄"
 
@@ -894,7 +819,7 @@ msgstr "埠"
 
 #: 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:117
+#: 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-simple-adblock/po/es/simple-adblock.po b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
index 6998d4d64c..14d02cd973 100644
--- a/applications/luci-app-simple-adblock/po/es/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
@@ -42,17 +42,14 @@ msgid "Basic Configuration"
 msgstr "Configuración básica"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr "URLs de dominio en lista negra"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "Dominios en la lista negra"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "URLs de hosts en lista negra"
 
@@ -64,10 +61,6 @@ msgstr "Errores recopilados"
 msgid "Configuration"
 msgstr "Configuración"
 
-#: 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 ""
@@ -134,21 +127,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "Forzar enrutador DNS"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 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/simpleadblock.lua:21
-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"
-
 #: 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 ""
@@ -163,18 +148,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -185,7 +162,6 @@ msgid "Info"
 msgstr "Info"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED para indicar estado"
 
@@ -196,7 +172,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 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 "
@@ -215,7 +190,6 @@ msgstr ""
 "ASCII; de lo contrario, DNSMASQ no se iniciará."
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "Configuración de verbosidad de salida"
 
@@ -224,7 +198,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "Elige el LED que no se haya usado en"
 
@@ -263,7 +236,6 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "Ajustes de Simple AdBlock "
 
@@ -272,14 +244,9 @@ msgid "Simultaneous processing"
 msgstr "Procesamiento simultáneo"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -297,12 +264,10 @@ 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:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "Suprimir salida"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "Configuración del sistema LED"
 
@@ -310,26 +275,14 @@ msgstr "Configuración del sistema LED"
 msgid "Task"
 msgstr "Tarea"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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:251
 msgid "URLs to lists of hosts to be blacklisted."
 msgstr ""
@@ -343,7 +296,6 @@ msgid "Use simultaneous processing"
 msgstr "Usar procesamiento simultáneo"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "Salida verbosa"
 
@@ -352,12 +304,10 @@ 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:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr "URLs de dominio en lista blanca"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "Dominios en lista blanca"
 
@@ -366,10 +316,35 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 ""
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 38ec1f074c..d6786289d3 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -42,17 +42,14 @@ msgid "Basic Configuration"
 msgstr "基本設定"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr "ドメイン ブラックリスト�URL"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "ブラックリスト ドメイン"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "hosts ブラックリスト�URL"
 
@@ -64,10 +61,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "設定"
 
-#: 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 ""
@@ -134,21 +127,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "ルーターDNS�強制"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 msgid "Force Router DNS server to all local devices"
 msgstr "全ローカル デ�イス�ルーター DNSサー�ー�使用を強制"
 
-#: 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 ""
@@ -163,18 +148,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -185,7 +162,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "ステータスを表示�るLED"
 
@@ -196,7 +172,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 msgid "Let local devices use their own DNS servers if set"
 msgstr "DNSサー�ー�使用を強制���"
 
@@ -211,7 +186,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "出力詳細度�設定"
 
@@ -220,7 +194,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "��設定�既�使用�れ����LEDを�択���"
 
@@ -259,7 +232,6 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "Simple AdBlock 設定"
 
@@ -268,14 +240,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -293,12 +260,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "出力�抑制"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "LED 設定"
 
@@ -306,26 +271,14 @@ msgstr "LED 設定"
 msgid "Task"
 msgstr ""
 
-#: 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/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/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:251
 msgid "URLs to lists of hosts to be blacklisted."
 msgstr ""
@@ -339,7 +292,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "詳細出力"
 
@@ -348,12 +300,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr "ホワイトリスト�ブラックリスト�管�"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr "ドメイン ホワイトリスト�URL"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "ホワイトリスト ドメイン"
 
@@ -362,10 +312,36 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 ��デ�ッグ出力を有効����。"
 
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 6b4686167e..1a1fe59021 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
@@ -41,17 +41,14 @@ msgid "Basic Configuration"
 msgstr "Configurações Básicas"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 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:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "Domínios para a Lista Negra"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "Endereços de Hosts para a Lista Negra"
 
@@ -63,12 +60,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuração"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-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
 msgid "Controls system log and console output verbosity."
 msgstr ""
@@ -135,21 +126,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "Forçar o DNS do Roteador"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 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/simpleadblock.lua:21
-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:157
 msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
@@ -164,18 +147,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -186,7 +161,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED para indicar o estado"
 
@@ -197,7 +171,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 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 "
@@ -214,7 +187,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "Definição do detalhamento do registro"
 
@@ -223,7 +195,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "Escolha um LED não usando em"
 
@@ -262,7 +233,6 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "Configuração do Simple AdBlock"
 
@@ -271,14 +241,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -296,12 +261,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "Suprimir"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "Configuração do LED"
 
@@ -309,26 +272,14 @@ msgstr "Configuração do LED"
 msgid "Task"
 msgstr ""
 
-#: 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/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/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 ""
@@ -342,7 +293,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "Detalhado"
 
@@ -351,12 +301,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr "Gerenciamento de Listas Branca e Preta"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 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:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "Domínios para a Lista Branca"
 
@@ -365,10 +313,37 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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"
 
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 37b645ff1c..7010df158e 100644
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -31,17 +31,14 @@ msgid "Basic Configuration"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 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:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "Domínios para a Lista Negra"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "Endereços de Hosts para a Lista Negra"
 
@@ -53,12 +50,6 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-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
 msgid "Controls system log and console output verbosity."
 msgstr ""
@@ -125,21 +116,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "Forçar o DNS do Roteador"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 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/simpleadblock.lua:21
-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:157
 msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
@@ -154,18 +137,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -176,7 +151,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED para indicar o estado"
 
@@ -187,7 +161,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 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 "
@@ -204,7 +177,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "Definição do detalhamento do registro"
 
@@ -213,7 +185,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "Escolha um LED não usando em"
 
@@ -252,7 +223,6 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "Configuração do Simple AdBlock"
 
@@ -261,14 +231,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 msgid "Some output"
 msgstr "Pouco detalhado"
 
-#: 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -286,12 +251,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "Suprimir"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "Configuração do LED"
 
@@ -299,26 +262,14 @@ msgstr "Configuração do LED"
 msgid "Task"
 msgstr ""
 
-#: 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/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/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 ""
@@ -332,7 +283,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "Detalhado"
 
@@ -341,12 +291,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 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:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "Domínios para a Lista Branca"
 
@@ -355,9 +303,33 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 51dc9a7be6..9bca395f9c 100644
--- a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
@@ -45,17 +45,14 @@ msgid "Basic Configuration"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr "URL ��ылки Черных<br />�пи�ков доменов"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "Черный �пи�ок доменов"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "URL ��ылки Черных<br />�пи�ков хо�тов"
 
@@ -67,10 +64,6 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: 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 ""
@@ -137,20 +130,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "�азначить DNS роутера"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 msgid "Force Router DNS server to all local devices"
 msgstr "�азначить DNS роутера в�ем локальным у�трой�твам"
 
-#: 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 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 ""
@@ -165,18 +151,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -187,7 +165,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED индикаци� �о�то�ни�"
 
@@ -198,7 +175,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 "Разрешить локальным у�трой�твам и�пользовать �об�твенные DNS, е�ли они "
@@ -215,7 +191,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "�а�тройка журнала"
 
@@ -224,7 +199,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "Выберите LED не и�пользует�� на �транице"
 
@@ -263,7 +237,6 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "Simple AdBlock на�тройки"
 
@@ -272,14 +245,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -297,12 +265,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "Запретить запи�ь"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "'�а�тройка LED индикации' �и�темы."
 
@@ -310,26 +276,14 @@ msgstr "'�а�тройка LED индикации' �и�темы."
 msgid "Task"
 msgstr ""
 
-#: 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/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/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 ""
@@ -343,7 +297,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "Подробна� запи�ь"
 
@@ -352,12 +305,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr "URL ��ылки Белых �пи�ков доменов"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "Белый �пи�ок доменов"
 
@@ -366,6 +317,30 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 7456703d30..9891a6fc05 100644
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -31,17 +31,14 @@ msgid "Basic Configuration"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr "Svartlistade domänadresser"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "Svartlistade domäner"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "Svartlistade värdadresser"
 
@@ -53,10 +50,6 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: 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 ""
@@ -123,19 +116,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 msgid "Force Router DNS server to all local devices"
 msgstr ""
 
-#: 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 ""
-
 #: 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 ""
@@ -150,18 +137,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -172,7 +151,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED för att indikera status"
 
@@ -183,7 +161,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 
@@ -198,7 +175,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr ""
 
@@ -207,7 +183,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr ""
 
@@ -246,7 +221,6 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "Inställningar för Simple AdBlock"
 
@@ -255,14 +229,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 msgid "Some output"
 msgstr "Viss utmatning"
 
-#: 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -280,12 +249,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "Förträng utmatning"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr ""
 
@@ -293,26 +260,14 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr ""
-
 #: 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/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr ""
-
 #: 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/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr ""
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "URLs to lists of hosts to be blacklisted."
 msgstr ""
@@ -326,7 +281,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "Utförlig utmatning"
 
@@ -335,12 +289,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr "Vitlistade domänadresser"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "Vitlistade domäner"
 
@@ -349,9 +301,17 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 bfe042bf98..723fbb0cfc 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -31,17 +31,14 @@ msgid "Basic Configuration"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr ""
 
@@ -53,10 +50,6 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: 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 ""
@@ -123,19 +116,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 msgid "Force Router DNS server to all local devices"
 msgstr ""
 
-#: 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 ""
-
 #: 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 ""
@@ -150,18 +137,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -172,7 +151,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr ""
 
@@ -183,7 +161,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 
@@ -198,7 +175,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr ""
 
@@ -207,7 +183,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr ""
 
@@ -246,7 +221,6 @@ msgid "Simple AdBlock"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr ""
 
@@ -255,14 +229,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -280,12 +249,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr ""
 
@@ -293,26 +260,14 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr ""
-
 #: 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/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr ""
-
 #: 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/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr ""
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "URLs to lists of hosts to be blacklisted."
 msgstr ""
@@ -326,7 +281,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr ""
 
@@ -335,12 +289,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr ""
 
@@ -349,6 +301,5 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 c7ae170f18..eb98866e06 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
@@ -41,17 +41,14 @@ msgid "Basic Configuration"
 msgstr "基本�置"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr "列入黑��的域� URL"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "列入黑��的域�"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "列入黑��的主机 URL"
 
@@ -63,10 +60,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "�置"
 
-#: 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 ""
@@ -133,19 +126,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "强制路由器 DNS"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 msgid "Force Router DNS server to all local devices"
 msgstr "强制路由器 DNS �务所有本地设备"
 
-#: 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 ""
@@ -160,18 +147,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -182,7 +161,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED 指示状�"
 
@@ -193,7 +171,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 msgid "Let local devices use their own DNS servers if set"
 msgstr "如果设置，让本地设备使用自己的 DNS �务器"
 
@@ -208,7 +185,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "输出详细程度设置"
 
@@ -217,7 +193,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "选择尚未使用的 LED"
 
@@ -256,7 +231,6 @@ msgid "Simple AdBlock"
 msgstr "简� AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "简� AdBlock 设置"
 
@@ -265,14 +239,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -290,12 +259,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "抑制输出"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "系统 LED �置"
 
@@ -303,26 +270,14 @@ msgstr "系统 LED �置"
 msgid "Task"
 msgstr ""
 
-#: 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/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/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 ""
@@ -336,7 +291,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "详细输出"
 
@@ -345,12 +299,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr "白��和黑��管�"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr "白��域� URL"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "白��域�"
 
@@ -359,10 +311,33 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 的调试输出"
 
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 d34359c773..c64b994f90 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
@@ -41,17 +41,14 @@ msgid "Basic Configuration"
 msgstr "基本�置"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
 msgid "Blacklisted Domain URLs"
 msgstr "列入黑�單的域� URL"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
 msgid "Blacklisted Domains"
 msgstr "列入黑�單的域�"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
 msgid "Blacklisted Hosts URLs"
 msgstr "列入黑�單的主機 URL"
 
@@ -63,10 +60,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "�置"
 
-#: 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 ""
@@ -133,19 +126,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
 msgid "Force Router DNS"
 msgstr "強制路由器 DNS"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
 msgid "Force Router DNS server to all local devices"
 msgstr "強制路由器 DNS �務所有本地�置"
 
-#: 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 ""
@@ -160,18 +147,10 @@ msgid ""
 "on timeout/fail."
 msgstr ""
 
-#: 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:236
 msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: 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:231
 msgid "Individual domains to be whitelisted."
 msgstr ""
@@ -182,7 +161,6 @@ msgid "Info"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "LED to indicate status"
 msgstr "LED 指示狀態"
 
@@ -193,7 +171,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
 msgid "Let local devices use their own DNS servers if set"
 msgstr "如果設定，讓本地�置使用自己的 DNS 伺�器"
 
@@ -208,7 +185,6 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
 msgid "Output Verbosity Setting"
 msgstr "輸出詳細程度設定"
 
@@ -217,7 +193,6 @@ 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
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
 msgid "Pick the LED not already used in"
 msgstr "�擇尚未使用的 LED"
 
@@ -256,7 +231,6 @@ msgid "Simple AdBlock"
 msgstr "ç°¡å–® AdBlock"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
 msgid "Simple AdBlock Settings"
 msgstr "簡單 AdBlock 設定"
 
@@ -265,14 +239,9 @@ msgid "Simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
 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:200
 msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
@@ -290,12 +259,10 @@ msgid "Store compressed cache file on router"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
 msgid "Suppress output"
 msgstr "抑制輸出"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
 msgid "System LED Configuration"
 msgstr "系統 LED �置"
 
@@ -303,26 +270,14 @@ msgstr "系統 LED �置"
 msgid "Task"
 msgstr ""
 
-#: 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/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/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 ""
@@ -336,7 +291,6 @@ msgid "Use simultaneous processing"
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
 msgid "Verbose output"
 msgstr "詳細輸出"
 
@@ -345,12 +299,10 @@ msgid "Whitelist and Blocklist Management"
 msgstr "白�單和黑�單管�"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
 msgid "Whitelisted Domain URLs"
 msgstr "白�單域� URL"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
 msgid "Whitelisted Domains"
 msgstr "白�單域�"
 
@@ -359,10 +311,33 @@ msgid "for details."
 msgstr ""
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
 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 的除錯輸出"
 
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index f426acc537..2e26a5158e 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 ed6f4f4da4..56221e043f 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 6545154c2c..95971fab1b 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 635d9987cb..a686c32383 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 9fdbcacb5b..b0f12c367d 100644
--- a/applications/luci-app-vpnbypass/po/es/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
@@ -12,21 +12,25 @@ msgstr ""
 "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 ""
+
+#: 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 ""
+
+#: 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 "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 da254e53bd..ba4cc890a9 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 e924cfe50a..eca6fec324 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 7a9b05327d..06b01d4053 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 3003cf3827..a986ee2416 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 1d43363fca..971d5e4ede 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/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 9bc8ec17a1..92da37a222 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 d4d61eb381..4c3128bfd1 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/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index cc72d6e487..f0629d0ca7 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -52,7 +52,7 @@ var CBINode = Class.extend({
 	},
 
 	stripTags: function(s) {
-		if (!s.match(/[<>]/))
+		if (typeof(s) == 'string' && !s.match(/[<>]/))
 			return s;
 
 		var x = E('div', {}, s);
@@ -132,18 +132,19 @@ var CBIMap = CBINode.extend({
 		return Promise.all(tasks);
 	},
 
-	save: function(cb) {
+	save: function(cb, silent) {
 		this.checkDepends();
 
 		return this.parse()
 			.then(cb)
 			.then(uci.save.bind(uci))
 			.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() {
@@ -516,7 +517,7 @@ var CBIAbstractValue = CBINode.extend({
 				else {
 					var conf = this.uciconfig || this.section.uciconfig || this.map.config,
 					    res = this.map.lookupOption(dep, section_id, conf),
-					    val = res ? res[0].formvalue(res[1]) : null;
+					    val = (res && res[0].isActive(res[1])) ? res[0].formvalue(res[1]) : null;
 
 					istat = (istat && isEqual(val, this.deps[i][dep]));
 				}
@@ -658,14 +659,14 @@ var CBITypedSection = CBIAbstractSection.extend({
 		var config_name = this.uciconfig || this.map.config;
 
 		uci.add(config_name, this.sectiontype, name);
-		this.map.save();
+		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();
+		return this.map.save(null, true);
 	},
 
 	renderSectionAdd: function(extra_class) {
@@ -680,13 +681,11 @@ var CBITypedSection = CBIAbstractSection.extend({
 			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': btn_title || _('Add'),
 				'title': btn_title || _('Add'),
-				'click': L.bind(this.handleAdd, this)
-			}));
+				'click': L.ui.createHandlerFn(this, 'handleAdd')
+			}, btn_title || _('Add')));
 		}
 		else {
 			var nameEl = E('input', {
@@ -701,12 +700,12 @@ var CBITypedSection = CBIAbstractSection.extend({
 					'type': 'submit',
 					'value': btn_title || _('Add'),
 					'title': btn_title || _('Add'),
-					'click': L.bind(function(ev) {
+					'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);
+					})
 				})
 			]);
 
@@ -743,14 +742,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)
@@ -988,7 +985,7 @@ var CBITableSection = CBITypedSection.extend({
 					'value': more_label,
 					'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)
 				})
 			);
 		}
@@ -997,16 +994,14 @@ var CBITableSection = CBITypedSection.extend({
 			var btn_title = this.titleFn('removebtntitle', section_id);
 
 			L.dom.append(tdEl.lastElementChild,
-				E('input', {
-					'type': 'submit',
-					'value': btn_title || _('Delete'),
+				E('button', {
 					'title': btn_title || _('Delete'),
 					'class': 'cbi-button cbi-button-remove',
-					'click': L.bind(function(sid, ev) {
+					'click': L.ui.createHandlerFn(this, function(sid, ev) {
 						uci.remove(config_name, sid);
-						this.map.save();
-					}, this, section_id)
-				})
+						return this.map.save(null, true);
+					}, section_id)
+				}, [ btn_title || _('Delete') ])
 			);
 		}
 
@@ -1120,6 +1115,8 @@ var CBITableSection = CBITypedSection.extend({
 		    m = new CBIMap(this.map.config, null, null),
 		    s = m.section(CBINamedSection, section_id, this.sectiontype);
 
+		m.parent = parent;
+
 		s.tabs = this.tabs;
 		s.tab_names = this.tab_names;
 
@@ -1156,24 +1153,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);
@@ -1189,8 +1180,8 @@ var CBIGridSection = CBITableSection.extend({
 		var config_name = this.uciconfig || this.map.config,
 		    section_id = uci.add(config_name, this.sectiontype);
 
-	    this.addedSection = section_id;
-		this.renderMoreOptionsModal(section_id);
+		this.addedSection = section_id;
+		return this.renderMoreOptionsModal(section_id);
 	},
 
 	handleModalSave: function(/* ... */) {
@@ -1283,7 +1274,7 @@ var CBINamedSection = CBIAbstractSection.extend({
 		    config_name = this.uciconfig || this.map.config;
 
 		uci.add(config_name, this.sectiontype, section_id);
-		this.map.save();
+		return this.map.save(null, true);
 	},
 
 	handleRemove: function(ev) {
@@ -1291,7 +1282,7 @@ var CBINamedSection = CBIAbstractSection.extend({
 		    config_name = this.uciconfig || this.map.config;
 
 		uci.remove(config_name, section_id);
-		this.map.save();
+		return this.map.save(null, true);
 	},
 
 	renderContents: function(data) {
@@ -1315,12 +1306,10 @@ 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', {
@@ -1332,12 +1321,10 @@ var CBINamedSection = CBIAbstractSection.extend({
 		}
 		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);
@@ -1642,6 +1629,9 @@ var CBIDummyValue = CBIValue.extend({
 			hiddenEl.render()
 		]);
 	},
+
+	remove: function() {},
+	write: function() {}
 });
 
 var CBIButtonValue = CBIValue.extend({
@@ -1655,15 +1645,13 @@ var CBIButtonValue = CBIValue.extend({
 
 		if (value !== false)
 			L.dom.content(outputEl, [
-				E('input', {
+				E('button', {
 					'class': 'cbi-button cbi-button-%s'.format(this.inputstyle || 'button'),
-					'type': 'button',
-					'value': btn_title,
-					'click': L.bind(this.onclick || function(ev) {
+					'click': L.ui.createHandlerFn(this, this.onclick || function(ev) {
 						ev.target.previousElementSibling.value = ev.target.value;
-						this.map.save();
-					}, this)
-				})
+						return this.map.save();
+					})
+				}, [ btn_title ])
 			]);
 		else
 			L.dom.content(outputEl, ' - ');
@@ -1687,6 +1675,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 /*, ... */) {
@@ -1740,5 +1754,6 @@ return L.Class.extend({
 	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 d72764b114..bcc6870bd2 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);
 
@@ -491,7 +499,7 @@
 			return true;
 		},
 
-		remove: function(entry) {
+		remove: function(fn) {
 			if (typeof(fn) != 'function')
 				throw new TypeError('Invalid argument to LuCI.Poll.remove()');
 
@@ -567,8 +575,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)
@@ -611,16 +624,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);
 
@@ -632,28 +664,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;
 			}
@@ -678,7 +698,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) {
@@ -835,6 +855,25 @@
 			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],
@@ -844,26 +883,31 @@
 
 			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;
+
+				return rpcClass.declare({
+					'object': 'session',
+					'method': 'access',
+					'params': [ 'scope', 'object', 'function' ],
+					'expect': { access: true }
+				})('uci', 'luci', 'read').catch(L.notifySessionExpiry);
+			});
+
+			Request.addInterceptor(function(res) {
+				var isDenied = false;
+
+				if (res.status == 403 && res.headers.get('X-LuCI-Login-Required') == 'yes')
+					isDenied = true;
+
+				if (!isDenied)
+					return;
 
-				throw 'Session expired';
+				L.notifySessionExpiry();
 			});
 
 			return this.probeSystemFeatures().finally(this.initDOM);
@@ -1230,9 +1274,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;
@@ -1298,24 +1342,18 @@
 
 				if (mc.querySelector('.cbi-map')) {
 					footer.appendChild(E('div', { 'class': 'cbi-page-actions' }, [
-						E('input', {
+						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')), ' ',
+						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')), ' ',
+						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 fb23fba857..525b7c9f19 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -44,17 +44,18 @@ 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 callLuciWifidevs = rpc.declare({
+	object: 'luci',
+	method: 'getWirelessDevices',
+	expect: { '': {} }
+});
+
 var callLuciIfaddrs = rpc.declare({
 	object: 'luci',
 	method: 'getIfaddrs',
@@ -66,10 +67,18 @@ var callLuciBoardjson = rpc.declare({
 	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' ],
+	expect: { results: [] }
 });
 
 var callNetworkInterfaceStatus = rpc.declare({
@@ -90,21 +99,17 @@ var callGetProtoHandlers = rpc.declare({
 	expect: { '': {} }
 });
 
+var callGetHostHints = rpc.declare({
+	object: 'luci',
+	method: 'getHostHints',
+	expect: { '': {} }
+});
+
 var _init = null,
     _state = null,
     _protocols = {},
     _protospecs = {};
 
-function getWifiState(cache) {
-	return callNetworkWirelessStatus().then(function(state) {
-		if (!L.isObject(state))
-			throw !1;
-		return state;
-	}).catch(function() {
-		return {};
-	});
-}
-
 function getInterfaceState(cache) {
 	return callNetworkInterfaceStatus().then(function(state) {
 		if (!Array.isArray(state))
@@ -145,6 +150,16 @@ function getNetdevState(cache) {
 	});
 }
 
+function getWifidevState(cache) {
+	return callLuciWifidevs().then(function(state) {
+		if (!L.isObject(state))
+			throw !1;
+		return state;
+	}).catch(function() {
+		return {};
+	});
+}
+
 function getBoardState(cache) {
 	return callLuciBoardjson().then(function(state) {
 		if (!L.isObject(state))
@@ -160,6 +175,14 @@ function getProtocolHandlers(cache) {
 		if (!L.isObject(protos))
 			throw !1;
 
+		/* Register "none" protocol */
+		if (!protos.hasOwnProperty('none'))
+			Object.assign(protos, { none: { no_device: false } });
+
+		/* Hack: emulate relayd protocol */
+		if (!protos.hasOwnProperty('relay'))
+			Object.assign(protos, { relay: { no_device: true } });
+
 		Object.assign(_protospecs, protos);
 
 		return Promise.all(Object.keys(protos).map(function(p) {
@@ -175,6 +198,16 @@ function getProtocolHandlers(cache) {
 	});
 }
 
+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);
 
@@ -188,8 +221,12 @@ function getWifiStateBySid(sid) {
 
 				var s2 = uci.get('wireless', netstate.section);
 
-				if (s2 != null && s['.type'] == s2['.type'] && s['.name'] == s2['.name'])
+				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 ];
+				}
 			}
 		}
 	}
@@ -221,37 +258,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) {
@@ -427,14 +433,15 @@ function initNetworkState(refresh) {
 	if (_state == null || refresh) {
 		_init = _init || Promise.all([
 			getInterfaceState(), getDeviceState(), getBoardState(),
-			getWifiState(), getIfaddrState(), getNetdevState(), getProtocolHandlers(),
+			getIfaddrState(), getNetdevState(), getWifidevState(),
+			getHostHints(), getProtocolHandlers(),
 			uci.load('network'), uci.load('wireless'), uci.load('luci')
 		]).then(function(data) {
-			var board = data[2], ifaddrs = data[4], devices = data[5];
+			var board = data[2], ifaddrs = data[3], devices = data[4];
 			var s = {
 				isTunnel: {}, isBridge: {}, isSwitch: {}, isWifi: {},
-				ifaces: data[0], devices: data[1], radios: data[3],
-				netdevs: {}, bridges: {}, switches: {}
+				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++) {
@@ -609,12 +616,91 @@ 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);
@@ -729,28 +815,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 < _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;
-		}, this));
+		return initNetworkState().then(L.bind(enumerateNetworks, this));
 	},
 
 	deleteNetwork: function(name) {
@@ -967,38 +1032,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));
 	},
@@ -1048,11 +1101,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));
 	},
 
@@ -1075,7 +1124,7 @@ Network = L.Class.extend({
 			var radioname = existingDevice['.name'],
 			    netid = getWifiNetidBySid(sid) || [];
 
-			return this.instantiateWifiNetwork(sid, radioname, _state.radios[radioname], netid[0], null, { ifname: netid });
+			return this.instantiateWifiNetwork(sid, radioname, _state.radios[radioname], netid[0], null);
 		}, this));
 	},
 
@@ -1187,16 +1236,19 @@ 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, iwinfo) {
-		return new WifiNetwork(sid, radioname, radiostate, netid, netstate, iwinfo);
+	instantiateWifiNetwork: function(sid, radioname, radiostate, netid, netstate) {
+		return new WifiNetwork(sid, radioname, radiostate, netid, netstate);
 	},
 
 	getIfnameOf: function(obj) {
@@ -1207,6 +1259,70 @@ Network = L.Class.extend({
 		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;
+	},
+
+	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] });
 	}
 });
 
@@ -1802,7 +1918,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)
@@ -1820,18 +1936,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) {
@@ -1842,34 +1972,45 @@ 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, modestr, this.getName());
+		return '%s 802.11%s Wireless Controller (%s)'.format(type || 'Generic', modestr, this.getName());
+	},
+
+	getScanList: function() {
+		return callIwinfoScan(this.sid);
 	},
 
 	isUp: function() {
@@ -1933,10 +2074,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,
@@ -1965,6 +2104,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';
 	},
@@ -1990,7 +2133,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;
@@ -1998,8 +2141,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();
@@ -2017,7 +2164,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';
@@ -2043,25 +2190,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);
@@ -2070,7 +2215,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);
@@ -2079,28 +2224,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) {
@@ -2119,8 +2263,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 0000000000..f0a3ec579c
--- /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 0000000000..37674c0ea4
--- /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 0000000000..8470e0a20e
--- /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 e12c2f77ee..87850b8564 100644
--- a/modules/luci-base/htdocs/luci-static/resources/rpc.js
+++ b/modules/luci-base/htdocs/luci-static/resources/rpc.js
@@ -2,7 +2,8 @@
 
 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) {
@@ -13,55 +14,73 @@ 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,
 			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 +113,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 +148,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 +167,7 @@ return L.Class.extend({
 				};
 
 				/* call rpc */
-				rpc.call(msg, rpc.handleCallReply.bind(rpc, req));
+				rpc.call(msg, rpc.parseCallReply.bind(rpc, req));
 			});
 		}, this, this, options);
 	},
@@ -156,5 +186,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 861d8c8cea..1667fa6707 100644
--- a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -478,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);
diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index 77cef53964..fed5dafa33 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';
 
@@ -1453,6 +1454,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() {
@@ -1555,6 +1967,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; 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 = [];
@@ -1628,7 +2077,7 @@ return L.Class.extend({
 				    active = pane.getAttribute('data-tab-active') === 'true';
 
 				menu.appendChild(E('li', {
-					'style': L.dom.isEmpty(pane) ? 'display:none' : null,
+					'style': this.isEmptyPane(pane) ? 'display:none' : null,
 					'class': active ? 'cbi-tab' : 'cbi-tab-disabled',
 					'data-tab': name
 				}, E('a', {
@@ -1645,9 +2094,9 @@ return L.Class.extend({
 			if (selected === null) {
 				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;
 						}
@@ -1660,6 +2109,12 @@ return L.Class.extend({
 
 				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) {
@@ -1712,7 +2167,7 @@ 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 ? menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))) : null,
 				    n_errors = pane.querySelectorAll('.cbi-input-invalid').length;
@@ -1720,7 +2175,7 @@ return L.Class.extend({
 				if (!menu || !tab)
 					return;
 
-				if (L.dom.isEmpty(pane)) {
+				if (this.isEmptyPane(pane)) {
 					tab.style.display = 'none';
 					tab.classList.remove('flash');
 				}
@@ -1738,7 +2193,7 @@ return L.Class.extend({
 					tab.removeAttribute('data-errors');
 					tab.removeAttribute('data-tooltip');
 				}
-			});
+			}, this));
 		},
 
 		switchTab: function(ev) {
@@ -2152,7 +2607,7 @@ return L.Class.extend({
 			if (t.blur)
 				t.blur();
 
-			Promise.resolve(fn.apply(ctx, arguments)).then(function() {
+			Promise.resolve(fn.apply(ctx, arguments)).finally(function() {
 				t.classList.remove('spinning');
 				t.disabled = false;
 			});
@@ -2167,5 +2622,6 @@ return L.Class.extend({
 	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 ca544cb15d..79ae1d6707 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 b0427d6c05..928faa14b4 100644
--- a/modules/luci-base/luasrc/controller/admin/index.lua
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -147,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
@@ -178,11 +180,14 @@ local function ubus_access(sid, obj, fun)
 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
@@ -203,34 +208,38 @@ local function ubus_request(req)
 		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 6e04465ac9..0000000000
--- 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 6fdded9adb..0000000000
--- 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 246d2c0ed5..0000000000
--- 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 d0df275724..5aede84848 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 e4bc4451a2..dc30c064c0 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 806b1b5f40..0000000000
--- 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 3c3d82b653..e610495380 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 bddd8e4464..9220ecf299 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 27a7595c07..e9bb47f066 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalitzat --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -170,11 +171,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:819
 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:352
+#: 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 +185,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,16 +202,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -219,7 +220,7 @@ msgstr "Nom <abbr title=\"Light Emitting Diode\">LED</abbr>"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -243,7 +244,7 @@ msgstr ""
 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 +252,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +314,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"
 
@@ -324,12 +329,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Punt d'accés"
 
@@ -360,35 +365,47 @@ msgstr "Arrendaments DHCP actius"
 msgid "Active DHCPv6 Leases"
 msgstr "Arrendaments DHCPv6 actius"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -401,10 +418,15 @@ 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -436,7 +458,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"
 
@@ -446,12 +468,12 @@ msgid "Administration"
 msgstr "Administració"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -465,12 +487,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -495,21 +519,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Permet només les llistades"
 
@@ -536,94 +558,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -635,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 "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 +664,11 @@ msgstr "Configuració d'antena"
 msgid "Any zone"
 msgstr "Qualsevol zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -668,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 ""
@@ -678,13 +686,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Estacions associades"
@@ -693,16 +701,16 @@ 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:1405
 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 ""
 
@@ -724,17 +732,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 +787,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -805,15 +815,6 @@ 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"
@@ -831,11 +832,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -855,16 +856,16 @@ msgid ""
 "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"
@@ -873,55 +874,61 @@ msgstr "Velocitat de bits"
 msgid "Bogus NX Domain Override"
 msgstr "Substitució dels dominis NX falsos"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -945,7 +952,7 @@ msgstr "Cadena"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Canvis"
 
@@ -953,7 +960,7 @@ msgstr "Canvis"
 msgid "Changes applied."
 msgstr "Canvis aplicats."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -966,20 +973,14 @@ 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:1598
 #: 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 +989,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1000,8 +1001,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:1809
 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 +1014,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:833
 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 +1022,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:1022
 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,14 +1044,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1059,12 +1060,12 @@ msgstr "ID de client a enviar en les sol·licituds DHCP"
 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"
@@ -1078,11 +1079,8 @@ msgstr "Tanca la llista..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1094,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1114,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1130,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1208,6 +1207,10 @@ msgstr "Crític"
 msgid "Cron Log Level"
 msgstr "Nivell de registre del Cron"
 
+#: 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
@@ -1217,7 +1220,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 +1230,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1238,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1295,7 +1299,7 @@ msgstr "DNS"
 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 ""
 
@@ -1307,15 +1311,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1345,37 +1349,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1383,13 +1390,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1398,18 +1405,30 @@ msgstr "Suprimeix"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Descripció"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Disseny"
@@ -1428,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:81
+#: 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 +1460,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1455,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 "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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1512,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1518,34 +1549,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1570,10 +1600,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1582,7 +1620,7 @@ msgstr "Es requereix un domini"
 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 ""
 
@@ -1606,11 +1644,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1626,40 +1664,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:1370
 msgid "EAP-Method"
 msgstr "Mètode EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Edita"
 
@@ -1669,50 +1708,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Edita aquesta xarxa"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
 
@@ -1720,7 +1760,7 @@ msgstr "Habilita el passatge de trames enormes"
 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 ""
 
@@ -1728,31 +1768,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1800,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1768,48 +1808,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1825,6 +1869,11 @@ msgstr ""
 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
@@ -1838,12 +1887,12 @@ msgstr "Error"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
@@ -1856,6 +1905,10 @@ msgstr ""
 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,20 +1917,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1893,30 +1946,42 @@ msgstr "Port del servidor de registre del sistema extern"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Fitxer"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1935,6 +2000,7 @@ msgstr "Filtra privat"
 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 +2011,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 +2023,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:73
 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 +2035,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 ""
 
@@ -2001,31 +2067,31 @@ msgstr "Operacions a la memòria flaix"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2099,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 +2107,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 +2115,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:808
 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:773
 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:86
 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"
 
@@ -2107,6 +2168,7 @@ msgid "Gateway ports"
 msgstr "Ports de passarel·la"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2114,11 +2176,10 @@ msgstr "Ports de passarel·la"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2126,7 +2187,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2134,10 +2195,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2148,7 +2205,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 +2216,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Vés a la configuració de contrasenya"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2202,9 +2255,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "No mostris l'<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
@@ -2216,6 +2267,7 @@ 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:1939
 msgid "Host"
 msgstr "Nom de màquina"
 
@@ -2223,7 +2275,7 @@ msgstr "Nom de màquina"
 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,7 +2283,7 @@ 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 ""
 
@@ -2244,28 +2296,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2288,6 +2340,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 +2352,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 +2364,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,16 +2388,16 @@ 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 ""
 
@@ -2350,6 +2406,7 @@ msgstr ""
 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 +2421,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 +2443,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 +2455,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 +2467,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 +2489,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 +2514,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:1462
 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 +2559,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 ""
 
@@ -2540,7 +2611,7 @@ msgstr ""
 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"
 
@@ -2562,12 +2633,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"
 
@@ -2579,19 +2650,21 @@ msgstr "Entrant:"
 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 +2672,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
 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:791
 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:953
 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 +2752,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2692,15 +2800,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2717,15 +2825,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Clau #%d"
 
@@ -2733,33 +2841,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"
 
@@ -2780,12 +2889,12 @@ 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:370
-#: 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 ""
 
@@ -2799,24 +2908,24 @@ msgstr "Fitxer d'arrendament"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2844,7 +2953,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Enllaç actiu"
 
@@ -2854,7 +2963,7 @@ msgid ""
 "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:1361
 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 +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:1365
 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,7 +2981,7 @@ 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 ""
 
@@ -2888,7 +2997,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2921,7 +3030,11 @@ msgstr "Carregant"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2931,20 +3044,20 @@ 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"
 
@@ -2952,7 +3065,7 @@ msgstr "Adreça IPv6 local"
 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"
 
@@ -2989,10 +3102,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Nivell de sortida de registre"
@@ -3017,11 +3126,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"
@@ -3030,31 +3141,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3183,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3083,16 +3194,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3100,7 +3212,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3116,25 +3228,23 @@ msgstr ""
 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:760
+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
@@ -3153,42 +3263,43 @@ msgstr "Memòria"
 msgid "Memory usage (%)"
 msgstr "Ús de Memòria (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3197,31 +3308,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3229,7 +3339,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3292,27 +3402,28 @@ 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:1313
 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 ""
 
@@ -3320,18 +3431,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Candidats de servidor NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nom de la nova xarxa"
 
@@ -3341,7 +3449,8 @@ msgstr "Navegació"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3366,33 +3475,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3401,18 +3528,6 @@ msgstr ""
 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,6 +3535,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "No hi ha cap contrasenya establerta!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3428,19 +3547,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"
 
@@ -3460,8 +3579,8 @@ msgstr ""
 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"
 
@@ -3473,22 +3592,26 @@ 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:170
@@ -3507,55 +3630,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3687,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Opció canviada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3723,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3667,7 +3778,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 +3787,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:953
 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 +3839,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Visió de conjunt"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3873,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,63 +3884,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3833,11 +3950,11 @@ msgstr "Contrasenya"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3848,7 +3965,7 @@ msgstr ""
 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 ""
 
@@ -3856,27 +3973,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3894,7 +4011,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 +4020,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:86
 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 +4036,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3927,7 +4048,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 +4059,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
@@ -3959,15 +4084,15 @@ msgstr "Política"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3979,11 +4104,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 ""
 
@@ -3991,16 +4116,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:114
 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"
@@ -4010,12 +4135,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4036,35 +4160,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4076,15 +4194,15 @@ 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"
@@ -4095,28 +4213,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4126,31 +4245,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4168,17 +4291,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 ""
 
@@ -4202,7 +4319,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4224,21 +4341,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:98
+#: 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:56
 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"
 
@@ -4246,80 +4357,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4331,7 +4460,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4355,9 +4508,14 @@ msgstr ""
 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"
 
@@ -4365,7 +4523,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 ""
 
@@ -4377,26 +4535,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Mostra/amaga la contrasenya"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Reverteix"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4412,7 +4570,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4424,7 +4582,7 @@ 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 ""
 
@@ -4459,7 +4617,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4476,15 +4634,15 @@ msgstr ""
 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 ""
 
@@ -4493,9 +4651,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4504,17 +4662,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Desa"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Desa i aplica"
@@ -4531,24 +4691,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Tasques programades"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Secció afegida"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Secció treta"
 
@@ -4563,31 +4719,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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"
 
@@ -4595,29 +4753,32 @@ msgstr "Tipus de servei"
 msgid "Services"
 msgstr "Serveis"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4629,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4641,21 +4802,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4689,11 +4852,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4735,56 +4894,64 @@ msgstr "Especifica el directori a que el dispositiu està adjuntat"
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Arrencada"
@@ -4801,11 +4968,12 @@ msgstr "Rutes IPv6 estàtiques"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4817,19 +4985,20 @@ msgid ""
 "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:976
 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:745
 #: 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"
 
@@ -4842,6 +5011,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Envia"
 
@@ -4861,41 +5031,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4938,6 +5110,8 @@ 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"
@@ -4960,7 +5134,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 ""
 
@@ -4968,42 +5142,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5019,7 +5175,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5039,6 +5195,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"
@@ -5064,6 +5226,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Les següents regles estan actualment actives en aquest sistema."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5074,37 +5240,36 @@ msgid ""
 "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:1794
+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 "
@@ -5114,10 +5279,9 @@ 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:1150
+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!"
@@ -5157,7 +5321,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5166,16 +5330,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "No hi ha arrendaments actius."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5187,10 +5345,18 @@ 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/wireless.js:1432
+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 "
@@ -5205,13 +5371,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."
@@ -5220,7 +5386,7 @@ 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>"
@@ -5234,22 +5400,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 ""
@@ -5268,8 +5434,8 @@ msgstr ""
 "Aquesta pàgina ofereix una vista general de les connexions de xarxa actives "
 "actualment."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5279,7 +5445,7 @@ msgstr "Aquesta secció encara no conté cap valor"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5287,7 +5453,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Zona horària"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5302,7 +5468,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 ""
 
@@ -5326,55 +5492,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5382,19 +5534,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5424,10 +5577,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 ""
@@ -5437,21 +5592,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Sense gestionar"
@@ -5465,18 +5630,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5499,11 +5671,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5513,42 +5701,40 @@ msgstr "Temps en marxa"
 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 ""
 
@@ -5560,64 +5746,61 @@ 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 ""
 
@@ -5634,81 +5817,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:1257
 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:1313
 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"
 
@@ -5716,41 +5896,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5766,7 +5942,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5787,7 +5963,7 @@ msgstr ""
 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:1339
 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 "
@@ -5795,61 +5971,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptador sense fils"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "La xarxa sense fils està habilitada"
 
@@ -5861,12 +6038,18 @@ msgstr "Escriure les peticions DNS rebudes al registre del sistema"
 msgid "Write system log to file"
 msgstr "Escriure el registre del sistema al fitxer"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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,18 +6090,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5927,11 +6106,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"
 
@@ -5947,22 +6126,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
@@ -5974,22 +6152,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "caducat"
 
@@ -6007,25 +6189,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 ""
 
@@ -6033,6 +6211,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
@@ -6071,21 +6253,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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ç"
 
@@ -6093,7 +6272,7 @@ msgstr "cap enllaç"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "cap"
 
@@ -6103,7 +6282,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6118,10 +6299,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6139,66 +6316,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6215,7 +6392,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"
 
@@ -6296,8 +6473,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 ""
 
@@ -6334,7 +6511,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 ""
 
@@ -6347,11 +6524,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 ""
 
@@ -6367,14 +6544,19 @@ 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/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
@@ -6385,6 +6567,154 @@ msgstr "sí"
 msgid "« Back"
 msgstr "« Enrere"
 
+#~ 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"
 
@@ -6526,9 +6856,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 662c12c6cf..25426d2d91 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.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"
 
-#: 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 ""
 
@@ -19,11 +19,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +61,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- vlastní --"
@@ -96,7 +96,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +108,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:1321
 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,35 +121,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -168,11 +169,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:819
 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:352
+#: 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 +183,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,16 +199,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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"
 
@@ -216,7 +217,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Název"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -240,61 +241,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +309,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í"
 
@@ -319,12 +324,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Přístupový bod"
 
@@ -359,35 +364,47 @@ 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:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -399,10 +416,15 @@ msgstr ""
 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í..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -434,7 +456,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"
 
@@ -444,12 +466,12 @@ msgid "Administration"
 msgstr "Správa"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -463,12 +485,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Upozornění"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -491,21 +515,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Povolit pouze uvedené"
 
@@ -532,94 +554,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -631,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 "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 +660,11 @@ msgstr "Konfigurace antén"
 msgid "Any zone"
 msgstr "Libovolná zóna"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -664,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 ""
@@ -674,13 +682,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Připojení klienti"
@@ -689,16 +697,16 @@ 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:1405
 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 ""
 
@@ -720,17 +728,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 +783,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -801,14 +811,6 @@ 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"
@@ -826,11 +828,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -850,16 +852,16 @@ msgid ""
 "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"
@@ -868,55 +870,61 @@ msgstr "Přenosová rychlost"
 msgid "Bogus NX Domain Override"
 msgstr "Přepíše falešnou hodnotu NX Domény"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -940,7 +948,7 @@ msgstr "Řetěz"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Změny"
 
@@ -948,7 +956,7 @@ msgstr "Změny"
 msgid "Changes applied."
 msgstr "Změny aplikovány."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -961,20 +969,14 @@ 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:1598
 #: 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 +985,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -995,8 +997,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:1809
 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 +1010,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:833
 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 +1018,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:1022
 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,14 +1039,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1053,12 +1055,12 @@ msgstr "Klientské ID odesílané v DHCP požadavku"
 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"
@@ -1074,11 +1076,8 @@ msgstr "Zavřít seznam..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1091,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1111,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1127,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1204,6 +1204,10 @@ msgstr "Kritické"
 msgid "Cron Log Level"
 msgstr "Úroveň protokolování Cronu"
 
+#: 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
@@ -1213,7 +1217,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 +1227,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1235,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1291,7 +1296,7 @@ msgstr "DNS"
 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 ""
 
@@ -1303,15 +1308,15 @@ msgstr ""
 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 +1325,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1341,37 +1346,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1381,13 +1389,13 @@ msgstr ""
 "které odkazuje na různé DNS servery pro klienty."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1396,18 +1404,30 @@ msgstr "Odstranit"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Popis"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Vzhled"
@@ -1426,10 +1446,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:81
+#: 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 +1459,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1453,26 +1484,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1511,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1516,34 +1548,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1570,10 +1601,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Nepřeposílat reverzní dotazy na místní sítě"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1582,7 +1621,7 @@ msgstr "Vyžadována doména"
 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 ""
 
@@ -1606,11 +1645,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1626,20 +1665,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 +1687,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:1370
 msgid "EAP-Method"
 msgstr "Metoda EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Upravit"
 
@@ -1671,50 +1711,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Upravit tuto síť"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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ů"
 
@@ -1722,7 +1763,7 @@ msgstr "Povolit průchod jumbo rámců"
 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 ""
 
@@ -1730,31 +1771,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1803,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1770,48 +1811,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1827,6 +1872,11 @@ msgstr ""
 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
@@ -1840,12 +1890,12 @@ msgstr "Chyba"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernetový adaptér"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernetový switch"
@@ -1858,6 +1908,10 @@ msgstr ""
 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,22 +1920,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1897,30 +1951,42 @@ msgstr "Port externího protokolovacího serveru"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Soubor"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1939,6 +2005,7 @@ msgstr "Filtrovat soukromé"
 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 +2016,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 +2028,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:73
 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 +2040,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 ""
 
@@ -2005,31 +2072,31 @@ msgstr "Operace nad flash pamětí"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2104,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 +2112,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 +2120,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:808
 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:773
 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:86
 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"
 
@@ -2111,6 +2173,7 @@ msgid "Gateway ports"
 msgstr "Porty brány"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2118,11 +2181,10 @@ msgstr "Porty brány"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Obecné nastavení"
 
@@ -2130,7 +2192,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2138,10 +2200,6 @@ 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
 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 +2208,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 +2219,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Přejít na nastavení hesla..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2204,9 +2258,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Skrývat <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2217,6 +2269,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2224,7 +2277,7 @@ msgstr ""
 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,7 +2286,7 @@ 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 ""
 
@@ -2246,28 +2299,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2290,6 +2343,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 +2355,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 +2367,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,16 +2391,16 @@ 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 ""
 
@@ -2352,6 +2409,7 @@ msgstr ""
 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 +2424,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 +2446,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 +2458,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 +2470,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 +2492,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 +2517,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:1462
 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 +2562,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"
 
@@ -2542,7 +2614,7 @@ msgstr ""
 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í"
 
@@ -2564,12 +2636,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"
 
@@ -2581,19 +2653,21 @@ msgstr "Příchozí:"
 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 +2675,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
 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:791
 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:953
 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 +2756,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2696,15 +2805,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2721,15 +2830,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Klí� #%d"
 
@@ -2737,33 +2846,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"
 
@@ -2784,12 +2894,12 @@ 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:370
-#: 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 ""
 
@@ -2803,24 +2913,24 @@ msgstr "Soubor zájpůj�ek"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2848,7 +2958,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Odkaz na"
 
@@ -2860,7 +2970,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:1361
 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 +2979,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:1365
 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,7 +2988,7 @@ 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 ""
 
@@ -2894,7 +3004,7 @@ msgstr "Seznam hostitelů, kteří udávají falešné hodnoty NX domén"
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2926,7 +3036,11 @@ msgstr "Na�ítání"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2936,20 +3050,20 @@ 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"
 
@@ -2957,7 +3071,7 @@ msgstr "Místní IPv6 adresa"
 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"
 
@@ -3000,10 +3114,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Úroveň logování"
@@ -3028,11 +3138,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"
@@ -3041,31 +3153,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3195,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3094,16 +3206,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3111,7 +3224,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3127,25 +3240,23 @@ msgstr "Nejvyšší povolené množství souběžných DNS dotazů"
 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:760
+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
@@ -3164,42 +3275,43 @@ msgstr "Paměť"
 msgid "Memory usage (%)"
 msgstr "Využití paměti (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mód"
@@ -3208,31 +3320,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Sledování"
 
@@ -3240,7 +3351,7 @@ msgstr "Sledování"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3303,27 +3414,28 @@ 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:1313
 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 ""
 
@@ -3331,18 +3443,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Kandidáti NTP serveru"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Název nové sítě"
 
@@ -3352,7 +3461,8 @@ msgstr "Navigace"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3377,33 +3487,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3412,18 +3540,6 @@ msgstr ""
 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,6 +3547,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Žádné heslo!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3439,19 +3559,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"
 
@@ -3471,8 +3591,8 @@ msgstr ""
 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ý"
 
@@ -3484,22 +3604,26 @@ 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:170
@@ -3518,54 +3642,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3699,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Volba změněna"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3735,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3677,7 +3790,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 +3799,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:953
 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 +3845,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 +3853,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:1601
+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 +3887,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,63 +3898,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3845,11 +3964,11 @@ msgstr "Heslo"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3860,7 +3979,7 @@ msgstr ""
 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 ""
 
@@ -3868,27 +3987,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3906,7 +4025,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 +4034,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:86
 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 +4050,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3939,7 +4062,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 +4073,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
@@ -3971,15 +4098,15 @@ msgstr "Politika"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3991,11 +4118,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 ""
 
@@ -4003,16 +4130,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:114
 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"
@@ -4024,12 +4151,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4050,35 +4176,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4090,15 +4210,15 @@ 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"
@@ -4109,28 +4229,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4140,31 +4261,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4182,20 +4307,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?"
 
@@ -4219,7 +4335,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4241,21 +4357,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:98
+#: 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:56
 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í"
 
@@ -4263,81 +4373,99 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4349,7 +4477,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4373,9 +4525,14 @@ msgstr "Soubory Resolv a Hosts"
 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"
 
@@ -4383,7 +4540,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 ""
 
@@ -4395,26 +4552,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Odhalit/skrýt heslo"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: 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:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4430,7 +4587,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4442,7 +4599,7 @@ 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 ""
 
@@ -4476,7 +4633,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4493,15 +4650,15 @@ msgstr ""
 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 ""
 
@@ -4510,9 +4667,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4521,17 +4678,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Uložit"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Uložit & použít"
@@ -4548,24 +4707,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Naplánované úlohy"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Přidána sekce"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Sekce odebrána"
 
@@ -4580,12 +4735,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4593,20 +4754,16 @@ 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: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"
 
@@ -4614,29 +4771,32 @@ msgstr "Typ služby"
 msgid "Services"
 msgstr "Služby"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4648,7 +4808,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4660,21 +4820,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4708,11 +4870,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4757,7 +4915,7 @@ msgstr ""
 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"
@@ -4765,50 +4923,58 @@ 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Po spuštění"
@@ -4825,11 +4991,12 @@ msgstr "Statické IPv6 trasy"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4844,19 +5011,20 @@ 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:976
 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:745
 #: 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"
 
@@ -4869,6 +5037,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -4888,41 +5057,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4965,6 +5136,8 @@ 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"
@@ -4987,7 +5160,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 ""
 
@@ -4995,48 +5168,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5052,7 +5201,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5072,6 +5221,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"
@@ -5096,6 +5251,10 @@ 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-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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5106,36 +5265,35 @@ msgid ""
 "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:1794
+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 "
@@ -5151,10 +5309,9 @@ 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:1150
+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!"
@@ -5191,7 +5348,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5200,18 +5357,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:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5223,10 +5372,18 @@ 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/wireless.js:1432
+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 "
@@ -5241,13 +5398,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."
@@ -5255,7 +5412,7 @@ 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>"
@@ -5269,22 +5426,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 ""
@@ -5301,8 +5458,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5312,7 +5469,7 @@ msgstr "Tato sekce zatím neobsahuje žádné hodnoty"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5320,7 +5477,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Časové pásmo"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5334,7 +5491,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 ""
 
@@ -5358,55 +5515,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5414,19 +5557,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5456,10 +5600,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 ""
@@ -5469,21 +5615,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Nespravovaný"
@@ -5497,18 +5653,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5531,11 +5694,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5545,42 +5724,40 @@ msgstr "Uptime"
 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"
 
@@ -5592,64 +5769,61 @@ 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"
 
@@ -5669,81 +5843,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:1257
 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:1313
 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 ""
 
@@ -5751,41 +5922,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5801,7 +5968,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5822,7 +5989,7 @@ msgstr ""
 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:1339
 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 "
@@ -5830,61 +5997,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: 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:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Bezdrátová síť je povolena"
 
@@ -5896,12 +6064,18 @@ msgstr "Zapisovat přijaté požadavky DNS do systemového logu"
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5940,18 +6114,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5959,11 +6129,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ý"
 
@@ -5979,22 +6149,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
@@ -6006,22 +6175,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "expirované"
 
@@ -6039,25 +6212,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 ""
 
@@ -6065,6 +6234,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
@@ -6103,21 +6276,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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í"
 
@@ -6125,7 +6295,7 @@ msgstr "žádné spojení"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "žádný"
 
@@ -6135,7 +6305,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6150,10 +6322,6 @@ msgstr "off"
 msgid "on"
 msgstr "on"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6171,66 +6339,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6247,7 +6415,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ý"
 
@@ -6328,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 ""
 
@@ -6366,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 ""
 
@@ -6379,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 ""
 
@@ -6399,14 +6567,19 @@ 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/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
@@ -6417,6 +6590,193 @@ msgstr "ano"
 msgid "« Back"
 msgstr "« Zpět"
 
+#~ 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"
 
@@ -6547,9 +6907,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 c98a5510c7..d2b68d19f8 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,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- benutzerdefiniert --"
@@ -98,7 +98,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:813
 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 +111,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:1321
 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,35 +124,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "802.11r: Schnelle Client-Ãœbergabe"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 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:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 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:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr "802.11w: Maximales Timeout"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -171,11 +172,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:819
 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:352
+#: 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 +186,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,16 +201,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "LED Konfiguration"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:62
+#: 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"
 
@@ -218,7 +219,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "MAC-Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
+#: 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</"
@@ -244,7 +245,7 @@ msgstr ""
 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 +253,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +316,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"
 
@@ -324,14 +329,14 @@ msgstr ""
 #: 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Access Point"
 
@@ -362,35 +367,47 @@ msgstr "Aktive DHCP-Leases"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktive DHCPv6-Leases"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -402,10 +419,15 @@ msgstr "Schlüssel hinzufügen"
 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -437,7 +459,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"
 
@@ -447,12 +469,12 @@ msgid "Administration"
 msgstr "Administration"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -466,12 +488,14 @@ msgstr "Vollständige Sendeleistung (ACTATP)"
 msgid "Alert"
 msgstr "Alarm"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\""
@@ -496,23 +520,21 @@ msgstr "IPs sequenziell vergeben"
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Nur gelistete erlauben"
 
@@ -541,15 +563,15 @@ 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:119
 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:781
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -558,106 +580,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:1480
 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 +674,13 @@ msgstr "Antennenkonfiguration"
 msgid "Any zone"
 msgstr "Beliebige Zone"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 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:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr "Ungeprüft übernehmen"
 
@@ -680,8 +688,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 +700,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Assoziierte Clients"
@@ -709,16 +717,16 @@ 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:1405
 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"
 
@@ -740,20 +748,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 +803,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -821,14 +831,6 @@ 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"
@@ -846,11 +848,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:784
 msgid "Beacon Interval"
 msgstr "Beacon-Intervall"
 
@@ -873,16 +875,16 @@ 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"
@@ -891,57 +893,63 @@ msgstr "Bitrate"
 msgid "Bogus NX Domain Override"
 msgstr "Ungültige \"NX-Domain\" Antworten ignorieren"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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"
 
@@ -965,7 +973,7 @@ msgstr "Kette"
 msgid "Change login password"
 msgstr "Login-Passwort ändern"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Änderungen"
 
@@ -973,9 +981,9 @@ msgstr "Änderungen"
 msgid "Changes applied."
 msgstr "Änderungen angewendet."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
-msgstr "Änderungen wurden verworfen"
+msgstr "Änderungen wurden verworfen."
 
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
 msgid "Changes the administrator password for accessing the device"
@@ -986,22 +994,14 @@ 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:1598
 #: 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 +1010,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:1786
 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 +1023,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:1809
 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 +1033,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>erzeugen</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:833
 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 +1044,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:1022
 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,14 +1069,14 @@ msgstr ""
 "herunterzuladen. (Hinweis: Diese Funktionalität ist nur für Experten "
 "gedacht!)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1085,18 +1085,18 @@ msgstr "Zu sendende Client-ID bei DHCP Anfragen"
 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..."
@@ -1106,11 +1106,8 @@ msgstr "Schließe Liste..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1121,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1145,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:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 +1161,52 @@ msgstr "Konfiguration fehlgeschlagen"
 msgid "Configuration files will be kept"
 msgstr "Konfigurationsdateien werden beibehalten"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "Die Konfiguration wurde angewendet."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "Die Konfiguration wurde zurückgerollt!"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Verbindungstrennung bestätigen"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1205,36 +1217,22 @@ 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:763
 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:1809
 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/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-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr "Schnittstelle anlegen"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Critical"
@@ -1244,6 +1242,10 @@ msgstr "Kritisch"
 msgid "Cron Log Level"
 msgstr "Cron Protokoll-Level"
 
+#: 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
@@ -1253,7 +1255,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 +1268,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:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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"
 
@@ -1332,7 +1335,7 @@ msgstr "DNS"
 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 ""
 
@@ -1344,15 +1347,15 @@ msgstr ""
 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 +1364,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1382,37 +1385,40 @@ msgstr "Datenrate"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1422,13 +1428,13 @@ msgstr ""
 "code>\" um einen anderen DNS-Server an Clients zu verteilen."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1437,18 +1443,30 @@ msgstr "Löschen"
 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:1649
+msgid "Delete permission denied"
+msgstr "Löscherlaubnis verweigert"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr "Löschanforderung fehlgeschlagen: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Beschreibung"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr "Abwählen"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Design"
@@ -1461,16 +1479,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:81
+#: 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,76 +1498,86 @@ 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:736
 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:1982
+#: 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:2437
 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Trennung bei schlechtem Antwortverhalten"
 
@@ -1557,34 +1587,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
@@ -1614,11 +1643,19 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Keine Rückwärtsauflösungen für lokale Netzwerke weiterleiten"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+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:173
 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-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1627,7 +1664,7 @@ msgstr "Anfragen nur mit Domain"
 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"
 
@@ -1649,11 +1686,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr "Ziehen zum Umsortieren"
 
@@ -1669,19 +1706,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 +1727,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:1370
 msgid "EAP-Method"
 msgstr "EAP-Methode"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1715,24 +1753,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:717
 msgid "Edit this network"
 msgstr "Dieses Netzwerk bearbeiten"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,27 +1778,28 @@ 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"
 
@@ -1768,7 +1807,7 @@ msgstr "Aktiviere Jumbo Frame Durchleitung"
 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"
 
@@ -1776,31 +1815,31 @@ msgstr "Single-DES aktivieren"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 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:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1847,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:712
 msgid "Enable this network"
 msgstr "Dieses Netzwerk aktivieren"
 
@@ -1816,21 +1855,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1838,28 +1877,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "Entfernter Port"
 
@@ -1875,6 +1918,11 @@ msgstr "Eigene Werte angeben"
 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
@@ -1888,12 +1936,12 @@ msgstr "Fehler"
 msgid "Errored seconds (ES)"
 msgstr "Fehlersekunden (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Netzwerkschnittstelle"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Netzwerk Switch"
@@ -1906,6 +1954,10 @@ msgstr "Schnittstellen ausschließen"
 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 +1966,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,15 +1974,15 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr "Externe R1-Key-Holder-List"
 
@@ -1946,32 +1998,44 @@ msgstr "Externer Protokollserver Port"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr "FT Protokoll"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Datei"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr "Datei nicht verfügbar"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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."
@@ -1990,6 +2054,7 @@ msgstr "Private Anfragen filtern"
 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 +2068,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 +2080,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:73
 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 +2092,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"
 
@@ -2059,33 +2124,33 @@ msgstr "Flash-Operationen"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2158,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 +2166,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 +2174,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:808
 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:773
 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:86
 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"
 
@@ -2169,6 +2229,7 @@ msgid "Gateway ports"
 msgstr "Gateway-Ports"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2176,11 +2237,10 @@ msgstr "Gateway-Ports"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Allgemeine Einstellungen"
 
@@ -2188,7 +2248,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:1339
 msgid "Generate PMK locally"
 msgstr "PMK lokal generieren"
 
@@ -2196,10 +2256,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2210,7 +2266,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 +2277,29 @@ msgstr "Globale Netzwerkeinstellungen"
 msgid "Go to password configuration..."
 msgstr "Zur Passwortkonfiguration..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2264,9 +2316,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "ESSID verstecken"
 
@@ -2277,6 +2327,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2284,7 +2335,7 @@ msgstr ""
 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,7 +2343,7 @@ 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"
 
@@ -2305,28 +2356,28 @@ msgstr "\"Host-Uniq\"-Bezeichner"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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"
 
@@ -2349,6 +2400,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 +2412,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 +2424,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,16 +2448,16 @@ 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 ""
 
@@ -2411,6 +2466,7 @@ msgstr ""
 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 +2481,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 +2503,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 +2515,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 +2527,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 +2549,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 +2574,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:1462
 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 +2623,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"
 
@@ -2603,7 +2673,7 @@ msgstr ""
 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"
 
@@ -2628,12 +2698,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"
 
@@ -2645,19 +2715,21 @@ msgstr "Eingehend:"
 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 +2739,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
 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:791
 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:953
 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 +2820,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Clients isolieren"
 
@@ -2762,15 +2869,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Trete Netzwerk %q bei"
 
@@ -2787,15 +2894,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Schlüssel Nr. %d"
 
@@ -2803,33 +2910,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"
 
@@ -2850,12 +2958,12 @@ 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:370
-#: 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"
 
@@ -2869,24 +2977,24 @@ msgstr "Leasedatei"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2916,7 +3024,7 @@ msgstr "Verbindungsstatus"
 msgid "Line Uptime"
 msgstr "Verbindungsdauer"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Verbindung hergestellt"
 
@@ -2928,7 +3036,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:1361
 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 +3051,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:1365
 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,7 +3066,7 @@ 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"
 
@@ -2974,7 +3082,7 @@ msgstr "Liste von Servern die falsche \"NX Domain\" Antworten liefern"
 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:51
 msgid "Listen Port"
 msgstr "Aktive Ports"
 
@@ -3007,7 +3115,11 @@ msgstr "Lade"
 msgid "Loading SSH keys…"
 msgstr "Lade SSH-Schlüssel…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr "Lade Verzeichniseinträge…"
+
+#: 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,20 +3129,20 @@ 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"
 
@@ -3038,7 +3150,7 @@ msgstr "Lokale IPv6 Adresse"
 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"
 
@@ -3083,10 +3195,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Protokolllevel"
@@ -3111,11 +3219,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"
@@ -3124,31 +3234,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3276,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3177,16 +3287,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3194,7 +3305,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr "Maximal erlaubter Inaktivitätszeitraum"
 
@@ -3210,28 +3321,23 @@ msgstr "Maximal zulässige Anzahl an gleichzeitigen DNS-Anfragen"
 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:760
+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
@@ -3250,42 +3356,43 @@ msgstr "Hauptspeicher"
 msgid "Memory usage (%)"
 msgstr "Speichernutzung (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modus"
@@ -3294,31 +3401,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3326,7 +3432,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr "Mehr Zeichen"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr "Mehr…"
 
@@ -3389,27 +3495,28 @@ 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:1313
 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 ""
 
@@ -3417,18 +3524,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "NTP Server Kandidaten"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Name des neuen Netzwerkes"
 
@@ -3438,7 +3542,8 @@ msgstr "Navigation"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3463,33 +3568,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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"
@@ -3498,18 +3621,6 @@ msgstr "Kein passendes delegiertes Prefix"
 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,6 +3628,10 @@ msgstr "Keine Netzwerke in Reichweite"
 msgid "No password set!"
 msgstr "Kein Passwort gesetzt!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr "Noch keine Peers definiert."
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "Bisher keine SSH-Schlüssel hinterlegt."
@@ -3525,19 +3640,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"
 
@@ -3557,8 +3672,8 @@ msgstr "Nicht-präemptive CRC-Fehler (CRC_P)"
 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"
 
@@ -3570,23 +3685,27 @@ 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:170
 msgid "Notice"
@@ -3606,55 +3725,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3782,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:756
 msgid "Operating frequency"
 msgstr "Betriebsfrequenz"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Option geändert"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3705,7 +3812,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 +3824,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:114
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3725,15 +3832,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:123
 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:105
 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:125
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
@@ -3741,15 +3848,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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3758,7 +3865,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 "Optional. Benutzte UDP-Port-Nummer für ausgehende und eingehende Pakete."
@@ -3780,54 +3887,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:953
 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 +3942,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 +3950,33 @@ msgstr "Überschreibt die benutzte Tabelle für interne Routen"
 msgid "Overview"
 msgstr "Ãœbersicht"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3984,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,63 +3995,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3948,11 +4061,11 @@ msgstr "Passwort"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Password des inneren, privaten Schlüssels"
 
@@ -3963,7 +4076,7 @@ msgstr "Password des inneren, privaten Schlüssels"
 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"
 
@@ -3971,27 +4084,27 @@ msgstr "Passwort Bestätigung"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Pfad zum inneren, privaten Schlüssel"
 
@@ -4009,7 +4122,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 +4131,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:86
 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 +4147,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:133
 msgid "Persistent Keep Alive"
 msgstr "Persistentes Keep-Alive"
 
@@ -4042,7 +4159,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 +4170,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
@@ -4074,15 +4195,15 @@ msgstr "Standardregel"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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"
 
@@ -4094,11 +4215,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"
 
@@ -4106,16 +4227,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:114
 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"
@@ -4127,12 +4248,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Privater Schlüssel"
 
@@ -4153,35 +4273,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Öffentlicher Schlüssel"
 
@@ -4199,17 +4313,17 @@ 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"
@@ -4220,29 +4334,30 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4252,31 +4367,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr "RX-Rate / TX-Rate"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 "
@@ -4297,21 +4416,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?"
 
@@ -4335,7 +4444,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "Reassoziierungsfrist"
 
@@ -4357,21 +4466,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:98
+#: 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:56
 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"
 
@@ -4379,75 +4482,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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 "
@@ -4457,7 +4558,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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr "Benötigt \"hostapd\""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+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:1103
+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:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+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:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4473,7 +4594,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:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr "Benötigt \"wpa-supplicant\""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+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:1115
+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:1111
+#: 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:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Benötigt \"wpa-supplicant\" mit SAE-Support"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4497,9 +4642,14 @@ msgstr "Resolv- und Hosts-Dateien"
 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"
 
@@ -4507,7 +4657,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"
 
@@ -4519,26 +4669,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Passwort zeigen/verstecken"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Verwerfen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "Änderungen verwerfen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 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:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "Verwerfe Konfigurationsänderungen..."
 
@@ -4554,7 +4704,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:123
 msgid "Route Allowed IPs"
 msgstr "Erlaubte IP-Addressen routen"
 
@@ -4566,7 +4716,7 @@ 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"
 
@@ -4601,7 +4751,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Laufzeitfehler"
 
@@ -4618,15 +4768,15 @@ msgstr ""
 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"
 
@@ -4635,9 +4785,9 @@ msgstr "SSH Benutzername"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4646,17 +4796,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Speichern"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Speichern & Anwenden"
@@ -4673,24 +4825,20 @@ msgstr "Inhalte von mtdblock-Partitionen speichern"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Geplante Aufgaben"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Sektion hinzugefügt"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Sektion entfernt"
 
@@ -4708,12 +4856,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4721,20 +4875,16 @@ 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: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"
 
@@ -4742,15 +4892,15 @@ msgstr "Service-Typ"
 msgid "Services"
 msgstr "Dienste"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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)."
@@ -4759,15 +4909,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"
 
@@ -4779,7 +4932,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:959
 msgid "Short Preamble"
 msgstr "Kurze Präambel"
 
@@ -4791,21 +4944,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:1596
 #: 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:1940
+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)"
@@ -4839,11 +4994,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Software-VLAN"
@@ -4889,7 +5040,7 @@ msgstr "Nennt das Verzeichnis, an welches das Gerät angebunden ist"
 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"
@@ -4897,7 +5048,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"
@@ -4905,11 +5056,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:760
+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)."
@@ -4917,7 +5078,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)."
@@ -4925,28 +5086,29 @@ 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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "Starte WLAN Scan..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Systemstart"
@@ -4963,11 +5125,12 @@ msgstr "Statische IPv6 Routen"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4983,19 +5146,20 @@ 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:976
 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:745
 #: 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"
 
@@ -5008,6 +5172,7 @@ 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:1823
 msgid "Submit"
 msgstr "Absenden"
 
@@ -5028,43 +5193,45 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr "Symbolischer Link"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr "Mit NTP-Server synchronisieren"
@@ -5108,6 +5275,8 @@ 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"
@@ -5130,7 +5299,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"
 
@@ -5138,29 +5307,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!"
@@ -5168,22 +5315,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5201,8 +5347,7 @@ msgstr ""
 "Die Konfigurationsdatei konnte aufgrund der folgenden Fehler nicht geladen "
 "werden:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1942
-#, fuzzy
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5212,10 +5357,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
@@ -5224,6 +5373,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"
@@ -5246,6 +5403,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Die folgenden Regeln sind zur Zeit auf dem System aktiv."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "Der angegebene öffentliche SSH-Schlüssel wurde bereits hinzugefügt."
@@ -5258,21 +5419,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."
@@ -5280,16 +5436,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:1794
+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 "
@@ -5307,10 +5467,11 @@ 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:1150
+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!"
@@ -5350,7 +5511,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:404
+#: 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"
 
@@ -5359,18 +5520,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:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5382,10 +5535,20 @@ 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/wireless.js:1432
+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 "
@@ -5407,7 +5570,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"
@@ -5416,7 +5579,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."
@@ -5424,7 +5587,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>"
@@ -5438,23 +5601,23 @@ msgid ""
 "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 ""
@@ -5473,8 +5636,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5484,7 +5647,7 @@ msgstr "Diese Sektion enthält noch keine Einträge"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr "Zeitintervall für die neubestimmung des Gruppenschlüssels"
 
@@ -5492,7 +5655,7 @@ msgstr "Zeitintervall für die neubestimmung des Gruppenschlüssels"
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Zum Login…"
 
@@ -5507,7 +5670,7 @@ msgstr ""
 "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"
 
@@ -5532,55 +5695,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5588,19 +5737,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB Anschlüsse"
 
@@ -5630,10 +5780,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"
@@ -5643,21 +5795,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Protokollfehler: %s"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: 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:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Ignoriert"
@@ -5671,18 +5833,25 @@ msgstr "Aushängen"
 msgid "Unnamed key"
 msgstr "Unbenannter Schlüssel"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5705,11 +5874,30 @@ 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:1698
+msgid "Upload file"
+msgstr "Datei hochladen"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr "Datei hochladen…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5719,42 +5907,40 @@ msgstr "Laufzeit"
 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"
 
@@ -5766,64 +5952,61 @@ 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"
 
@@ -5844,11 +6027,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:1257
 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:1313
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5856,71 +6039,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"
 
@@ -5928,41 +6108,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5978,7 +6154,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Warte auf das Anwenden der Konfiguration… %d Sek."
 
@@ -6001,7 +6177,7 @@ msgstr ""
 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:1339
 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 "
@@ -6012,61 +6188,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "WLAN-Gerät"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Das WLAN-Netzwerk ist aktiviert"
 
@@ -6078,12 +6255,20 @@ msgstr "Empfangene DNS-Anfragen in das Systemprotokoll schreiben"
 msgid "Write system log to file"
 msgstr "Systemprotokoll in Datei schreiben"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6124,18 +6309,14 @@ msgstr "ZRAM Größe"
 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:1029
+#: 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"
 
@@ -6143,11 +6324,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"
 
@@ -6163,22 +6344,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 "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
@@ -6190,22 +6370,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "abgelaufen"
 
@@ -6221,25 +6405,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"
 
@@ -6247,6 +6427,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
@@ -6285,21 +6469,18 @@ msgstr "Schlüssel mit exakt 5 oder 13 Zeichen"
 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:1344
 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"
 
@@ -6307,7 +6488,7 @@ msgstr "nicht verbunden"
 msgid "non-empty value"
 msgstr "nicht-leeren Wert"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "keine"
 
@@ -6317,7 +6498,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6332,10 +6515,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6353,66 +6532,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6429,7 +6608,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"
 
@@ -6510,8 +6689,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)"
 
@@ -6548,7 +6727,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 \".\")"
 
@@ -6561,11 +6740,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"
 
@@ -6581,14 +6760,19 @@ 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/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
@@ -6599,6 +6783,240 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Zurück"
 
+#~ 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"
 
@@ -6864,9 +7282,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 9547f4662b..fa4e76789b 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,19 @@ msgid "-- Additional Field --"
 msgstr "-- Επιπλέον Πεδίο --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- π�οσα�μοσμένο --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -170,11 +171,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:819
 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:352
+#: 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 +185,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,16 +202,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -219,7 +220,7 @@ msgstr "Όνομα <abbr title=\"Light Emitting Diode\">LED</abbr>"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -243,61 +244,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +312,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"
 
@@ -322,12 +327,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Σημείο Π�όσβασης"
 
@@ -360,35 +365,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -401,10 +418,15 @@ 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 "Π�οσθήκη νέας διεπαφής..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Επιπλέον α�χεία Hosts"
@@ -436,7 +458,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 "Διε�θυνση για π�όσβαση σε την τοπική γέφυ�α αναμετάδοσης"
 
@@ -446,12 +468,12 @@ msgid "Administration"
 msgstr "Διαχεί�ιση"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -465,12 +487,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Ειδοποίηση"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -495,21 +519,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "�α επιτ�έπονται μόνο αυτές στην λίστα"
 
@@ -539,94 +561,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -638,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"
-
-#: 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 +667,11 @@ msgstr ""
 msgid "Any zone"
 msgstr "Οιαδήποτε ζώνη"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -671,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 ""
@@ -681,13 +689,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Συνδεδεμένοι Σταθμοί"
@@ -696,16 +704,16 @@ 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:1405
 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 ""
 
@@ -727,17 +735,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 +790,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -808,14 +818,6 @@ 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 "Αποθήκευση"
@@ -834,11 +836,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -859,16 +861,16 @@ msgid ""
 "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 "Ρυθμός δεδομένων"
@@ -877,55 +879,61 @@ msgstr "Ρυθμός δεδομένων"
 msgid "Bogus NX Domain Override"
 msgstr "Πα�άκαμψη Ψευδο�ς Τομέα NX"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -949,7 +957,7 @@ msgstr "Αλυσίδα"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Αλλαγές"
 
@@ -957,7 +965,7 @@ msgstr "Αλλαγές"
 msgid "Changes applied."
 msgstr "Αλλαγές εφα�μόστηκαν."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -970,20 +978,14 @@ 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:1598
 #: 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 +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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1004,8 +1006,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:1809
 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 +1019,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:833
 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:1022
 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,14 +1047,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1061,12 +1063,12 @@ msgstr "Αναγνω�ιστικό πελάτη που αποστέλλετε κ
 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,11 +1085,8 @@ msgstr "Κλείσιμο λίστας..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1100,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1120,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1136,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
@@ -1213,6 +1213,10 @@ msgstr ""
 msgid "Cron Log Level"
 msgstr "Επίπεδο Καταγ�αφής Cron"
 
+#: 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
@@ -1222,7 +1226,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 +1236,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1244,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1300,7 +1305,7 @@ msgstr "DNS"
 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 ""
 
@@ -1312,15 +1317,15 @@ msgstr ""
 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 +1334,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1350,37 +1355,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1390,13 +1398,13 @@ msgstr ""
 "DNS στους πελάτες, για πα�άδειγμα \"<code>6,192.168.2.1,192.168.2.2</code>\"."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "Διαγ�αφή"
 
@@ -1405,18 +1413,30 @@ msgstr "Διαγ�αφή"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Πε�ιγ�αφή"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Εμφάνιση"
@@ -1435,10 +1455,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:81
+#: 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 +1468,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1462,26 +1493,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1520,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1525,34 +1557,33 @@ msgstr "Αγνόησε τις απαντήσεις ανοδικής �οής RFC
 
 #: 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1581,10 +1612,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 "Απαίτηση για όνομα τομέα"
@@ -1593,7 +1632,7 @@ msgstr "Απαίτηση για όνομα τομέα"
 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 ""
 
@@ -1617,11 +1656,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1638,20 +1677,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 +1699,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:1370
 msgid "EAP-Method"
 msgstr "Μέθοδος EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Επεξε�γασία"
 
@@ -1683,50 +1723,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Επεξε�γασία αυτο� του δικτ�ου"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
 
@@ -1734,7 +1775,7 @@ msgstr "Ενε�γοποίηση διέλευσης Jumbo Frame"
 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 ""
 
@@ -1742,31 +1783,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1815,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1782,48 +1823,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1839,6 +1884,11 @@ msgstr ""
 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
@@ -1852,12 +1902,12 @@ msgstr "Σφάλμα"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Π�οσα�μογέας Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
@@ -1870,6 +1920,10 @@ msgstr ""
 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 +1932,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,15 +1940,15 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1910,30 +1964,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Α�χείο"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 "Όνομα α�χείου της εικόνας εκκίνησης που διαφημίζετε στους πελάτες"
@@ -1952,6 +2018,7 @@ msgstr "Φιλτ�ά�ισμα ιδιωτικών"
 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 +2029,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 +2041,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:73
 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 +2053,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 ""
 
@@ -2018,32 +2085,32 @@ msgstr "Λειτου�γίες φλασά�ισματος"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2118,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 +2126,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 +2134,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:808
 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:773
 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:86
 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 ""
 
@@ -2125,6 +2187,7 @@ msgid "Gateway ports"
 msgstr "Θ��ες π�λης"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2132,11 +2195,10 @@ msgstr "Θ��ες π�λης"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2144,7 +2206,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2152,10 +2214,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2164,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 ""
 
@@ -2175,33 +2233,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 "Κ�έμασμα"
@@ -2218,9 +2272,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Κ�υφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2231,6 +2283,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2238,7 +2291,7 @@ msgstr ""
 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,7 +2300,7 @@ 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 ""
 
@@ -2260,28 +2313,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2304,6 +2357,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 +2369,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 +2381,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,16 +2405,16 @@ 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 ""
 
@@ -2366,6 +2423,7 @@ msgstr ""
 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 +2438,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 +2460,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 +2472,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 +2484,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 +2506,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 +2531,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:1462
 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 +2580,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 ""
 
@@ -2560,7 +2632,7 @@ msgstr ""
 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 "Αγνόησε διεπαφή"
 
@@ -2582,12 +2654,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 ""
 
@@ -2599,19 +2671,21 @@ msgstr ""
 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 +2693,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
 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:791
 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:953
 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 +2773,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2712,15 +2821,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2737,15 +2846,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Κλειδί #%d"
 
@@ -2753,33 +2862,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"
 
@@ -2800,12 +2910,12 @@ 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:370
-#: 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 ""
 
@@ -2819,24 +2929,24 @@ msgstr "Α�χείο Leases"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "Ό�ιο"
 
@@ -2864,7 +2974,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Αναμμένο με Ζε�ξη"
 
@@ -2874,7 +2984,7 @@ msgid ""
 "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:1361
 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 +2993,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:1365
 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,7 +3002,7 @@ 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 ""
 
@@ -2908,7 +3018,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2939,7 +3049,11 @@ msgstr "Φό�τωση"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2949,20 +3063,20 @@ 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"
 
@@ -2970,7 +3084,7 @@ msgstr "Τοπική διε�θυνση IPv6"
 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 ""
 
@@ -3007,10 +3121,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Επίπεδο εξόδου α�χείων καταγ�αφής"
@@ -3035,11 +3145,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"
@@ -3048,31 +3160,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3202,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3101,16 +3213,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3118,7 +3231,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3134,26 +3247,24 @@ msgstr "Μέγιστος επιτÏ�επόμενος αÏ�ιθμός ταυτόχÏ
 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:760
+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
@@ -3172,42 +3283,43 @@ msgstr "Μνήμη"
 msgid "Memory usage (%)"
 msgstr "Χ�ήση Μνήμης (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Λειτου�γία"
@@ -3216,31 +3328,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Πα�ακολο�θηση"
 
@@ -3248,7 +3359,7 @@ msgstr "Πα�ακολο�θηση"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3312,27 +3423,28 @@ 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:1313
 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 ""
 
@@ -3340,18 +3452,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Όνομα νέου δικτ�ου"
 
@@ -3361,7 +3470,8 @@ msgstr "Πλοήγηση"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3386,33 +3496,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3421,18 +3549,6 @@ msgstr ""
 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,6 +3556,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Δεν έχει ο�ιστεί κωδικός π�όσβασης!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3448,19 +3568,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 "Θό�υβος"
 
@@ -3480,8 +3600,8 @@ msgstr ""
 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 "Κανένα"
 
@@ -3493,22 +3613,26 @@ 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:170
@@ -3527,55 +3651,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3708,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Η επιλογή άλλαξε"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3744,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3687,7 +3799,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 +3808,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:953
 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 +3860,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Επισκόπηση"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +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 "PIN"
 
@@ -3789,63 +3905,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "Κωδικός Π�όσβασης"
 
@@ -3853,11 +3971,11 @@ msgstr "Κωδικός Π�όσβασης"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3868,7 +3986,7 @@ msgstr ""
 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 ""
 
@@ -3876,27 +3994,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3914,7 +4032,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 +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:86
 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 +4057,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3947,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 ""
 
@@ -3958,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
@@ -3979,15 +4105,15 @@ msgstr "Πολιτική"
 msgid "Port"
 msgstr "Θ��α"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3999,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 ""
 
@@ -4011,16 +4137,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:114
 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"
@@ -4030,13 +4156,12 @@ msgstr ""
 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:949
 #, 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4057,35 +4182,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4097,15 +4216,15 @@ 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 ""
@@ -4116,28 +4235,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4147,31 +4267,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4189,17 +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 ""
-
 #: 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 "Αλλαγή π�ωτοκόλλου;"
 
@@ -4223,7 +4341,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4245,21 +4363,15 @@ msgstr "Επανεκκίνηση..."
 msgid "Reboots the operating system of your device"
 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: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:56
 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 "Επανασ�νδεση της διεπαφής"
 
@@ -4267,80 +4379,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 ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4352,7 +4482,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4376,9 +4530,14 @@ msgstr "Α�χεία Resolv και Hosts"
 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 "Επανεκκίνηση"
 
@@ -4386,7 +4545,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 ""
 
@@ -4398,26 +4557,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Αναί�εση"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4433,7 +4592,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4445,7 +4604,7 @@ 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 ""
 
@@ -4481,7 +4640,7 @@ msgstr "Εκτέλεση ελέγχου του συστήματος α�χείω
 msgid "Run filesystem check"
 msgstr "Εκτέλεση ελέγχου συστήματος α�χείων"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4498,15 +4657,15 @@ msgstr ""
 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 ""
 
@@ -4515,9 +4674,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4526,17 +4685,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Αποθήκευση & Εφα�μογή"
@@ -4553,24 +4714,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Π�ογ�αμματισμένες Ε�γασίες"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4585,32 +4742,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 "Είδος Υπη�εσίας"
 
@@ -4618,29 +4776,32 @@ msgstr "Είδος Υπη�εσίας"
 msgid "Services"
 msgstr "Υπη�εσίες"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4652,7 +4813,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4664,21 +4825,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4712,11 +4875,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4760,56 +4919,64 @@ 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Εκκίνηση"
@@ -4826,11 +4993,12 @@ msgstr "Στατικές Διαδ�ομές IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Στατική διε�θυνση"
@@ -4842,19 +5010,20 @@ msgid ""
 "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:976
 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:745
 #: 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 ""
 
@@ -4867,6 +5036,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Υποβολή"
 
@@ -4886,41 +5056,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4963,6 +5135,8 @@ 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"
@@ -4985,7 +5159,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 ""
 
@@ -4993,40 +5167,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5042,7 +5200,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5062,6 +5220,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"
@@ -5083,6 +5247,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Οι πα�ακάτω κανόνες είναι αυτή τη στιγμή ενε�γοί σε αυτό το σ�στημα."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5093,33 +5261,35 @@ msgid ""
 "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:1794
+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 "
@@ -5129,9 +5299,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5169,7 +5338,7 @@ msgstr ""
 "Η εικόνα που ανεβάσατε δεν πε�ιέχει κάποια υποστη�ιζόμενη μο�φή. Βεβαιωθείτε "
 "ότι επιλέξατε την γενική μο�φή εικόνας για την πλατφό�μα σας."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5178,16 +5347,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Δεν υπά�χουν ενε�γά leases."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5197,10 +5360,18 @@ 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/wireless.js:1432
+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 "
@@ -5215,19 +5386,19 @@ 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>"
@@ -5241,22 +5412,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 ""
@@ -5274,8 +5445,8 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Αυτή η σελίδα δίνει μία εικόνα για τις τ�έχουσες ενε�γές συνδέσεις δικτ�ου."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5285,7 +5456,7 @@ msgstr "Αυτό το τμήμα δεν πε�ιέχει τιμές ακόμη"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5293,7 +5464,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Ζώνη ώ�ας"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5308,7 +5479,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 ""
 
@@ -5332,55 +5503,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "Τ�πος"
 
@@ -5388,19 +5545,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5430,10 +5588,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 ""
@@ -5443,21 +5603,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5471,18 +5641,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5502,11 +5679,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5516,42 +5709,40 @@ msgstr "Χ�όνος εν λειτου�γία"
 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 ""
 
@@ -5563,64 +5754,61 @@ 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 ""
 
@@ -5637,81 +5825,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:1257
 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:1313
 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 ""
-
 #: 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 ""
 
@@ -5719,41 +5904,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5767,7 +5948,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5788,7 +5969,7 @@ msgstr ""
 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:1339
 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 "
@@ -5796,61 +5977,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Ασ��ματος Π�οσα�μογέας"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Το ασ��ματο δίκτυο είναι ενε�γό"
 
@@ -5862,12 +6044,18 @@ msgstr "Καταγ�αφή των ληφθέντων DNS αιτήσεων στο
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5906,18 +6094,14 @@ msgstr ""
 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:1029
+#: 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 "αυτόματα"
 
@@ -5926,11 +6110,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 ""
 
@@ -5946,23 +6130,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
@@ -5974,22 +6157,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -6007,25 +6194,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 ""
 
@@ -6033,6 +6216,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
@@ -6071,21 +6258,18 @@ msgstr ""
 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:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "όχι"
 
-#: 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 ""
 
@@ -6093,7 +6277,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "κανένα"
 
@@ -6103,7 +6287,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6118,10 +6304,6 @@ msgstr "κλειστό"
 msgid "on"
 msgstr "ανοιχτό"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6139,66 +6321,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6215,7 +6397,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 ""
 
@@ -6296,8 +6478,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 ""
 
@@ -6334,7 +6516,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 ""
 
@@ -6347,11 +6529,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 ""
 
@@ -6367,14 +6549,19 @@ 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/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
@@ -6385,6 +6572,115 @@ msgstr "ναι"
 msgid "« Back"
 msgstr "« Πίσω"
 
+#~ 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 "Πίσω"
 
@@ -6481,9 +6777,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 815c0d14c5..3404b5208d 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- custom --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -170,11 +171,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:819
 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:352
+#: 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 +185,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,16 +202,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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"
 
@@ -219,7 +220,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -243,61 +244,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +312,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"
 
@@ -322,12 +327,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Access Point"
 
@@ -358,35 +363,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -398,10 +415,15 @@ msgstr ""
 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -433,7 +455,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"
 
@@ -443,12 +465,12 @@ msgid "Administration"
 msgstr "Administration"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +484,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Alert"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -490,21 +514,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Allow listed only"
 
@@ -530,94 +552,94 @@ msgid ""
 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -629,20 +651,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 +658,11 @@ msgstr ""
 msgid "Any zone"
 msgstr "Any zone"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -662,8 +670,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 +680,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Associated Stations"
@@ -687,16 +695,16 @@ 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:1405
 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 ""
 
@@ -718,17 +726,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 +781,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -799,14 +809,6 @@ 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 ""
@@ -824,11 +826,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -848,16 +850,16 @@ msgid ""
 "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"
@@ -866,55 +868,61 @@ msgstr "Bitrate"
 msgid "Bogus NX Domain Override"
 msgstr "Bogus NX Domain Override"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -938,7 +946,7 @@ msgstr "Chain"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Changes"
 
@@ -946,7 +954,7 @@ msgstr "Changes"
 msgid "Changes applied."
 msgstr "Changes applied."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -959,20 +967,14 @@ 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:1598
 #: 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 +983,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -993,8 +995,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:1809
 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 +1008,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:833
 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:1022
 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,14 +1036,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1050,12 +1052,12 @@ msgstr "Client ID to send when requesting DHCP"
 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"
@@ -1071,11 +1073,8 @@ msgstr "Close list..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1088,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1108,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1124,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1201,6 +1201,10 @@ msgstr "Critical"
 msgid "Cron Log Level"
 msgstr "Cron Log Level"
 
+#: 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
@@ -1210,7 +1214,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 +1224,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1232,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1288,7 +1293,7 @@ msgstr "DNS"
 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 ""
 
@@ -1300,15 +1305,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1338,37 +1343,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1379,13 +1387,13 @@ msgstr ""
 "servers to clients."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1394,18 +1402,30 @@ msgstr "Delete"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Description"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Design"
@@ -1424,10 +1444,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:81
+#: 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 +1457,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1451,58 +1482,59 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1512,34 +1544,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1564,10 +1595,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1576,7 +1615,7 @@ msgstr "Domain required"
 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 ""
 
@@ -1600,11 +1639,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1620,40 +1659,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:1370
 msgid "EAP-Method"
 msgstr "EAP-Method"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Edit"
 
@@ -1663,50 +1703,51 @@ 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:717
+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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1714,7 +1755,7 @@ msgstr ""
 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 ""
 
@@ -1722,31 +1763,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1795,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1762,48 +1803,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1819,6 +1864,11 @@ msgstr ""
 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
@@ -1832,12 +1882,12 @@ msgstr "Error"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet Adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
@@ -1850,6 +1900,10 @@ msgstr ""
 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,20 +1912,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1887,30 +1941,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1929,6 +1995,7 @@ msgstr "Filter private"
 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 +2006,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 +2018,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:73
 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 +2030,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 ""
 
@@ -1995,31 +2062,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +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 ""
 
@@ -2035,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 ""
 
@@ -2043,46 +2110,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:808
 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:773
 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:86
 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 ""
 
@@ -2101,6 +2163,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2108,11 +2171,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "General Setup"
 
@@ -2120,7 +2182,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2128,10 +2190,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2140,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 ""
 
@@ -2151,33 +2209,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2194,9 +2248,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2207,6 +2259,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2214,7 +2267,7 @@ msgstr ""
 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,7 +2275,7 @@ 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 ""
 
@@ -2235,28 +2288,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2279,6 +2332,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 +2344,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 +2356,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,16 +2380,16 @@ 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 ""
 
@@ -2341,6 +2398,7 @@ msgstr ""
 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 +2413,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 +2435,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 +2447,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 +2459,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 +2481,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 +2506,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:1462
 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 +2551,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 ""
 
@@ -2530,7 +2602,7 @@ msgstr ""
 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"
 
@@ -2552,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 ""
 
@@ -2569,19 +2641,21 @@ msgstr ""
 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 +2663,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
 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:791
 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:953
 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 +2743,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2682,15 +2791,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2707,15 +2816,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2723,33 +2832,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 ""
 
@@ -2770,12 +2880,12 @@ 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:370
-#: 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 ""
 
@@ -2789,24 +2899,24 @@ msgstr "Leasefile"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2834,7 +2944,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link On"
 
@@ -2844,7 +2954,7 @@ msgid ""
 "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:1361
 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 +2963,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:1365
 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,7 +2972,7 @@ 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 ""
 
@@ -2878,7 +2988,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2909,7 +3019,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2919,20 +3033,20 @@ 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 ""
 
@@ -2940,7 +3054,7 @@ msgstr ""
 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 ""
 
@@ -2977,10 +3091,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -3005,11 +3115,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"
@@ -3018,31 +3130,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3172,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3071,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3088,7 +3201,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3104,25 +3217,23 @@ msgstr ""
 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:760
+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
@@ -3141,42 +3252,43 @@ msgstr "Memory"
 msgid "Memory usage (%)"
 msgstr "Memory usage (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3185,31 +3297,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3217,7 +3328,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3280,27 +3391,28 @@ 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:1313
 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 ""
 
@@ -3308,18 +3420,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Name of the new network"
 
@@ -3329,7 +3438,8 @@ msgstr "Navigation"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3354,33 +3464,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3389,18 +3517,6 @@ msgstr ""
 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,6 +3524,10 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3416,19 +3536,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"
 
@@ -3448,8 +3568,8 @@ msgstr ""
 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 ""
 
@@ -3461,22 +3581,26 @@ 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:170
@@ -3495,55 +3619,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3676,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3712,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3655,7 +3767,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 +3776,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:953
 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 +3828,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Overview"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3862,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,63 +3873,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3821,11 +3939,11 @@ msgstr "Password"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3836,7 +3954,7 @@ msgstr ""
 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 ""
 
@@ -3844,27 +3962,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3882,7 +4000,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 +4009,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:86
 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 +4025,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3915,7 +4037,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 +4048,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
@@ -3947,15 +4073,15 @@ msgstr "Policy"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3967,11 +4093,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 ""
 
@@ -3979,16 +4105,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:114
 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"
@@ -3998,12 +4124,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4024,35 +4149,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4064,15 +4183,15 @@ 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 ""
@@ -4083,28 +4202,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4114,31 +4234,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4156,17 +4280,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 ""
 
@@ -4190,7 +4308,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4212,21 +4330,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:98
+#: 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:56
 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 ""
 
@@ -4234,80 +4346,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4319,7 +4449,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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,9 +4497,14 @@ msgstr ""
 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"
 
@@ -4353,7 +4512,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 ""
 
@@ -4365,26 +4524,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revert"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4400,7 +4559,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4412,7 +4571,7 @@ 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 ""
 
@@ -4447,7 +4606,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4464,15 +4623,15 @@ msgstr ""
 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 ""
 
@@ -4481,9 +4640,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4492,17 +4651,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Save"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Save & Apply"
@@ -4519,24 +4680,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4551,31 +4708,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4583,29 +4742,32 @@ msgstr ""
 msgid "Services"
 msgstr "Services"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4617,7 +4779,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4629,21 +4791,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4677,11 +4841,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4723,56 +4883,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4789,11 +4957,12 @@ msgstr "Static IPv6 Routes"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4805,19 +4974,20 @@ msgid ""
 "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:976
 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:745
 #: 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"
 
@@ -4830,6 +5000,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Submit"
 
@@ -4849,41 +5020,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4926,6 +5099,8 @@ 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"
@@ -4948,7 +5123,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 ""
 
@@ -4956,40 +5131,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5003,7 +5162,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5023,6 +5182,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"
@@ -5044,6 +5209,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "The following rules are currently active on this system."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5054,33 +5223,35 @@ msgid ""
 "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:1794
+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 "
@@ -5090,9 +5261,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5130,7 +5300,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5139,16 +5309,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5158,10 +5322,18 @@ 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/wireless.js:1432
+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 "
@@ -5176,19 +5348,19 @@ 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>"
@@ -5202,20 +5374,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 ""
@@ -5232,8 +5404,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5243,7 +5415,7 @@ msgstr "This section contains no values yet"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5251,7 +5423,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Timezone"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5265,7 +5437,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 ""
 
@@ -5289,55 +5461,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5345,19 +5503,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5387,10 +5546,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 ""
@@ -5400,21 +5561,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5428,18 +5599,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5459,11 +5637,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5473,42 +5667,40 @@ msgstr "Uptime"
 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 ""
 
@@ -5520,64 +5712,61 @@ 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 ""
 
@@ -5594,81 +5783,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:1257
 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:1313
 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)"
-msgstr ""
-
 #: 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 ""
 
@@ -5676,41 +5862,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5726,7 +5908,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5747,7 +5929,7 @@ msgstr ""
 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:1339
 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 "
@@ -5755,61 +5937,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Wireless Adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr ""
 
@@ -5821,12 +6004,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5864,18 +6053,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5883,11 +6068,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 ""
 
@@ -5903,22 +6088,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
@@ -5930,22 +6114,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5963,25 +6151,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 ""
 
@@ -5989,6 +6173,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
@@ -6027,21 +6215,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -6049,7 +6234,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "none"
 
@@ -6059,7 +6244,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6074,10 +6261,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6095,66 +6278,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6171,7 +6354,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 ""
 
@@ -6252,8 +6435,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 ""
 
@@ -6290,7 +6473,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 ""
 
@@ -6303,11 +6486,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 ""
 
@@ -6323,14 +6506,19 @@ 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/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
@@ -6341,6 +6529,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 740eff6190..dfab6f9562 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -3,17 +3,17 @@ 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-12 16:33-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: Poedit 2.2.3\n"
+"X-Generator: Poedit 2.0.6\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"
 
@@ -21,11 +21,11 @@ msgstr "%.1f dB"
 msgid "%d Bit"
 msgstr "%d Bit"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- Personalizado --"
@@ -98,7 +98,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:813
 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 +112,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:1321
 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,35 +125,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "Habilitar 802.11r (FT)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 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:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 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:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 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:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -172,11 +173,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:819
 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:352
+#: 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 +188,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,16 +205,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -222,7 +223,7 @@ msgstr "Nombre del <abbr title=\"Light Emitting Diode\">LED</abbr>"
 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:373
+#: 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>"
 
@@ -239,14 +240,14 @@ 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:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Máx.</abbr> 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 +255,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +319,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"
 
@@ -329,12 +334,12 @@ msgstr "ID del proveedor del sistema ATU-C"
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "AP"
 
@@ -365,35 +370,47 @@ msgstr "Clientes DHCP activos"
 msgid "Active DHCPv6 Leases"
 msgstr "Clientes DHCPv6 activos"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -407,10 +424,15 @@ 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -442,7 +464,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"
 
@@ -452,12 +474,12 @@ msgid "Administration"
 msgstr "Administración"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -471,12 +493,14 @@ msgstr "Potencia de transmisión agregada (ACTATP)"
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\""
@@ -503,22 +527,20 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Permitir a los pertenecientes en la lista"
 
@@ -546,15 +568,15 @@ msgid ""
 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:119
 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:781
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -562,82 +584,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:1480
 msgid "Anonymous Identity"
 msgstr "Identidad anónima"
 
@@ -649,20 +671,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 +678,11 @@ msgstr "Configuración de la antena"
 msgid "Any zone"
 msgstr "Cualquier zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 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:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr "Aplicar sin restricción"
 
@@ -682,8 +690,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 +702,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Dispositivos conectados"
@@ -711,16 +719,16 @@ 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:1405
 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"
 
@@ -742,17 +750,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 +807,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -825,14 +835,6 @@ 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"
@@ -850,11 +852,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:784
 msgid "Beacon Interval"
 msgstr "Intervalo de baliza"
 
@@ -877,16 +879,16 @@ 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"
@@ -895,56 +897,62 @@ msgstr "Bitrate"
 msgid "Bogus NX Domain Override"
 msgstr "Ignorar dominio falso NX"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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"
 
@@ -968,7 +976,7 @@ msgstr "Cadena"
 msgid "Change login password"
 msgstr "Cambiar contraseña de inicio de sesión"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Cambios"
 
@@ -976,7 +984,7 @@ msgstr "Cambios"
 msgid "Changes applied."
 msgstr "Cambios aplicados."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "Se revirtieron los cambios."
 
@@ -989,22 +997,14 @@ 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:1598
 #: 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 +1013,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:1786
 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 +1025,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:1809
 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 +1038,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:833
 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 +1046,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:1022
 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,14 +1070,14 @@ 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:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1086,12 +1086,12 @@ msgstr "ID de cliente que se enviará al solicitar DHCP"
 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"
@@ -1107,11 +1107,8 @@ msgstr "Cerrar lista..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1122,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 ""
+
 #: 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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1147,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:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 +1163,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:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "Se ha aplicado la configuración."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "¡La configuración ha sido revertida!"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Confirmar desconexión"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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 "Continuar"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1207,37 +1219,23 @@ 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:763
 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:1809
 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:173
 msgid "Critical"
 msgstr "Crítico"
@@ -1246,6 +1244,10 @@ msgstr "Crítico"
 msgid "Cron Log Level"
 msgstr "Nivel de registro de cron"
 
+#: 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
@@ -1255,7 +1257,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 +1269,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:54
+#: 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 +1277,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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"
 
@@ -1335,7 +1338,7 @@ msgstr "DNS"
 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"
 
@@ -1347,15 +1350,15 @@ msgstr "DNSSEC"
 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 +1367,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:962
 msgid "DTIM Interval"
 msgstr "Intervalo DTIM"
 
@@ -1385,37 +1388,40 @@ msgstr "Velocidad de datos"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Estado por defecto"
 
-#: 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 "
@@ -1426,13 +1432,13 @@ msgstr ""
 "DNS a los clientes."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1441,18 +1447,30 @@ msgstr "Eliminar"
 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:1649
+msgid "Delete permission denied"
+msgstr "Eliminar permiso denegado"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+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:722
 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:962
 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:105
 msgid "Description"
 msgstr "Descripción"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr "Deseleccionar"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Diseño"
@@ -1471,10 +1489,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:81
+#: 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 +1502,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "Dispositivo inalcanzable!"
 
@@ -1498,26 +1527,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1554,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Desasociarse en un reconocimiento bajo"
 
@@ -1561,33 +1591,32 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 msgid "Distance to farthest network member in meters."
-msgstr "Distancia al miembro de la red mas lejana en metros."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversidad"
+msgstr "Distancia en metros al miembro mas lejano de la red."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
 msgid ""
@@ -1615,10 +1644,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "No reenviar búsquedas inversas para redes locales"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+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:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr "¿Realmente quiere eliminar la siguiente clave SSH?"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1627,7 +1664,7 @@ msgstr "Requerir dominio"
 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"
 
@@ -1651,11 +1688,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr "Arrastrar para reordenar"
 
@@ -1671,20 +1708,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 +1730,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:1370
 msgid "EAP-Method"
 msgstr "Método EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Editar"
 
@@ -1718,24 +1756,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:717
 msgid "Edit this network"
 msgstr "Editar esta red"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,27 +1781,28 @@ 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"
 
@@ -1771,7 +1810,7 @@ msgstr "Habilitar paso de tramas jumbo"
 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"
 
@@ -1779,31 +1818,31 @@ msgstr "Habilitar solo DES"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 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:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1851,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:712
 msgid "Enable this network"
 msgstr "Habilitar esta red"
 
@@ -1820,21 +1859,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1842,28 +1881,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "Punto final del puerto"
 
@@ -1879,6 +1922,11 @@ msgstr "Ingrese valores personalizados"
 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
@@ -1892,12 +1940,12 @@ msgstr "Error"
 msgid "Errored seconds (ES)"
 msgstr "Segundos errados (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch ethernet"
@@ -1910,6 +1958,10 @@ msgstr "Excluir interfaces"
 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 "Esperando: %s"
@@ -1918,22 +1970,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr "Lista de soporte de clave externa R1"
 
@@ -1949,32 +2001,44 @@ msgstr "Puerto del servidor externo de registro del sistema"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr "Protocolo FT"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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 ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1556
 msgid "File"
 msgstr "Archivo"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr "Archivo no accesible"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1993,6 +2057,7 @@ msgstr "Filtro privado"
 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 +2071,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 +2083,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:73
 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 +2095,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"
 
@@ -2062,31 +2127,31 @@ msgstr "Operaciones de grabado"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2159,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 +2167,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 +2175,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:808
 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:773
 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:86
 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"
 
@@ -2171,6 +2230,7 @@ msgid "Gateway ports"
 msgstr "Puertos del gateway"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2178,11 +2238,10 @@ msgstr "Puertos del gateway"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Configuración general"
 
@@ -2190,7 +2249,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:1339
 msgid "Generate PMK locally"
 msgstr "Generar PMK localmente"
 
@@ -2198,10 +2257,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2212,7 +2267,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 +2276,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:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2266,9 +2317,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2279,6 +2328,7 @@ 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:1939
 msgid "Host"
 msgstr "Host"
 
@@ -2286,7 +2336,7 @@ msgstr "Host"
 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,7 +2344,7 @@ 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"
 
@@ -2307,28 +2357,28 @@ msgstr "Contenido de la etiqueta Host-Uniq"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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"
 
@@ -2351,6 +2401,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 +2413,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 +2425,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,16 +2449,16 @@ 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"
 
@@ -2413,6 +2467,7 @@ msgstr "IPv4+IPv6"
 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 +2482,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 +2504,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 +2516,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 +2528,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 +2550,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 +2575,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:1462
 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 +2624,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 ""
@@ -2608,7 +2677,7 @@ msgstr ""
 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"
 
@@ -2633,12 +2702,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"
 
@@ -2650,19 +2719,21 @@ msgstr "Entrante:"
 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 +2741,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
 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:791
 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 %d tiene 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:953
 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 +2821,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Aislar clientes"
 
@@ -2762,15 +2868,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Conectarse a: %q"
 
@@ -2787,15 +2893,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Clave #%d"
 
@@ -2803,33 +2909,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"
 
@@ -2850,12 +2957,12 @@ 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:370
-#: 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"
 
@@ -2869,24 +2976,24 @@ msgstr "Archivo de conexiones"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2916,7 +3023,7 @@ 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:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Enlace activado"
 
@@ -2928,7 +3035,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:1361
 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 +3049,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:1365
 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,7 +3064,7 @@ 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"
 
@@ -2973,7 +3080,7 @@ msgstr "Lista de dispositivos que proporcionan resultados de dominio NX falsos"
 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:51
 msgid "Listen Port"
 msgstr "Puerto"
 
@@ -3004,7 +3111,11 @@ msgstr "Cargando"
 msgid "Loading SSH keys…"
 msgstr "Cargando claves SSH..."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr "Cargando el contenido del directorio..."
+
+#: 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,20 +3125,20 @@ 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"
 
@@ -3035,7 +3146,7 @@ msgstr "Dirección local IPv6"
 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"
 
@@ -3078,10 +3189,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Nivel de registro"
@@ -3106,11 +3213,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"
@@ -3119,31 +3228,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3270,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3174,16 +3283,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr "AP"
 
@@ -3191,7 +3301,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr "Máximo permitido de intervalo de escucha"
 
@@ -3207,27 +3317,23 @@ msgstr "Número máximo de consultas DNS concurrentes"
 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:760
+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
@@ -3246,42 +3352,43 @@ msgstr "Memoria"
 msgid "Memory usage (%)"
 msgstr "Uso de RAM (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modo"
@@ -3290,31 +3397,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3322,7 +3428,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr "Más caracteres"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr "Más…"
 
@@ -3385,27 +3491,28 @@ 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:1313
 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"
 
@@ -3413,18 +3520,15 @@ msgstr "Dominio NT"
 msgid "NTP server candidates"
 msgstr "Servidores NTP a consultar"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nombre de la nueva red"
 
@@ -3434,7 +3538,8 @@ msgstr "Navegación"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3459,33 +3564,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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"
@@ -3494,18 +3617,6 @@ msgstr "No hay delegación de prefijo coincidente"
 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,6 +3624,10 @@ msgstr "No hay redes en rango"
 msgid "No password set!"
 msgstr "¡Sin contraseña!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr "Sin pares definidos"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "No hay claves públicas presentes todavía."
@@ -3521,19 +3636,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"
 
@@ -3553,8 +3668,8 @@ msgstr "Errores de CRC no preventivos (CRC P)"
 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"
 
@@ -3566,23 +3681,27 @@ 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:170
 msgid "Notice"
@@ -3602,54 +3721,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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"
 
@@ -3671,28 +3778,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:756
 msgid "Operating frequency"
 msgstr "Frecuencia de operación"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Opción cambiada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3700,7 +3808,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 +3820,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:114
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3721,30 +3829,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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3753,7 +3861,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "Opcional. Puerto UDP utilizado para paquetes salientes y entrantes."
 
@@ -3774,7 +3882,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 +3891,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:953
 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 +3937,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 +3945,33 @@ msgstr "Anular la tabla utilizada para rutas internas"
 msgid "Overview"
 msgstr "Descripción general"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3979,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,63 +3990,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3942,11 +4056,11 @@ msgstr "Contraseña"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Contraseña de clave privada interna"
 
@@ -3957,7 +4071,7 @@ msgstr "Contraseña de clave privada interna"
 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"
 
@@ -3965,27 +4079,27 @@ msgstr "Contraseña2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Ruta a la clave privada interna"
 
@@ -4003,7 +4117,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 +4126,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:86
 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 +4142,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:133
 msgid "Persistent Keep Alive"
 msgstr "Mantener vivo persistente"
 
@@ -4036,7 +4154,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 +4165,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
@@ -4068,15 +4190,15 @@ msgstr "Política"
 msgid "Port"
 msgstr "Puerto"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
-msgstr ""
+msgstr "Puerto %s"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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"
 
@@ -4088,11 +4210,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"
 
@@ -4100,16 +4222,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:114
 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"
@@ -4121,12 +4243,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Clave privada"
 
@@ -4147,35 +4268,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Clave pública"
 
@@ -4192,17 +4307,17 @@ 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"
@@ -4215,28 +4330,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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4246,31 +4362,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr "Tasa RX / Tasa TX"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 "
@@ -4293,20 +4413,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?"
 
@@ -4330,7 +4441,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "Fecha límite de reasociación"
 
@@ -4352,21 +4463,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:98
+#: 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:56
 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"
 
@@ -4374,73 +4479,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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 "
@@ -4450,7 +4553,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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr "Requiere hostapd"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr "Requiere hostapd con soporte EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr "Requiere hostapd con soporte OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr "Requiere hostapd con soporte SAE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4466,7 +4589,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:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr "Requiere wpa-supplicant"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+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:1115
+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:1111
+#: 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:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Requiere wpa-supplicant con soporte SAE"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4490,9 +4637,14 @@ msgstr "Archivos Resolv y Hosts"
 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"
 
@@ -4500,7 +4652,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"
 
@@ -4512,26 +4664,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Mostrar/ocultar contraseña"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revertir"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "Revertir cambios"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 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:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "Revirtiendo configuración..."
 
@@ -4547,7 +4699,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:123
 msgid "Route Allowed IPs"
 msgstr "Ruta permitida IPs"
 
@@ -4559,7 +4711,7 @@ 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"
 
@@ -4594,7 +4746,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Error de tiempo de ejecución"
 
@@ -4611,15 +4763,15 @@ msgstr "SNR"
 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"
 
@@ -4628,9 +4780,9 @@ msgstr "Nombre de usuario SSH"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4639,17 +4791,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "SWAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Guardar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Guardar y aplicar"
@@ -4666,24 +4820,20 @@ msgstr "Guardar contenidos mtdblock"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Tareas programadas"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Sección añadida"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Sección removida"
 
@@ -4701,12 +4851,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4714,20 +4870,16 @@ 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: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"
 
@@ -4735,15 +4887,15 @@ msgstr "Tipo de servicio"
 msgid "Services"
 msgstr "Aplicaciones"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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)."
@@ -4752,15 +4904,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"
 
@@ -4772,7 +4927,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:959
 msgid "Short Preamble"
 msgstr "Preámbulo corto"
 
@@ -4784,21 +4939,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:1596
 #: 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:1940
+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)"
@@ -4832,11 +4989,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Software VLAN"
@@ -4882,7 +5035,7 @@ 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"
@@ -4890,7 +5043,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"
@@ -4898,11 +5051,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:760
+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)."
@@ -4910,7 +5073,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)."
@@ -4918,28 +5081,29 @@ 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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "Iniciando escaneo de WiFi..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Arranque"
@@ -4956,11 +5120,12 @@ msgstr "Rutas IPv6 estáticas"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4976,19 +5141,20 @@ 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:976
 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:745
 #: 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"
 
@@ -5001,6 +5167,7 @@ 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:1823
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5020,43 +5187,45 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr "Enlace simbólico"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr "Sincronizar con el servidor NTP"
@@ -5099,6 +5268,8 @@ 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"
@@ -5122,7 +5293,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"
 
@@ -5130,30 +5301,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!"
@@ -5161,22 +5309,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5193,7 +5340,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5220,6 +5367,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"
@@ -5244,6 +5399,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Las siguientes reglas están actualmente activas en este sistema."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "La clave pública SSH dada ya se ha agregado."
@@ -5256,36 +5415,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:1794
+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 "
@@ -5301,10 +5460,9 @@ 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:1150
+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!"
@@ -5315,8 +5473,8 @@ 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
 msgid ""
@@ -5341,7 +5499,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "No hay direcciones activas"
 
@@ -5350,18 +5508,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:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5371,12 +5521,20 @@ 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/wireless.js:1432
+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 "
@@ -5397,7 +5555,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"
@@ -5406,7 +5564,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."
@@ -5414,7 +5572,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>"
@@ -5430,22 +5588,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 ""
@@ -5462,8 +5620,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5473,7 +5631,7 @@ msgstr "No hay reglas definidas"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr "Intervalo de tiempo para reprogramar GTK"
 
@@ -5481,7 +5639,7 @@ msgstr "Intervalo de tiempo para reprogramar GTK"
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Iniciar sesión…"
 
@@ -5496,7 +5654,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"
 
@@ -5520,55 +5678,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5576,19 +5720,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Puertos USB"
 
@@ -5618,10 +5763,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"
@@ -5631,21 +5778,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 ""
+
 #: 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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: 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:1265
+#: 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:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "No administrado"
@@ -5659,18 +5816,25 @@ msgstr "Desmontar"
 msgid "Unnamed key"
 msgstr "Clave sin nombre"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5693,11 +5857,30 @@ 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:1698
+msgid "Upload file"
+msgstr "Subir archivo"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr "Subir archivo..."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5707,42 +5890,40 @@ msgstr "Tiempo activo"
 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"
 
@@ -5754,64 +5935,61 @@ 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"
 
@@ -5832,11 +6010,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:1257
 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:1313
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5844,71 +6022,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 ""
+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"
 
@@ -5916,41 +6091,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5966,7 +6137,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Esperando a que se aplique la configuración… %ds"
 
@@ -5987,7 +6158,7 @@ msgstr "Advertencia: ¡Hay cambios no aplicados que se perderán al reiniciar!"
 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:1339
 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 "
@@ -5998,61 +6169,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptador WiFi"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Red WiFi habilitada"
 
@@ -6064,12 +6236,20 @@ msgstr "Escribe las peticiones de DNS recibidas en el registro del sistema"
 msgid "Write system log to file"
 msgstr "Escribe el registro del sistema al archivo"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6109,18 +6289,14 @@ msgstr "Tamaño de ZRam"
 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:1029
+#: 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"
 
@@ -6128,11 +6304,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"
 
@@ -6148,22 +6324,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
@@ -6175,22 +6350,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "Expirado"
 
@@ -6208,25 +6387,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"
 
@@ -6234,6 +6409,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
@@ -6272,21 +6451,18 @@ msgstr "clave de 5 o 13 caracteres"
 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:1344
 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"
 
@@ -6294,7 +6470,7 @@ msgstr "Sin enlace"
 msgid "non-empty value"
 msgstr "valor no vacío"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "ninguno"
 
@@ -6304,7 +6480,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6319,10 +6497,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6340,66 +6514,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6416,7 +6590,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"
 
@@ -6497,8 +6671,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)"
 
@@ -6535,7 +6709,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 \".\")"
 
@@ -6548,11 +6722,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"
 
@@ -6568,14 +6742,19 @@ 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/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
@@ -6586,6 +6765,239 @@ msgstr "Si"
 msgid "« Back"
 msgstr "« Volver"
 
+#~ 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"
 
@@ -6818,9 +7230,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 52fbf19dba..4de6a739d4 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- autre --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -170,11 +171,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:819
 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:352
+#: 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 +185,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,17 +202,17 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -220,7 +221,7 @@ msgstr "Nom de la <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -244,65 +245,69 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +317,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"
 
@@ -327,12 +332,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Point d'accès"
 
@@ -363,35 +368,47 @@ msgstr "Bails DHCP actifs"
 msgid "Active DHCPv6 Leases"
 msgstr "Bails DHCPv6 actifs"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -404,10 +421,15 @@ 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -439,7 +461,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"
 
@@ -449,12 +471,12 @@ msgid "Administration"
 msgstr "Administration"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +490,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Alerte"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -498,21 +522,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Autoriser seulement ce qui est listé"
 
@@ -542,94 +564,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -641,20 +663,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 +670,11 @@ msgstr "Configuration de l'antenne"
 msgid "Any zone"
 msgstr "N'importe quelle zone"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -674,8 +682,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 +692,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Équipements associés"
@@ -699,16 +707,16 @@ 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:1405
 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 ""
 
@@ -730,17 +738,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 +793,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -811,14 +821,6 @@ 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"
@@ -836,11 +838,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -860,16 +862,16 @@ msgid ""
 "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"
@@ -878,55 +880,61 @@ msgstr "Débit"
 msgid "Bogus NX Domain Override"
 msgstr "Contourne les «  NX Domain » bogués"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -950,7 +958,7 @@ msgstr "Chaîne"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Changements"
 
@@ -958,7 +966,7 @@ msgstr "Changements"
 msgid "Changes applied."
 msgstr "Changements appliqués."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -971,20 +979,14 @@ 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:1598
 #: 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 +995,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1005,8 +1007,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:1809
 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 +1020,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:833
 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 +1029,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:1022
 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,14 +1051,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1065,12 +1067,12 @@ msgstr "Identifiant client à envoyer dans les requêtes DHCP"
 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,11 +1088,8 @@ msgstr "Fermer la liste…"
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1103,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1123,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1139,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1216,6 +1216,10 @@ msgstr "Critique"
 msgid "Cron Log Level"
 msgstr "Niveau de journalisation de Cron"
 
+#: 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
@@ -1225,7 +1229,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 +1239,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1247,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1303,7 +1308,7 @@ msgstr "DNS"
 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 ""
 
@@ -1315,15 +1320,15 @@ msgstr ""
 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 +1337,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1353,37 +1358,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1394,13 +1402,13 @@ msgstr ""
 "DNS à ses clients."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1409,18 +1417,30 @@ msgstr "Effacer"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Description"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Apparence"
@@ -1439,10 +1459,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:81
+#: 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 +1472,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1466,26 +1497,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1524,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1529,34 +1561,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1586,10 +1617,18 @@ 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-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1598,7 +1637,7 @@ msgstr "Domaine nécessaire"
 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 ""
 
@@ -1622,11 +1661,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1642,20 +1681,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 +1703,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:1370
 msgid "EAP-Method"
 msgstr "Méthode EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Éditer"
 
@@ -1687,50 +1727,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Éditer ce réseau"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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)"
 
@@ -1738,7 +1779,7 @@ msgstr "Activer la circulation de très grandes trames (Jumbo)"
 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 ""
 
@@ -1746,31 +1787,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1819,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1786,50 +1827,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1845,6 +1890,11 @@ msgstr ""
 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
@@ -1858,12 +1908,12 @@ msgstr "Erreur"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Module Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Commutateur Ethernet"
@@ -1876,6 +1926,10 @@ msgstr ""
 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 +1938,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,15 +1946,15 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1916,30 +1970,42 @@ msgstr "Port du serveur distant de journaux système"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Fichier"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1958,6 +2024,7 @@ msgstr "Filtrer les requêtes privées"
 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 +2035,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 +2047,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:73
 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 +2059,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 ""
 
@@ -2024,31 +2091,31 @@ msgstr "Opérations d'écriture"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2123,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 +2131,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 +2139,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:808
 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:773
 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:86
 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"
 
@@ -2130,6 +2192,7 @@ msgid "Gateway ports"
 msgstr "Ports de la passerelle"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2137,11 +2200,10 @@ msgstr "Ports de la passerelle"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Configuration générale"
 
@@ -2149,7 +2211,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2157,10 +2219,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2171,7 +2229,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 +2240,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Aller à la configuration du mot de passe…"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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)"
@@ -2225,9 +2279,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Cacher le ESSID"
 
@@ -2238,6 +2290,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2245,7 +2298,7 @@ msgstr ""
 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,7 +2306,7 @@ 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 ""
 
@@ -2266,28 +2319,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2310,6 +2363,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 +2375,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 +2387,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,16 +2411,16 @@ 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 ""
 
@@ -2372,6 +2429,7 @@ msgstr ""
 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 +2444,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 +2466,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 +2478,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 +2490,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 +2512,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 +2537,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:1462
 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 +2586,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"
 
@@ -2564,7 +2636,7 @@ msgstr ""
 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"
 
@@ -2586,12 +2658,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é"
 
@@ -2603,19 +2675,21 @@ msgstr "Intérieur :"
 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 +2697,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
 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:791
 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:953
 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 +2777,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2720,15 +2829,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2745,15 +2854,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Clé n° %d"
 
@@ -2761,33 +2870,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"
 
@@ -2808,12 +2918,12 @@ 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:370
-#: 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 ""
 
@@ -2827,24 +2937,24 @@ msgstr "Fichier de baux"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2872,7 +2982,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Lien établi"
 
@@ -2884,7 +2994,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:1361
 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 +3003,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:1365
 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,7 +3012,7 @@ 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 ""
 
@@ -2919,7 +3029,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2950,7 +3060,11 @@ msgstr "Chargement"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2960,20 +3074,20 @@ 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"
 
@@ -2981,7 +3095,7 @@ msgstr "Adresse IPv6 locale"
 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"
 
@@ -3025,10 +3139,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Niveau de journalisation"
@@ -3053,13 +3163,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"
@@ -3068,31 +3180,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3222,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3121,16 +3233,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3138,7 +3251,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3154,25 +3267,23 @@ msgstr "Nombre maximum de requêtes DNS au même moment"
 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:760
+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
@@ -3191,42 +3302,43 @@ msgstr "Mémoire"
 msgid "Memory usage (%)"
 msgstr "Utilisation Mémoire (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3235,31 +3347,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3267,7 +3378,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3330,27 +3441,28 @@ 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:1313
 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 ""
 
@@ -3358,18 +3470,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Serveurs NTP candidats"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nom du nouveau réseau"
 
@@ -3379,7 +3488,8 @@ msgstr "Navigation"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3404,33 +3514,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3439,18 +3567,6 @@ msgstr ""
 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,6 +3574,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Pas de mot de passe positionné !"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3466,19 +3586,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"
 
@@ -3498,8 +3618,8 @@ msgstr ""
 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"
 
@@ -3511,22 +3631,26 @@ 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:170
@@ -3545,53 +3669,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3726,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Option modifiée"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3762,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3703,7 +3817,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 +3826,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:953
 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 +3872,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 +3880,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:1601
+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 +3914,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,63 +3925,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3871,11 +3991,11 @@ msgstr "Mot de passe"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3886,7 +4006,7 @@ msgstr ""
 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 ""
 
@@ -3894,27 +4014,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3932,7 +4052,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 +4061,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:86
 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 +4077,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3965,7 +4089,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 +4100,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
@@ -3997,15 +4125,15 @@ msgstr "Politique"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4017,11 +4145,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 ""
 
@@ -4029,16 +4157,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:114
 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"
@@ -4050,12 +4178,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4076,35 +4203,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4116,15 +4237,15 @@ 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"
@@ -4135,28 +4256,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4166,31 +4288,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4206,21 +4332,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 ?"
 
@@ -4244,7 +4360,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4266,21 +4382,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:98
+#: 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:56
 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"
 
@@ -4288,80 +4398,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4373,7 +4501,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4397,9 +4549,14 @@ msgstr "Fichiers Resolv et Hosts"
 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"
 
@@ -4407,7 +4564,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 ""
 
@@ -4419,26 +4576,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Montrer/cacher le mot de passe"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revenir"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4454,7 +4611,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4466,7 +4623,7 @@ 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 ""
 
@@ -4502,7 +4659,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4519,15 +4676,15 @@ msgstr ""
 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 ""
 
@@ -4536,9 +4693,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4547,17 +4704,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Sauvegarder et Appliquer"
@@ -4574,24 +4733,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Tâches Régulières"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Section ajoutée"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Section retirée"
 
@@ -4606,12 +4761,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4619,20 +4780,16 @@ 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: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"
 
@@ -4640,29 +4797,32 @@ msgstr "Type du service"
 msgid "Services"
 msgstr "Services"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4674,7 +4834,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4686,21 +4846,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4734,11 +4896,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4784,7 +4942,7 @@ msgstr "Indique le répertoire auquel le périphérique est rattaché"
 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"
@@ -4792,50 +4950,58 @@ 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Démarrage"
@@ -4852,11 +5018,12 @@ msgstr "Routes IPv6 statiques"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4872,19 +5039,20 @@ 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:976
 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:745
 #: 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"
 
@@ -4897,6 +5065,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -4916,41 +5085,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4993,6 +5164,8 @@ 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"
@@ -5015,7 +5188,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 ""
 
@@ -5023,51 +5196,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5083,7 +5231,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5101,6 +5249,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"
@@ -5125,6 +5279,10 @@ 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-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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5135,21 +5293,16 @@ msgid ""
 "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."
@@ -5157,16 +5310,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:1794
+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 "
@@ -5183,10 +5340,9 @@ 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:1150
+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!"
@@ -5225,7 +5381,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5234,18 +5390,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:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5258,10 +5406,18 @@ 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/wireless.js:1432
+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 "
@@ -5280,13 +5436,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."
@@ -5294,7 +5450,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>"
@@ -5308,21 +5464,21 @@ msgid ""
 "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 ""
@@ -5343,8 +5499,8 @@ msgstr ""
 "Cette page donne une vue d'ensemble des connexions réseaux actuellement "
 "actives."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5354,7 +5510,7 @@ msgstr "Cette section ne contient pas encore de valeur"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5362,7 +5518,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5377,7 +5533,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 ""
 
@@ -5401,55 +5557,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5457,19 +5599,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5499,10 +5642,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 ""
@@ -5512,21 +5657,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: 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é"
@@ -5540,18 +5695,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5575,11 +5737,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5589,42 +5767,40 @@ msgstr "Uptime"
 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"
 
@@ -5636,64 +5812,61 @@ 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"
 
@@ -5714,81 +5887,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:1257
 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:1313
 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"
 
@@ -5796,41 +5966,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5846,7 +6012,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5867,7 +6033,7 @@ msgstr ""
 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:1339
 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 "
@@ -5875,61 +6041,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Module Wi-Fi"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Le réseau Wi-Fi est activé"
 
@@ -5941,12 +6108,18 @@ msgstr "Écrire les requêtes DNS reçues dans syslog"
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5987,18 +6160,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -6007,11 +6176,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é"
 
@@ -6027,22 +6196,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
@@ -6054,22 +6222,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "expiré"
 
@@ -6085,25 +6257,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 ""
 
@@ -6111,6 +6279,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
@@ -6149,21 +6321,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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"
 
@@ -6171,7 +6340,7 @@ msgstr "pas de lien"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "aucun"
 
@@ -6181,7 +6350,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6196,10 +6367,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6217,66 +6384,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6293,7 +6460,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é"
 
@@ -6374,8 +6541,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 ""
 
@@ -6412,7 +6579,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 ""
 
@@ -6425,11 +6592,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 ""
 
@@ -6445,14 +6612,19 @@ 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/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
@@ -6463,6 +6635,198 @@ msgstr "oui"
 msgid "« Back"
 msgstr "« Retour"
 
+#~ 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"
 
@@ -6594,9 +6958,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 82987573ec..e74646525c 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -11,7 +11,7 @@ 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 ""
 
@@ -19,11 +19,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +61,19 @@ msgid "-- Additional Field --"
 msgstr "-- שדה נוסף --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- מות�� �ישית --"
@@ -96,7 +96,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +108,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:1321
 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,35 +121,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
@@ -166,11 +167,11 @@ msgid ""
 "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:819
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:352
+#: 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 +181,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,16 +197,16 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -214,7 +215,7 @@ msgstr "ש� <abbr title=\"Light Emitting Diode\">LED</abbr>"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -234,73 +235,77 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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"
 
@@ -314,13 +319,13 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "נקודת גישה"
 
@@ -352,36 +357,48 @@ msgid "Active DHCPv6 Leases"
 msgstr "הרש�ות DHCPv6 פעילות"
 
 # צריך �ימות של מישהו שמבין יותר במושגי� ה�לו �� צריך בכלל לתרג� �ת זה �ו להש�יר כמו שזה
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -394,10 +411,15 @@ msgstr ""
 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 "הוסף ממשק חדש..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "קבצי מ�רח נוספי�"
@@ -429,7 +451,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 ""
 
@@ -440,12 +462,12 @@ msgid "Administration"
 msgstr "מנהלה"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -460,12 +482,14 @@ msgstr ""
 msgid "Alert"
 msgstr "�זעקה"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -488,22 +512,20 @@ msgstr ""
 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:986
 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:890
 #, 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:766
 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:889
 msgid "Allow listed only"
 msgstr "�פשר רשומי� בלבד"
 
@@ -529,94 +551,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -628,20 +650,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 +659,11 @@ msgstr "הגדרות �נטנה"
 msgid "Any zone"
 msgstr "כל תחו�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -663,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 ""
@@ -673,13 +681,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "תחנות קשורות"
@@ -688,16 +696,16 @@ 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:1405
 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 ""
 
@@ -719,17 +727,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 +782,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -800,14 +810,6 @@ 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 "גיבוי"
@@ -825,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -849,16 +851,16 @@ msgid ""
 "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 ""
@@ -867,56 +869,62 @@ msgstr ""
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -940,7 +948,7 @@ msgstr "שרשרת"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "שינויי�"
 
@@ -948,7 +956,7 @@ msgstr "שינויי�"
 msgid "Changes applied."
 msgstr "השינויי� הוחלו"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -961,20 +969,14 @@ 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:1598
 #: 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 +985,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -995,8 +997,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:1809
 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 +1006,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:833
 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:1022
 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,14 +1032,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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 ""
 
@@ -1046,12 +1048,12 @@ msgstr ""
 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"
@@ -1065,11 +1067,8 @@ msgstr "סגור רשימה..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1082,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1102,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1118,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1195,6 +1195,10 @@ msgstr "קריטי"
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1204,7 +1208,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 +1218,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1226,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1282,7 +1287,7 @@ msgstr "DNS"
 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 ""
 
@@ -1294,15 +1299,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1332,37 +1337,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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,13 +1380,13 @@ msgstr ""
 "�שר מציגות שרתי DNS שוני� ללקוח"
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "למחוק"
 
@@ -1387,18 +1395,30 @@ msgstr "למחוק"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "תי�ור"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "עיצוב"
@@ -1417,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:81
+#: 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 +1450,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1444,58 +1475,59 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1505,34 +1537,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1553,10 +1584,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 ""
@@ -1565,7 +1604,7 @@ msgstr ""
 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 ""
 
@@ -1587,11 +1626,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1607,39 +1646,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:1370
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "ערוך"
 
@@ -1649,50 +1689,51 @@ 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:717
 msgid "Edit this network"
 msgstr "ערוך רשת זו"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1700,7 +1741,7 @@ msgstr ""
 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 ""
 
@@ -1708,31 +1749,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1781,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1748,48 +1789,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1805,6 +1850,11 @@ msgstr ""
 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
@@ -1818,12 +1868,12 @@ msgstr "שגי�ה"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
@@ -1836,6 +1886,10 @@ msgstr ""
 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,20 +1898,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1873,30 +1927,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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,6 +1981,7 @@ msgstr ""
 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 +1992,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 +2004,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:73
 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 +2016,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 ""
 
@@ -1981,31 +2048,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2080,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 +2088,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 +2096,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:808
 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:773
 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:86
 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 ""
 
@@ -2087,6 +2149,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2094,11 +2157,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2106,7 +2168,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2114,10 +2176,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2126,7 +2184,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 +2195,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 ""
@@ -2178,9 +2232,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2191,6 +2243,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2198,7 +2251,7 @@ msgstr ""
 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,7 +2259,7 @@ 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 ""
 
@@ -2219,28 +2272,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2263,6 +2316,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 +2328,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 +2340,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,16 +2364,16 @@ 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 ""
 
@@ -2325,6 +2382,7 @@ msgstr ""
 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 +2397,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 +2419,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 +2431,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 +2443,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 +2465,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 +2490,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:1462
 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 +2535,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 ""
 
@@ -2509,7 +2581,7 @@ msgstr ""
 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 ""
 
@@ -2531,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 ""
 
@@ -2548,19 +2620,21 @@ msgstr ""
 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 +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 ""
-
+#: 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
 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:791
 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:953
 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 +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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2658,15 +2767,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2683,15 +2792,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2699,33 +2808,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 ""
 
@@ -2746,12 +2856,12 @@ 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:370
-#: 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 ""
 
@@ -2765,24 +2875,24 @@ msgstr ""
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 ""
 
@@ -2810,7 +2920,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
@@ -2820,7 +2930,7 @@ msgid ""
 "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:1361
 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 +2939,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:1365
 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,7 +2948,7 @@ 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 ""
 
@@ -2854,7 +2964,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2885,7 +2995,11 @@ msgstr "טוען"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2895,20 +3009,20 @@ 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 מקומית"
 
@@ -2916,7 +3030,7 @@ msgstr "כתובת IPv6 מקומית"
 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 ""
 
@@ -2953,10 +3067,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2981,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 ""
 
 #: 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"
@@ -2994,31 +3106,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +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:68
 msgid "MTU"
 msgstr ""
 
@@ -3047,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3064,7 +3177,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3080,25 +3193,23 @@ msgstr ""
 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:760
+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
@@ -3117,42 +3228,43 @@ msgstr ""
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3161,31 +3273,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr ""
 
@@ -3193,7 +3304,7 @@ msgstr ""
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3254,27 +3365,28 @@ 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:1313
 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 ""
 
@@ -3282,18 +3394,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr ""
 
@@ -3303,7 +3412,8 @@ msgstr ""
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3328,33 +3438,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3363,18 +3491,6 @@ msgstr ""
 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,6 +3498,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "ל� הוגדרה סיסמה!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3390,19 +3510,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 ""
 
@@ -3422,8 +3542,8 @@ msgstr ""
 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 ""
 
@@ -3435,22 +3555,26 @@ 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:170
@@ -3469,49 +3593,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3650,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3686,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3623,7 +3741,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 +3750,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:953
 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 +3802,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3836,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,63 +3847,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 ""
 
@@ -3789,11 +3913,11 @@ msgstr ""
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3804,7 +3928,7 @@ msgstr ""
 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 ""
 
@@ -3812,27 +3936,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3850,7 +3974,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 +3983,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:86
 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 +3999,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3883,7 +4011,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 +4022,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
@@ -3915,15 +4047,15 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3935,11 +4067,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 ""
 
@@ -3947,16 +4079,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:114
 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"
@@ -3966,12 +4098,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -3992,35 +4123,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4032,15 +4157,15 @@ 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 ""
@@ -4051,28 +4176,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4082,31 +4208,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4122,17 +4252,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,7 +4280,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4178,21 +4302,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 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: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:56
 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,80 +4318,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 ""
 
-#: 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4285,7 +4421,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4309,9 +4469,14 @@ msgstr ""
 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 +4484,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 ""
 
@@ -4331,26 +4496,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4366,7 +4531,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4378,7 +4543,7 @@ 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 ""
 
@@ -4411,7 +4576,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "הרץ בדיקת מערכת קבצי�"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4428,15 +4593,15 @@ msgstr ""
 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 ""
 
@@ -4445,9 +4610,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4456,17 +4621,19 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr ""
@@ -4483,24 +4650,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4515,31 +4678,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4547,29 +4712,32 @@ msgstr ""
 msgid "Services"
 msgstr "שירותי�"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4581,7 +4749,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4593,21 +4761,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4641,11 +4811,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4689,56 +4855,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "�תחול"
@@ -4755,11 +4929,12 @@ msgstr "ניתובי IPv6 סטטיי�"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "כתובת סטטית"
@@ -4774,19 +4949,20 @@ 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:976
 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:745
 #: 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 "עצור"
 
@@ -4799,6 +4975,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "שלח"
 
@@ -4818,41 +4995,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4895,6 +5074,8 @@ 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"
@@ -4917,7 +5098,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 ""
 
@@ -4925,40 +5106,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4972,7 +5137,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 +5155,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"
@@ -5008,6 +5179,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "החוקי� הב�י� מ�ופשרי� כרגע במערכת זו."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5018,34 +5193,35 @@ msgid ""
 "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:1794
+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 "
@@ -5055,9 +5231,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5088,7 +5263,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5097,16 +5272,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5116,10 +5285,18 @@ 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/wireless.js:1432
+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 "
@@ -5134,19 +5311,19 @@ 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>"
@@ -5158,20 +5335,20 @@ msgid ""
 "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 ""
@@ -5186,8 +5363,8 @@ msgstr "רשימה זו מציגה סקירה של תהליכי המערכת ×”×
 msgid "This page gives an overview over currently active network connections."
 msgstr "דף זה מציג סקירה של חיבורי הרשת הפעילי� כרגע."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5197,7 +5374,7 @@ msgstr "�זור זה עדיין ל� מכיל ערכי�."
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5205,7 +5382,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "�זור זמן"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5217,7 +5394,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 ""
 
@@ -5241,55 +5418,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 ""
 
@@ -5297,19 +5460,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5339,10 +5503,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 ""
@@ -5352,21 +5518,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5380,18 +5556,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5411,11 +5594,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5425,42 +5624,40 @@ msgstr ""
 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 ""
 
@@ -5472,64 +5669,61 @@ 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 "השתמש בטבלת ניתוב"
 
@@ -5546,81 +5740,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:1257
 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:1313
 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 ""
-
 #: 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 ""
 
@@ -5628,41 +5819,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5676,7 +5863,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5697,7 +5884,7 @@ msgstr ""
 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:1339
 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 "
@@ -5705,61 +5892,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "רשת �לחוטית מ�ופשרת"
 
@@ -5771,12 +5959,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5811,18 +6005,14 @@ msgstr ""
 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:1029
+#: 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 "�וטומטי"
 
@@ -5830,11 +6020,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 ""
 
@@ -5850,22 +6040,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
@@ -5877,22 +6066,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5908,25 +6101,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 ""
 
@@ -5934,6 +6123,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
@@ -5972,21 +6165,18 @@ msgstr ""
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 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:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "ל�"
 
-#: 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 ""
 
@@ -5994,7 +6184,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "לל�"
 
@@ -6004,7 +6194,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6019,10 +6211,6 @@ msgstr "כבוי"
 msgid "on"
 msgstr "פועל"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6040,66 +6228,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6116,7 +6304,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 "ל� מתויג"
 
@@ -6197,8 +6385,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 ""
 
@@ -6235,7 +6423,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 ""
 
@@ -6248,11 +6436,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 ""
 
@@ -6268,14 +6456,19 @@ 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/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
@@ -6286,6 +6479,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 e39576313a..3b4dc14372 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -11,7 +11,7 @@ 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 ""
 
@@ -19,11 +19,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +61,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- egyéni --"
@@ -96,7 +96,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +108,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:1321
 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,35 +121,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -168,11 +169,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:819
 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:352
+#: 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 +183,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,16 +200,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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"
 
@@ -217,7 +218,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Név"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -241,61 +242,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +310,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"
 
@@ -320,12 +325,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Hozzáférési pont"
 
@@ -358,35 +363,47 @@ 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:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -399,10 +416,15 @@ 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -434,7 +456,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"
 
@@ -444,12 +466,12 @@ msgid "Administration"
 msgstr "Adminisztráció"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -463,12 +485,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Riasztás"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -492,21 +516,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Csak a felsoroltak engedélyezése"
 
@@ -535,94 +557,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -634,20 +656,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 +663,11 @@ msgstr "Antenna beállítások"
 msgid "Any zone"
 msgstr "Bármelyik zóna"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -667,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 ""
@@ -677,13 +685,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Kapcsolódó kliensek"
@@ -692,16 +700,16 @@ 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:1405
 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 ""
 
@@ -723,17 +731,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 +786,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -804,14 +814,6 @@ 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"
@@ -829,11 +831,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -854,16 +856,16 @@ msgid ""
 "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"
@@ -872,55 +874,61 @@ msgstr "Bitráta"
 msgid "Bogus NX Domain Override"
 msgstr "Hamis NX tartomány felülbírálása"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -944,7 +952,7 @@ msgstr "Lánc"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Módosítások"
 
@@ -952,7 +960,7 @@ msgstr "Módosítások"
 msgid "Changes applied."
 msgstr "A módosítások alkalmazva."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -966,20 +974,14 @@ 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:1598
 #: 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 +990,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1000,8 +1002,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:1809
 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 +1015,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:833
 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 +1024,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:1022
 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,14 +1046,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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ó"
 
@@ -1060,12 +1062,12 @@ msgstr "DHCP kérés során küldendő kliens azonosító"
 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"
@@ -1081,11 +1083,8 @@ msgstr "Lista bezárása..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1098,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1118,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1134,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1211,6 +1211,10 @@ msgstr "Kritikus"
 msgid "Cron Log Level"
 msgstr "Cron naplózási szint"
 
+#: 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
@@ -1220,7 +1224,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 +1234,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1242,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1298,7 +1303,7 @@ msgstr "DNS"
 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 ""
 
@@ -1310,15 +1315,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1348,37 +1353,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1388,13 +1396,13 @@ msgstr ""
 "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:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1403,18 +1411,30 @@ msgstr "Törlés"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Leírás"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Megjelenés"
@@ -1433,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:81
+#: 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 +1466,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1460,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 "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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1518,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1523,34 +1555,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1577,10 +1608,18 @@ msgstr ""
 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-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1589,7 +1628,7 @@ msgstr "Tartomány szükséges"
 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 ""
 
@@ -1613,11 +1652,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1634,20 +1673,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 +1696,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:1370
 msgid "EAP-Method"
 msgstr "EAP metódus"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -1680,50 +1720,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Hálózat szerkesztése"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
 
@@ -1731,7 +1772,7 @@ msgstr "Óriás keretek átengedésének engedélyezése"
 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 ""
 
@@ -1739,31 +1780,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1812,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1779,48 +1820,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1836,6 +1881,11 @@ msgstr ""
 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
@@ -1849,12 +1899,12 @@ msgstr "Hiba"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet switch"
@@ -1867,6 +1917,10 @@ msgstr ""
 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,21 +1929,21 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1905,30 +1959,42 @@ msgstr "Külső rendszernapló kiszolgáló port"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Fájl"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1947,6 +2013,7 @@ msgstr "Privát kérések szűrése"
 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 +2024,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 +2036,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:73
 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 +2048,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 ""
 
@@ -2013,33 +2080,33 @@ msgstr "Flash műveletek"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2114,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 +2122,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 +2130,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:808
 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:773
 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:86
 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"
 
@@ -2121,6 +2183,7 @@ msgid "Gateway ports"
 msgstr "�tjáró portok"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2128,11 +2191,10 @@ msgstr "�tjáró portok"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "�ltalános beállítások"
 
@@ -2140,7 +2202,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2148,10 +2210,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "A megadott jelszavak nem egyeznek, a jelszó nem lett megváltoztatva!"
@@ -2160,7 +2218,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 +2229,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:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2214,9 +2268,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> elrejtése"
 
@@ -2227,6 +2279,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2234,7 +2287,7 @@ msgstr ""
 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,7 +2295,7 @@ 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 ""
 
@@ -2255,28 +2308,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2299,6 +2352,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 +2364,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 +2376,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,16 +2400,16 @@ 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 ""
 
@@ -2361,6 +2418,7 @@ msgstr ""
 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 +2433,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 +2455,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 +2467,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 +2479,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 +2501,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 +2526,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:1462
 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 +2573,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 "
@@ -2554,7 +2626,7 @@ msgstr ""
 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"
 
@@ -2576,12 +2648,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"
 
@@ -2593,19 +2665,21 @@ msgstr "Bejövő"
 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 +2687,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
 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:791
 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:953
 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 +2767,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2709,15 +2818,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2734,15 +2843,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Kulcs #%d"
 
@@ -2750,33 +2859,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"
 
@@ -2797,12 +2907,12 @@ 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:370
-#: 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 ""
 
@@ -2816,24 +2926,24 @@ msgstr "Bérlet fájl"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2861,7 +2971,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Kapcsolat létrehozva"
 
@@ -2873,7 +2983,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:1361
 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 +2992,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:1365
 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,7 +3001,7 @@ 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 ""
 
@@ -2907,7 +3017,7 @@ msgstr "A hamis NX tartomány eredményeket szolgáltató gépek listája"
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2940,7 +3050,11 @@ msgstr "Betöltés"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2950,20 +3064,20 @@ 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"
 
@@ -2971,7 +3085,7 @@ msgstr "Helyi IPv6 cím"
 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"
 
@@ -3016,10 +3130,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Napló kimeneti szintje"
@@ -3044,11 +3154,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"
@@ -3057,31 +3169,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3110,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3127,7 +3240,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3143,25 +3256,23 @@ msgstr "Párhuzamos DNS kérések maximális száma"
 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:760
+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
@@ -3180,42 +3291,43 @@ msgstr "Memória"
 msgid "Memory usage (%)"
 msgstr "Memória használat (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mód"
@@ -3224,31 +3336,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Ellenőrzés"
 
@@ -3256,7 +3367,7 @@ msgstr "Ellenőrzés"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3319,27 +3430,28 @@ 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:1313
 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 ""
 
@@ -3347,18 +3459,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Kijelölt NTP kiszolgálók"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Az új hálózat neve"
 
@@ -3368,7 +3477,8 @@ msgstr "Navigáció"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3393,33 +3503,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3428,18 +3556,6 @@ msgstr ""
 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,6 +3563,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nincs jelszó!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3455,19 +3575,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"
 
@@ -3487,8 +3607,8 @@ msgstr ""
 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"
 
@@ -3500,22 +3620,26 @@ 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:170
@@ -3534,54 +3658,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3715,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Beállítás módosítva"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3751,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3693,7 +3806,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 +3815,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:953
 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 +3861,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 +3869,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:1601
+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 +3903,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,63 +3914,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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ó"
 
@@ -3861,11 +3980,11 @@ msgstr "Jelszó"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3876,7 +3995,7 @@ msgstr ""
 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 ""
 
@@ -3884,27 +4003,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3922,7 +4041,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 +4050,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:86
 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 +4066,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3955,7 +4078,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 +4089,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
@@ -3987,15 +4114,15 @@ msgstr "Szabály"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4007,11 +4134,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 ""
 
@@ -4019,16 +4146,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:114
 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"
@@ -4040,12 +4167,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4066,35 +4192,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4106,15 +4226,15 @@ 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"
@@ -4125,28 +4245,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4156,31 +4277,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4198,20 +4323,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?"
 
@@ -4235,7 +4351,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4257,21 +4373,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:98
+#: 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:56
 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"
 
@@ -4279,81 +4389,99 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4365,7 +4493,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4389,9 +4541,14 @@ msgstr "Resolv és hosts fájlok"
 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"
 
@@ -4399,7 +4556,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 ""
 
@@ -4411,26 +4568,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Jelszó mutatása/elrejtése"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Visszavonás"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4446,7 +4603,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4458,7 +4615,7 @@ 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 ""
 
@@ -4493,7 +4650,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4510,15 +4667,15 @@ msgstr ""
 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 ""
 
@@ -4527,9 +4684,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4538,17 +4695,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Mentés"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Mentés & Alkalmazás"
@@ -4565,24 +4724,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Ãœtemezett feladatok"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Szakasz hozzáadva"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Szakasz eltávolítva"
 
@@ -4597,12 +4752,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4610,20 +4771,16 @@ 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: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"
 
@@ -4631,29 +4788,32 @@ msgstr "Szolgáltatás típusa"
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4665,7 +4825,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4677,21 +4837,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4725,11 +4887,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4774,7 +4932,7 @@ msgstr "Megadja az eszköz csatlakozási könyvtárát."
 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"
@@ -4782,51 +4940,59 @@ 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Rendszerindítás"
@@ -4843,11 +5009,12 @@ msgstr "Statikus IPv6 útvonalak"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4863,19 +5030,20 @@ 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:976
 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:745
 #: 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"
 
@@ -4888,6 +5056,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Elküldés"
 
@@ -4907,41 +5076,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4984,6 +5155,8 @@ 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"
@@ -5006,7 +5179,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 ""
 
@@ -5014,49 +5187,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5072,7 +5221,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5092,6 +5241,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"
@@ -5117,6 +5272,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Jelenleg a következő szabályok aktívak a rendszeren."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5127,37 +5286,36 @@ msgid ""
 "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:1794
+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 "
@@ -5174,10 +5332,9 @@ 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:1150
+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!"
@@ -5214,7 +5371,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5223,18 +5380,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Nincsenek aktív bérletek."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5247,10 +5396,18 @@ 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/wireless.js:1432
+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 "
@@ -5268,13 +5425,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."
@@ -5282,7 +5439,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>"
@@ -5298,20 +5455,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 ""
@@ -5331,8 +5488,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5342,7 +5499,7 @@ msgstr "Ez a szakasz még nem tartalmaz értékeket"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5350,7 +5507,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Időzóna"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5365,7 +5522,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 ""
 
@@ -5389,55 +5546,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5445,19 +5588,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5487,10 +5631,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 ""
@@ -5500,21 +5646,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Nem kezelt"
@@ -5528,18 +5684,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5562,11 +5725,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5576,42 +5755,40 @@ msgstr "Működési idő"
 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"
 
@@ -5623,64 +5800,61 @@ 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"
 
@@ -5701,81 +5875,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:1257
 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:1313
 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'"
 
@@ -5783,41 +5954,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5833,7 +6000,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5854,7 +6021,7 @@ msgstr ""
 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:1339
 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 "
@@ -5862,61 +6029,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: 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:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Vezetéknélküli hálózat engedélyezve"
 
@@ -5928,12 +6096,18 @@ msgstr "A kapott DNS kéréseket írja a rendszernaplóba"
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5974,18 +6148,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5993,11 +6163,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"
 
@@ -6013,22 +6183,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
@@ -6040,22 +6209,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "lejárt"
 
@@ -6073,25 +6246,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 ""
 
@@ -6099,6 +6268,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
@@ -6137,21 +6310,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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"
 
@@ -6159,7 +6329,7 @@ msgstr "nincs link"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "nincs"
 
@@ -6169,7 +6339,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6184,10 +6356,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6205,66 +6373,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6281,7 +6449,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"
 
@@ -6362,8 +6530,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 ""
 
@@ -6400,7 +6568,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 ""
 
@@ -6413,11 +6581,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 ""
 
@@ -6433,14 +6601,19 @@ 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/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
@@ -6451,6 +6624,198 @@ msgstr "igen"
 msgid "« Back"
 msgstr "« Vissza"
 
+#~ 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"
 
@@ -6582,9 +6947,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 4ba98ffe64..1f9d9e1737 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalizzato --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Servizio basilare di impostazione Identificatore\">BSSID</abbr>"
@@ -171,12 +172,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:819
 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:352
+#: 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 +187,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,16 +205,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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"
 
@@ -222,7 +223,7 @@ msgstr "<abbr title=\"Diodo ad Emissione di Luce\">LED</abbr> Nome"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -246,7 +247,7 @@ msgstr ""
 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 +255,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +317,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 "
 
@@ -327,12 +332,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Punto di Accesso"
 
@@ -367,35 +372,47 @@ msgstr "Contratti attivi DHCP"
 msgid "Active DHCPv6 Leases"
 msgstr "Contratti attivi DHCPv6"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -408,10 +425,15 @@ 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -443,7 +465,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"
 
@@ -453,12 +475,12 @@ msgid "Administration"
 msgstr "Amministrazione"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -472,12 +494,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Allerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -502,21 +526,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Consenti solo quelli nell'elenco"
 
@@ -544,94 +566,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -643,20 +665,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 +672,11 @@ msgstr "Configurazione dell'Antenna"
 msgid "Any zone"
 msgstr "Qualsiasi Zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -676,8 +684,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 +694,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Dispositivi Wi-Fi connessi"
@@ -701,16 +709,16 @@ 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:1405
 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 ""
 
@@ -732,17 +740,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 +795,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -813,14 +823,6 @@ 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"
@@ -838,11 +840,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -862,16 +864,16 @@ msgid ""
 "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"
@@ -880,55 +882,61 @@ msgstr "Bitrate"
 msgid "Bogus NX Domain Override"
 msgstr "Ignora Dominio Bogus NX"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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"
 
@@ -952,7 +960,7 @@ msgstr "Catena"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Modifiche"
 
@@ -960,7 +968,7 @@ msgstr "Modifiche"
 msgid "Changes applied."
 msgstr "Modifiche applicate."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -973,20 +981,14 @@ 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:1598
 #: 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 +997,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:1786
 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 +1009,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:1809
 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 +1022,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:833
 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 +1030,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:1022
 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,14 +1052,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1066,12 +1068,12 @@ msgstr "ID Cliente da inviare all'interno della richiesta DHCP"
 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,11 +1089,8 @@ msgstr "Scegliere dall'elenco..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1104,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1124,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1140,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1217,6 +1217,10 @@ msgstr "Critico"
 msgid "Cron Log Level"
 msgstr "Livello di log del Cron"
 
+#: 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
@@ -1226,7 +1230,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 +1240,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1248,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1304,7 +1309,7 @@ msgstr "DNS"
 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 ""
 
@@ -1316,15 +1321,15 @@ msgstr ""
 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 +1338,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1354,37 +1359,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1395,13 +1403,13 @@ msgstr ""
 "client."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1410,18 +1418,30 @@ msgstr "Elimina"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Descrizione"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Tema"
@@ -1440,10 +1460,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:81
+#: 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 +1473,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "Dispositivo irraggiungibile"
 
@@ -1467,26 +1498,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1525,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1530,34 +1562,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1583,10 +1614,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Non proseguire con le ricerche inverse per le reti locali."
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1595,7 +1634,7 @@ msgstr "Dominio richiesto"
 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"
 
@@ -1619,11 +1658,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1639,20 +1678,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 +1700,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:1370
 msgid "EAP-Method"
 msgstr "Metodo EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Modifica"
 
@@ -1684,50 +1724,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Modifica questa rete"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
 
@@ -1735,7 +1776,7 @@ msgstr "Abilita Jumbo Frame passthrough"
 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"
 
@@ -1743,31 +1784,31 @@ msgstr "Abilita Single DES"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 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:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1816,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1783,48 +1824,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1840,6 +1885,11 @@ msgstr ""
 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
@@ -1853,12 +1903,12 @@ msgstr "Errore"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Scheda di Rete"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch di Rete"
@@ -1871,6 +1921,10 @@ msgstr ""
 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,22 +1933,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1910,30 +1964,42 @@ msgstr "Porta Server Log di Sistema esterno"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "File"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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."
@@ -1952,6 +2018,7 @@ msgstr "Filtra privati"
 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 +2029,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 +2041,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:73
 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 +2053,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 ""
 
@@ -2018,31 +2085,31 @@ msgstr "Operazioni Flash"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2117,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 +2125,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 +2133,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:808
 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:773
 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:86
 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"
 
@@ -2124,6 +2186,7 @@ msgid "Gateway ports"
 msgstr "Porte Gateway"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2131,11 +2194,10 @@ msgstr "Porte Gateway"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Impostazioni Generali"
 
@@ -2143,7 +2205,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2151,10 +2213,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2165,7 +2223,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 +2234,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:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2219,9 +2273,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2232,6 +2284,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2239,7 +2292,7 @@ msgstr ""
 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,7 +2301,7 @@ 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 ""
 
@@ -2261,28 +2314,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2305,6 +2358,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 +2370,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 +2382,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,16 +2406,16 @@ 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 ""
 
@@ -2367,6 +2424,7 @@ msgstr ""
 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 +2439,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 +2461,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 +2473,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 +2485,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 +2507,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 +2532,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:1462
 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 +2581,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"
@@ -2562,7 +2634,7 @@ msgstr ""
 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"
 
@@ -2584,12 +2656,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à"
 
@@ -2601,19 +2673,21 @@ msgstr "In entrata:"
 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 +2695,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
 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:791
 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:953
 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 +2775,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Isola Clienti"
 
@@ -2714,15 +2823,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2739,15 +2848,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Chiave #%d"
 
@@ -2755,33 +2864,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"
 
@@ -2802,12 +2912,12 @@ 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:370
-#: 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"
 
@@ -2821,24 +2931,24 @@ msgstr "File di contratti"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2866,7 +2976,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Collegamento on"
 
@@ -2878,7 +2988,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:1361
 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 +2997,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:1365
 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,7 +3006,7 @@ 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 ""
 
@@ -2912,7 +3022,7 @@ msgstr "Elenco degli host che forniscono falsi risultati di dominio NX"
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2943,7 +3053,11 @@ msgstr "Caricamento"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2953,20 +3067,20 @@ 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"
 
@@ -2974,7 +3088,7 @@ msgstr "Indirizzo IPv6 locale"
 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"
 
@@ -3017,10 +3131,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Livello di dettaglio registro"
@@ -3045,11 +3155,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"
@@ -3058,31 +3170,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3212,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3111,16 +3223,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3128,7 +3241,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3144,25 +3257,23 @@ msgstr ""
 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:760
+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
@@ -3181,42 +3292,43 @@ msgstr "Memoria"
 msgid "Memory usage (%)"
 msgstr "Uso Memoria (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modalità"
@@ -3225,31 +3337,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3257,7 +3368,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3320,27 +3431,28 @@ 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:1313
 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 ""
 
@@ -3348,18 +3460,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Candidati server NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nome della nuova rete"
 
@@ -3369,7 +3478,8 @@ msgstr "Navigazione"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3394,33 +3504,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3429,18 +3557,6 @@ msgstr ""
 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,6 +3564,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nessuna password immessa!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3456,19 +3576,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"
 
@@ -3488,8 +3608,8 @@ msgstr ""
 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"
 
@@ -3501,23 +3621,27 @@ 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:170
 msgid "Notice"
@@ -3535,54 +3659,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3716,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Opzione cambiata"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3694,7 +3807,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 +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 "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:953
 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 +3862,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 +3870,33 @@ msgstr "Sovrascrivi la tabella usata per le route interne"
 msgid "Overview"
 msgstr "Riassunto"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3904,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,63 +3915,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3862,11 +3981,11 @@ msgstr "Password"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3877,7 +3996,7 @@ msgstr ""
 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 ""
 
@@ -3885,27 +4004,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3923,7 +4042,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 +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:86
 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 +4067,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3956,7 +4079,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 +4090,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
@@ -3988,15 +4115,15 @@ msgstr ""
 msgid "Port"
 msgstr "Porta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4008,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 ""
 
@@ -4020,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:114
 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"
@@ -4039,12 +4166,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4065,35 +4191,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Chiave Pubblica"
 
@@ -4105,15 +4225,15 @@ 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à"
@@ -4124,28 +4244,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4155,31 +4276,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4197,20 +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 ""
-"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?"
 
@@ -4234,7 +4350,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4256,21 +4372,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:98
+#: 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:56
 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"
 
@@ -4278,80 +4388,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4363,7 +4491,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4387,9 +4539,14 @@ msgstr ""
 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"
 
@@ -4397,7 +4554,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 ""
 
@@ -4409,26 +4566,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Rivela/nascondi password"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Ripristina"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4444,7 +4601,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4456,7 +4613,7 @@ 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 ""
 
@@ -4491,7 +4648,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4508,15 +4665,15 @@ msgstr ""
 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 ""
 
@@ -4525,9 +4682,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4536,17 +4693,19 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Salva"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salva & applica"
@@ -4563,24 +4722,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Operazioni programmate"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Sezione aggiunta"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Sezione rimossa"
 
@@ -4595,31 +4750,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4627,29 +4784,32 @@ msgstr ""
 msgid "Services"
 msgstr "Servizi"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4661,7 +4821,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4673,21 +4833,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4721,11 +4883,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4771,7 +4929,7 @@ msgstr "Specifica la cartella a cui è collegato il dispositivo in"
 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"
@@ -4779,7 +4937,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"
@@ -4787,44 +4945,52 @@ 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Avvio"
@@ -4841,11 +5007,12 @@ msgstr "Instradamento statico IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4861,19 +5028,20 @@ 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:976
 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:745
 #: 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"
 
@@ -4886,6 +5054,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Invia"
 
@@ -4905,41 +5074,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4982,6 +5153,8 @@ 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"
@@ -5004,7 +5177,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 ""
 
@@ -5012,51 +5185,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5070,7 +5218,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5090,6 +5238,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"
@@ -5110,6 +5264,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Le seguenti regole sono al momento attive su questo sistema."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5120,33 +5278,35 @@ msgid ""
 "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:1794
+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 "
@@ -5156,9 +5316,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5196,7 +5355,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5205,16 +5364,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Non ci sono contratti attivi."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5224,10 +5377,18 @@ 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/wireless.js:1432
+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 "
@@ -5242,19 +5403,19 @@ 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>"
@@ -5268,22 +5429,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 ""
@@ -5300,8 +5461,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5311,7 +5472,7 @@ msgstr "Questa sezione non contiene ancora valori"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5319,7 +5480,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5333,7 +5494,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 ""
 
@@ -5357,55 +5518,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5413,19 +5560,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Porte USB"
 
@@ -5455,10 +5603,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 ""
@@ -5468,21 +5618,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Non gestito"
@@ -5496,18 +5656,25 @@ msgstr "Smonta"
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5530,11 +5697,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5544,42 +5727,40 @@ msgstr "Tempo di attività"
 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"
 
@@ -5591,64 +5772,61 @@ 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"
 
@@ -5671,81 +5849,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:1257
 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:1313
 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"
 
@@ -5753,41 +5928,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5803,7 +5974,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5824,7 +5995,7 @@ msgstr ""
 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:1339
 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 "
@@ -5832,61 +6003,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Dispositivo Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "La rete wireless è attivata"
 
@@ -5898,12 +6070,18 @@ msgstr "Scrittura delle richiesta DNS ricevute nel syslog"
 msgid "Write system log to file"
 msgstr "Scrivi registro di sistema su file"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5945,18 +6123,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5964,11 +6138,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"
 
@@ -5984,22 +6158,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
@@ -6011,22 +6184,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "scaduto"
 
@@ -6044,25 +6221,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"
 
@@ -6070,6 +6243,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
@@ -6108,21 +6285,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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"
 
@@ -6130,7 +6304,7 @@ msgstr "Nessun collegamento"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "nessuna"
 
@@ -6140,7 +6314,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6155,10 +6331,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6176,66 +6348,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6252,7 +6424,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"
 
@@ -6333,8 +6505,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 ""
 
@@ -6371,7 +6543,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 ""
 
@@ -6384,11 +6556,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 ""
 
@@ -6404,14 +6576,19 @@ 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/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
@@ -6422,6 +6599,175 @@ msgstr "Sì"
 msgid "« Back"
 msgstr "« Indietro"
 
+#~ 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"
 
@@ -6546,9 +6892,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 0deed6cbda..25d4acd2e8 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-08-21 23:44+0900\n"
+"PO-Revision-Date: 2019-09-15 20:03+0900\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Language-Team: \n"
 "Language: ja\n"
@@ -13,7 +13,7 @@ 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"
 
@@ -21,11 +21,11 @@ msgstr "%.1f dB"
 msgid "%d Bit"
 msgstr "%d ビット"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,19 @@ msgid "-- Additional Field --"
 msgstr "-- 追加項目 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 手動設定 --"
@@ -98,7 +98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr "0: RSSI ���値を使用���, 1: ドライ��デフォルトを使用�る"
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "802.11r 高速ローミング"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "802.11w アソシエーションSAクエリ�最大タイムアウト時間��。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w 管�フレーム�護"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr "802.11w 最大タイムアウト"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -170,11 +171,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:819
 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:352
+#: 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 +185,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,17 +202,17 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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> �"
 
@@ -220,7 +221,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> �"
 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:373
+#: 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>"
 
@@ -244,7 +245,7 @@ msgstr ""
 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 +253,67 @@ msgstr ""
 "<br />注�: 編集�� crontab ファイル�空�場��手動� cron サービス��起動"
 "を行�必���り��。"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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デ�イス番�"
 
@@ -322,12 +327,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "アクセス�イント"
 
@@ -360,35 +365,47 @@ msgstr "アクティブ�DHCPリース"
 msgid "Active DHCPv6 Leases"
 msgstr "アクティブ�DHCPv6リース"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -402,10 +419,15 @@ 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 "インターフェース�新�作�..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr "ピアを追加"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "追加�ホストファイル"
@@ -437,7 +459,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アドレス"
 
@@ -447,12 +469,12 @@ msgid "Administration"
 msgstr "管�画�"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -466,12 +488,14 @@ msgstr ""
 msgid "Alert"
 msgstr "警告"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\" �エイリアス"
@@ -495,21 +519,19 @@ msgstr "連続 IP"
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "リスト内�端末�ら�アクセスを許�"
 
@@ -537,15 +559,15 @@ 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:119
 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:781
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -553,82 +575,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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -640,20 +662,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
@@ -661,11 +669,11 @@ msgstr "アンテナ設定"
 msgid "Any zone"
 msgstr "全��ゾーン"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "�用リクエスト�ステータス <code>%h</code> �失敗����"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr "�ェック無���用"
 
@@ -673,23 +681,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "アソシエーション済�端末"
@@ -698,18 +710,18 @@ 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:1405
 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:78
 msgid "Authoritative"
@@ -729,17 +741,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 ""
@@ -782,21 +796,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -810,14 +824,6 @@ 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 "�ックアップ"
@@ -835,11 +841,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:784
 msgid "Beacon Interval"
 msgstr "ビーコン間隔"
 
@@ -861,16 +867,16 @@ 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 "ビットレート"
@@ -879,55 +885,61 @@ msgstr "ビットレート"
 msgid "Bogus NX Domain Override"
 msgstr "�� NX ドメイン オー�ーライド"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 "カテゴリー"
 
@@ -951,7 +963,7 @@ msgstr "�ェイン"
 msgid "Change login password"
 msgstr "ログイン パスワード�変更"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "変更"
 
@@ -959,7 +971,7 @@ msgstr "変更"
 msgid "Changes applied."
 msgstr "変更��用�れ���。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "変更��り消�れ���。"
 
@@ -972,22 +984,14 @@ 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:1598
 #: 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 "�ェック"
@@ -996,7 +1000,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 "��無線�ら既存��ットワークを削除�る場����オプションを有効����。"
@@ -1009,8 +1013,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:1809
 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 "
@@ -1022,7 +1026,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:833
 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."
@@ -1030,11 +1034,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:1022
 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 ""
 
@@ -1054,14 +1058,14 @@ msgstr ""
 "指定�� mtdblock ファイルをダウンロード�る��� \"mtdblock を�存\" をク"
 "リック������。（注: ��機能�プロフェッショナル�����）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1070,12 +1074,12 @@ msgstr "DHCPリクエスト時��信�るクライアントID"
 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"
@@ -1091,11 +1095,8 @@ msgstr "リストを閉�る"
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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
@@ -1109,15 +1110,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1129,13 +1134,14 @@ msgstr ""
 "��回�策��相互�用性��題や�特�高負��トラフィック環境下���るキー "
 "�ゴシエーション�信頼性低下�原因��る����り��。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 "設定�失敗����"
@@ -1144,42 +1150,52 @@ msgstr "設定�失敗����"
 msgid "Configuration files will be kept"
 msgstr "設定ファイル����れ��"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "設定��用�れ���。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "設定�ロール�ック�れ����"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "切断�確�"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1189,36 +1205,22 @@ 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1228,6 +1230,10 @@ msgstr "�大"
 msgid "Cron Log Level"
 msgstr "Cron�ログ出力レベル"
 
+#: 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
@@ -1237,7 +1243,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 ""
 
@@ -1249,7 +1255,7 @@ msgstr ""
 "カスタム ファイル（証明書, スクリプト）�システム�残る�も�れ��ん。�れを"
 "防������最�� factory-reset を行���。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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."
@@ -1257,46 +1263,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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-サービス"
 
@@ -1317,7 +1324,7 @@ msgstr "DNS"
 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"
 
@@ -1329,15 +1336,15 @@ msgstr "DNSSEC"
 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"
@@ -1346,11 +1353,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:962
 msgid "DTIM Interval"
 msgstr "DTIM インター�ル"
 
@@ -1367,37 +1374,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1407,13 +1417,13 @@ msgstr ""
 "code>\" �設定�る����クライアント�指定�DNSサー�ーを通知���。）"
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "削除"
 
@@ -1422,18 +1432,30 @@ msgstr "削除"
 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:1649
+msgid "Delete permission denied"
+msgstr "削除パーミッション�拒��れ���"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr "削除リクエスト失敗: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "詳細"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "デザイン"
@@ -1452,10 +1474,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:81
+#: 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
@@ -1463,15 +1487,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "デ�イス�到�����ん"
 
@@ -1479,26 +1512,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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."
@@ -1506,33 +1539,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "低 Acknowledgement 時�アソシエーション解除"
 
@@ -1542,34 +1576,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1595,10 +1628,18 @@ msgstr "パブリック DNSサーãƒ�ーã�Œè¿”ç­”ã�§ã��ã�ªã�‹ã�£ã�Ÿãƒªã‚¯ã‚¨ã‚¹ãƒ
 msgid "Do not forward reverse lookups for local networks"
 msgstr "ローカル �ットワーク��逆引�を転����ん"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "本当� \"%s\" を削除����？"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr "本当�以下� SSH 公開�を削除����？"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 "ドメイン必須"
@@ -1607,7 +1648,7 @@ msgstr "ドメイン必須"
 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 "�フラグメント化"
 
@@ -1631,11 +1672,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr "ドラッグ��並�替�"
 
@@ -1652,19 +1693,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."
@@ -1672,21 +1714,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:1370
 msgid "EAP-Method"
-msgstr "EAPメソッド"
+msgstr "EAP メソッド"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "編集"
 
@@ -1698,24 +1740,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:717
 msgid "Edit this network"
 msgstr "�ットワークを編集"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
@@ -1723,27 +1765,28 @@ 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 "ジャンボフレーム パススルーを有効��る"
 
@@ -1751,7 +1794,7 @@ msgstr "ジャンボフレーム パススルーを有効��る"
 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�有効化"
 
@@ -1759,31 +1802,31 @@ msgstr "シングルDES�有効化"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "WPS プッシュボタンを有効化�る���WPA(2)-PSK�必���。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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) フラグを有効����。"
 
@@ -1791,7 +1834,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:712
 msgid "Enable this network"
 msgstr "���ットワークを有効����"
 
@@ -1799,21 +1842,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1821,28 +1864,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "エンド�イント �ート"
 
@@ -1858,6 +1905,11 @@ msgstr "カスタム値を入力"
 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
@@ -1871,12 +1923,12 @@ msgstr "エラー"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "イーサ�ットアダプタ"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "イーサ�ットスイッ�"
@@ -1889,6 +1941,10 @@ msgstr "除外インターフェース"
 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"
@@ -1897,22 +1953,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1928,30 +1984,42 @@ msgstr "外部システムログ・サー�ー �ート"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "ファイル"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 "クライアント�通知�るブートイメージ�ファイル�"
@@ -1970,6 +2038,7 @@ msgstr "プライベートフィルター"
 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 ""
@@ -1982,7 +2051,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 "�ットワーク�検索��加"
 
@@ -1994,11 +2063,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:73
 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 "ファイアウォール設定"
 
@@ -2006,7 +2075,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 "ファームウェア ファイル"
 
@@ -2038,32 +2107,32 @@ msgstr "更新機能"
 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:781
 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:1030
 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:1031
 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:1032
 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 "強制リンク"
 
@@ -2071,7 +2140,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�強制使用"
 
@@ -2079,7 +2148,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トラフィックを転��る"
 
@@ -2087,48 +2156,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:808
 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:773
 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:86
 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��"
 
@@ -2147,6 +2209,7 @@ msgid "Gateway ports"
 msgstr "ゲートウェイ �ート"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2154,11 +2217,10 @@ msgstr "ゲートウェイ �ート"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "一般設定"
 
@@ -2166,7 +2228,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2174,10 +2236,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "入力�れ�パスワード�一致���ん。パスワード�変更�れ��ん���!"
@@ -2186,7 +2244,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 "グロー�ル �ットワークオプション"
 
@@ -2197,33 +2255,29 @@ msgstr "グロー�ル �ットワークオプション"
 msgid "Go to password configuration..."
 msgstr "パスワード設定�移動..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 "�起動"
@@ -2239,9 +2293,7 @@ msgid ""
 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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>�隠匿"
 
@@ -2252,6 +2304,7 @@ 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:1939
 msgid "Host"
 msgstr "ホスト"
 
@@ -2259,7 +2312,7 @@ msgstr "ホスト"
 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 "ホスト終了タイムアウト"
 
@@ -2268,7 +2321,7 @@ 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 ã‚¿ã‚°"
 
@@ -2281,28 +2334,28 @@ msgstr "Host-Uniq ã‚¿ã‚°"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 プロトコル"
 
@@ -2325,6 +2378,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
@@ -2332,7 +2390,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"
 
@@ -2344,24 +2402,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 �ットマスク"
 
@@ -2369,16 +2426,16 @@ 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"
 
@@ -2387,6 +2444,7 @@ msgstr "IPv4+IPv6"
 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)"
@@ -2401,6 +2459,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
@@ -2413,7 +2481,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"
 
@@ -2425,11 +2493,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-プレフィクス"
 
@@ -2437,21 +2505,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 ゲートウェイ"
 
@@ -2459,22 +2527,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 サフィックス"
 
@@ -2484,31 +2552,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:1462
 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 "�ェック��場��暗�化�無効��り��。"
 
@@ -2528,36 +2600,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サー�ー アドレスを無視���"
 
@@ -2579,7 +2651,7 @@ msgstr ""
 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 "インターフェースを無視�る"
 
@@ -2603,12 +2675,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 "未使用時タイムアウト"
 
@@ -2620,19 +2692,21 @@ msgstr "�信:"
 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 "起動スクリプト"
 
@@ -2642,56 +2716,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
 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:791
 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/luasrc/model/cbi/admin_network/wifi.lua:513
+#: 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:953
 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 "内部"
 
@@ -2704,20 +2797,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "クライアント間�分離"
 
@@ -2736,15 +2845,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "�ットワーク�接続: %q"
 
@@ -2761,15 +2870,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "キー #%d"
 
@@ -2777,33 +2886,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"
 
@@ -2824,12 +2934,12 @@ 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:370
-#: 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 "リース時間"
 
@@ -2843,24 +2953,24 @@ msgstr "リースファイル"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "割り当�数"
 
@@ -2890,7 +3000,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "リンクオン"
 
@@ -2902,7 +3012,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:1361
 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 "
@@ -2911,7 +3021,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:1365
 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 "
@@ -2920,7 +3030,7 @@ 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暗�キー ファイル�リスト"
 
@@ -2936,7 +3046,7 @@ msgstr "NX ドメイン����果���返�れるホスト�リスト
 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:51
 msgid "Listen Port"
 msgstr "待����ート"
 
@@ -2969,7 +3079,11 @@ msgstr "ロード中"
 msgid "Loading SSH keys…"
 msgstr "SSH �をロード中…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr "ディレクトリ内を読�込�中..."
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "ビューを読�込�中…"
@@ -2979,20 +3093,20 @@ 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 アドレス"
 
@@ -3000,7 +3114,7 @@ msgstr "ローカル IPv6 アドレス"
 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 "ローカル スタートアップ"
 
@@ -3043,10 +3157,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "ログ出力レベル"
@@ -3071,12 +3181,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"
@@ -3085,31 +3197,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 ルール��"
@@ -3127,8 +3239,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3139,16 +3251,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr "マスター"
 
@@ -3156,7 +3269,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr "許容�れる最大 Listen 間隔"
 
@@ -3172,27 +3285,23 @@ msgstr "並列DNSクエリ�許��れる最大数"
 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:760
+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
@@ -3211,42 +3320,43 @@ msgstr "メモリー"
 msgid "Memory usage (%)"
 msgstr "メモリ使用率 (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "モード"
@@ -3255,31 +3365,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "モニター"
 
@@ -3287,7 +3396,7 @@ msgstr "モニター"
 msgid "More Characters"
 msgstr "文字数�足"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr "�ら�表示…"
 
@@ -3350,27 +3459,28 @@ 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:1313
 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 ドメイン"
 
@@ -3378,18 +3488,15 @@ msgstr "NT ドメイン"
 msgid "NTP server candidates"
 msgstr "NTPサー�ー候補"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "新���ットワーク���"
 
@@ -3399,7 +3506,8 @@ msgstr "ナビゲーション"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3424,33 +3532,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3459,18 +3585,6 @@ msgstr ""
 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
@@ -3478,6 +3592,10 @@ msgstr "範囲内��ットワーク��り��ん"
 msgid "No password set!"
 msgstr "パスワード�設定�れ����ん!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "��公開���り��ん。"
@@ -3486,19 +3604,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 "ノイズ"
 
@@ -3518,8 +3636,8 @@ msgstr ""
 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 "��"
 
@@ -3531,23 +3649,27 @@ 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:170
 msgid "Notice"
@@ -3567,55 +3689,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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"
 
@@ -3637,56 +3746,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:756
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "変更�れるオプション"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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:114
 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:123
 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:105
 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:125
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
@@ -3694,15 +3808,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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3710,7 +3824,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "発信パケット��信パケット�使用�れるUDP�ート（オプション）"
 
@@ -3731,7 +3845,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 "出力インターフェース"
 
@@ -3740,45 +3854,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:953
 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."
@@ -3786,7 +3900,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 "内部ルート�使用�れるテーブルを上書����。"
 
@@ -3794,29 +3908,33 @@ msgstr "内部ルート�使用�れるテーブルを上書����。"
 msgid "Overview"
 msgstr "概�"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 ユーザー�"
 
@@ -3824,9 +3942,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"
 
@@ -3835,63 +3953,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "パスワード"
 
@@ -3899,11 +4019,11 @@ msgstr "パスワード"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "秘密��パスワード"
 
@@ -3914,7 +4034,7 @@ msgstr "秘密��パスワード"
 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"
 
@@ -3922,27 +4042,27 @@ msgstr "パスワード2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "秘密��パス"
 
@@ -3960,7 +4080,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 アドレス"
 
@@ -3969,11 +4089,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:86
 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 ""
 
@@ -3985,7 +4105,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:133
 msgid "Persistent Keep Alive"
 msgstr "永続的�キープアライブ"
 
@@ -3993,7 +4117,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 "デ�イス設定"
 
@@ -4004,6 +4128,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
@@ -4025,15 +4153,15 @@ msgstr "�リシー"
 msgid "Port"
 msgstr "�ート"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr "�ート %s"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4045,11 +4173,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 ""
 
@@ -4057,16 +4185,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:114
 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"
@@ -4078,12 +4206,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "秘密�"
 
@@ -4104,35 +4231,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "公開�"
 
@@ -4148,15 +4269,15 @@ 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 "クオリティ"
@@ -4169,28 +4290,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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4200,31 +4322,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr "�信レート / �信レート"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ��れを必須����場��"
@@ -4247,21 +4373,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 "本当�プロトコルを切り替����?"
 
@@ -4285,7 +4401,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "�アソシエーション制�時間"
 
@@ -4307,21 +4423,15 @@ msgstr "�起動中..."
 msgid "Reboots the operating system of your device"
 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: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:56
 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 "インターフェースを�接続���"
 
@@ -4329,80 +4439,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr "hostapd �必�"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr "EAP サ�ートを�む hostapd �必�"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr "OWE サ�ートを�む hostapd �必�"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr "SAE サ�ートを�む hostapd �必�"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4418,7 +4546,31 @@ msgstr ""
 "未署��ドメイン レス�ンス��本当���未署��ドメイン�ら��も���る�"
 "検証���。上�サー�� DNSSEC をサ�ート���る必���り��。"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr "wpa-supplicant �必�"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "EAP サ�ートを�む wpa-supplicant �必�"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "OWE サ�ートを�む wpa-supplicant �必�"
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "SAE サ�ートを�む wpa-supplicant �必�"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4442,9 +4594,14 @@ msgstr "��解決�よ�ホストファイル設定"
 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 "�起動"
 
@@ -4452,7 +4609,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 "無線インターフェースを�起動���"
 
@@ -4464,26 +4621,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "パスワードを表示�る/隠�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "元�戻�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "変更��り消�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "�り消��リクエスト�ステータス <code>%h</code> �失敗����"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "設定を元�戻�����..."
 
@@ -4499,7 +4656,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4511,7 +4668,7 @@ 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 "ルーター アド�タイズメント-サービス"
 
@@ -4546,7 +4703,7 @@ msgstr "デ�イス�マウントを行���ファイルシステム�ェ
 msgid "Run filesystem check"
 msgstr "ファイルシステム�ェックを行�"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "ランタイム エラー"
 
@@ -4563,15 +4720,15 @@ msgstr "SNR"
 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 ユーザー�"
 
@@ -4580,9 +4737,9 @@ msgstr "SSH ユーザー�"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4591,17 +4748,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "スワップ"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "�存"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "�存 & �用"
@@ -4618,24 +4777,20 @@ msgstr "mtdblock ��存"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "追加�れるセクション"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "削除�れるセクション"
 
@@ -4653,12 +4808,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4666,20 +4827,16 @@ 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: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 "サービスタイプ"
 
@@ -4687,29 +4844,32 @@ msgstr "サービスタイプ"
 msgid "Services"
 msgstr "サービス"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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サー�ーを設定"
 
@@ -4721,7 +4881,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:959
 msgid "Short Preamble"
 msgstr "Short Preamble"
 
@@ -4733,21 +4893,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr "信�強度 / ノイズ"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4781,11 +4943,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "ソフトウェア VLAN"
@@ -4830,24 +4988,33 @@ msgstr "デ�イス�接続�るディレクトリを設定���"
 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:760
+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)."
@@ -4855,7 +5022,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)."
@@ -4863,28 +5030,29 @@ 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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "無線LAN�スキャンを開始�����..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "スタートアップ"
@@ -4901,11 +5069,12 @@ msgstr "IPv6 �的ルーティング"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "�的アドレス"
@@ -4920,19 +5089,20 @@ 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:976
 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:745
 #: 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 "�止"
 
@@ -4945,6 +5115,7 @@ msgid "Strong"
 msgstr "å¼·"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "�信"
 
@@ -4964,43 +5135,45 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr "シンボリックリンク"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr "NTP サー�ー��期"
@@ -5043,6 +5216,8 @@ 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"
@@ -5065,7 +5240,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 "対象�ットワーク"
 
@@ -5073,49 +5248,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5131,7 +5283,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5157,6 +5309,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"
@@ -5181,6 +5339,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "��システム����在以下�ルール�有効�������。"
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "入力�れ� SSH 公開��既�追加�れ����。"
@@ -5193,36 +5355,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:1794
+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 "
@@ -5238,10 +5400,9 @@ 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:1150
+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!"
@@ -5278,7 +5439,7 @@ msgstr ""
 "マット���り��ん。��プラットフォーム�����イメージファイル���"
 "��確�������。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "アクティブ�リース��り��ん"
 
@@ -5287,18 +5448,10 @@ msgstr "アクティブ�リース��り��ん"
 msgid "There are no active leases."
 msgstr "リース中�IPアドレス��り��ん。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5310,10 +5463,18 @@ 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/wireless.js:1432
+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 "
@@ -5334,13 +5495,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."
@@ -5348,7 +5509,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>"
@@ -5364,22 +5525,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 ""
 "スケジュールタスク システムを使用�る����定期的�特定�タスク�実行を行�"
 "����能��。"
 
-#: 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 ""
@@ -5396,8 +5557,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "��ページ����在アクティブ��ットワーク接続を表示���。"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5407,7 +5568,7 @@ msgstr "��セクション�未設定��。"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr "Group Temporal Key (GTK) �生�間隔"
 
@@ -5415,7 +5576,7 @@ msgstr "Group Temporal Key (GTK) �生�間隔"
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "ログイン…"
 
@@ -5429,7 +5590,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 ""
 
@@ -5453,55 +5614,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "タイプ"
 
@@ -5509,19 +5656,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB �ート"
 
@@ -5551,10 +5699,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 ホスト�を解決����ん"
@@ -5564,21 +5714,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "�明"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "�明�エラー (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "�明�エラーコード"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Unmanaged"
@@ -5592,18 +5752,25 @@ msgstr "アンマウント"
 msgid "Unnamed key"
 msgstr "�称未設定�公開�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 "サ�ート�れ����プロトコルタイプ"
@@ -5627,11 +5794,29 @@ 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:1698
+msgid "Upload file"
+msgstr "ファイル�アップロード"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr "ファイルをアップロード…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5641,42 +5826,40 @@ msgstr "起動時間"
 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を設定"
 
@@ -5688,64 +5871,61 @@ 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 "ルーティング テーブル�使用"
 
@@ -5766,81 +5946,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:1257
 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:1313
 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リクエスト�信時�ベンダークラスを設定"
 
@@ -5848,41 +6025,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5899,7 +6072,7 @@ msgstr "変更を�用中��..."
 msgid "Waiting for command to complete..."
 msgstr "コマンド実行中��..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "設定を�用中��… %d 秒"
 
@@ -5920,7 +6093,7 @@ msgstr "警告: å†�èµ·å‹•ã�™ã‚‹ã�¨æ¶ˆã�ˆã�¦ã�—ã�¾ã�†ã€�ä¿�å­˜ã�•ã‚Œã�¦ã�„ã�ªã�„è
 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:1339
 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 "
@@ -5931,61 +6104,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "無線アダプタ"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "無線LAN機能�有効�������"
 
@@ -5997,12 +6171,20 @@ msgstr "�信��DNSリクエストをsyslog�記録���"
 msgid "Write system log to file"
 msgstr "システムログをファイル�書�込む"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6041,18 +6223,14 @@ msgstr "ZRam サイズ"
 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:1029
+#: 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 "自動"
 
@@ -6060,11 +6238,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 "ブリッジ"
 
@@ -6080,22 +6258,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
@@ -6107,22 +6284,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "期�切れ"
 
@@ -6140,25 +6321,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 "�イブリッド モード"
 
@@ -6166,6 +6343,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
@@ -6204,21 +6385,18 @@ msgstr "5 文字��� 13 文字�キー"
 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:1344
 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 "リンク��"
 
@@ -6226,7 +6404,7 @@ msgstr "リンク��"
 msgid "non-empty value"
 msgstr "空����値"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "��"
 
@@ -6236,7 +6414,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6251,10 +6431,6 @@ msgstr "オフ"
 msgid "on"
 msgstr "オン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "オープン"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6272,66 +6448,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6348,7 +6524,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"
 
@@ -6429,8 +6605,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)"
 
@@ -6467,7 +6643,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 や \"*\"� \"#\"� \"!\"� \".\"）"
 
@@ -6480,11 +6656,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 文字以下�値"
 
@@ -6500,14 +6676,19 @@ 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/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 3d413ffdf5..3cd268153d 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,19 @@ msgid "-- Additional Field --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr ""
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
@@ -168,11 +169,11 @@ msgid ""
 "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:819
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:352
+#: 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 +183,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,16 +198,16 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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> �름"
 
@@ -215,7 +216,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> �름"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -239,69 +240,73 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 ""
 
@@ -315,12 +320,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr ""
 
@@ -353,35 +358,47 @@ msgstr "Active DHCP 임대 목�"
 msgid "Active DHCPv6 Leases"
 msgstr "Active DHCPv6 임대 목�"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -393,10 +410,15 @@ msgstr ""
 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 "새로운 �터페�스 추가..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "추가�� Hosts 파�들"
@@ -428,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 ""
 
@@ -438,12 +460,12 @@ msgid "Administration"
 msgstr "관리"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +479,14 @@ msgstr ""
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -485,21 +509,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr ""
 
@@ -524,94 +546,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -623,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
@@ -644,11 +652,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -656,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 ""
@@ -666,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "연결� station 들"
@@ -681,16 +689,16 @@ 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:1405
 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 ""
 
@@ -712,17 +720,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 +775,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -793,14 +803,6 @@ 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 "백업"
@@ -818,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -842,16 +844,16 @@ msgid ""
 "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 ""
@@ -860,55 +862,61 @@ msgstr ""
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "변경 사항"
 
@@ -940,7 +948,7 @@ msgstr "변경 사항"
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -953,20 +961,14 @@ 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:1598
 #: 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 +977,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -987,8 +989,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:1809
 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 +1002,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:833
 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 +1010,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:1022
 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,14 +1032,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1046,12 +1048,12 @@ msgstr "DHCP 요청시 전송할 Client ID"
 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"
@@ -1065,11 +1067,8 @@ msgstr "목� 닫기..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1082,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1102,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1118,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
@@ -1195,6 +1195,10 @@ msgstr ""
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1204,7 +1208,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 +1218,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1226,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1282,7 +1287,7 @@ msgstr ""
 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 ""
 
@@ -1294,15 +1299,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1332,37 +1337,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1373,13 +1381,13 @@ msgstr ""
 "팅하�� 권고할 수 있습니다."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "삭제"
 
@@ -1388,18 +1396,30 @@ msgstr "삭제"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "설명"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "디��"
@@ -1418,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:81
+#: 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 +1451,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1445,26 +1476,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1503,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1508,34 +1540,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1559,10 +1590,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 ""
@@ -1571,7 +1610,7 @@ msgstr ""
 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 ""
 
@@ -1593,11 +1632,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1613,19 +1652,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 +1673,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:1370
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "수정"
 
@@ -1657,50 +1697,51 @@ 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:717
 msgid "Edit this network"
 msgstr "� 네트워�를 수정합니다"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1708,7 +1749,7 @@ msgstr ""
 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 ""
 
@@ -1716,31 +1757,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1756,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 "활성/비활성"
 
+#: 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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1813,6 +1858,11 @@ msgstr ""
 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
@@ -1826,12 +1876,12 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet 스위치"
@@ -1844,6 +1894,10 @@ msgstr ""
 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,20 +1906,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1881,30 +1935,42 @@ msgstr "외부 system log 서버 �트"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1923,6 +1989,7 @@ msgstr ""
 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 +2000,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 +2012,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:73
 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 +2024,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 ""
 
@@ -1989,31 +2056,31 @@ msgstr "Flash ìž‘ì—…"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2088,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 +2096,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 +2104,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:808
 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:773
 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:86
 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 ""
 
@@ -2095,6 +2157,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2102,11 +2165,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "기본 설정"
 
@@ -2114,7 +2176,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2122,10 +2184,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2134,7 +2192,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 +2203,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "암호 설정 하기"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 ""
@@ -2187,9 +2241,7 @@ msgid ""
 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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> 숨기기"
 
@@ -2200,6 +2252,7 @@ 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:1939
 msgid "Host"
 msgstr "호스트"
 
@@ -2207,7 +2260,7 @@ msgstr "호스트"
 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,7 +2268,7 @@ 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 ""
 
@@ -2228,28 +2281,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2272,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
@@ -2279,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 ""
 
@@ -2291,24 +2349,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,16 +2373,16 @@ 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 ""
 
@@ -2334,6 +2391,7 @@ msgstr ""
 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 +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
@@ -2360,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"
 
@@ -2372,11 +2440,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 +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 ""
 
@@ -2406,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 ""
 
@@ -2431,31 +2499,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:1462
 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 +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 "체�하지 않� 경우, 기본 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 주소는 무시�니다"
 
@@ -2518,7 +2590,7 @@ msgstr ""
 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 "�터페�스 무시"
 
@@ -2540,12 +2612,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 ""
 
@@ -2557,19 +2629,21 @@ msgstr ""
 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 +2651,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
 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:791
 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:953
 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 +2731,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2667,15 +2776,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "네트워� 연결중: %q"
 
@@ -2692,15 +2801,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2708,33 +2817,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 ""
 
@@ -2755,12 +2865,12 @@ 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:370
-#: 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 "임대 시간"
 
@@ -2774,24 +2884,24 @@ msgstr ""
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "제한"
 
@@ -2820,7 +2930,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
@@ -2830,7 +2940,7 @@ msgid ""
 "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:1361
 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 +2949,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:1365
 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,7 +2958,7 @@ 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 ""
 
@@ -2864,7 +2974,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2896,7 +3006,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2906,20 +3020,20 @@ 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 ""
 
@@ -2927,7 +3041,7 @@ msgstr ""
 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 시작 프로그램"
 
@@ -2964,10 +3078,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Log output 레벨"
@@ -2992,11 +3102,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"
@@ -3005,31 +3117,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3159,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3058,16 +3170,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3075,7 +3188,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3091,25 +3204,23 @@ msgstr "허용�는 최대 �시 DNS query 수"
 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:760
+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
@@ -3128,42 +3239,43 @@ msgstr "메모리"
 msgid "Memory usage (%)"
 msgstr "메모리 사용량 (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3172,31 +3284,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr ""
 
@@ -3204,7 +3315,7 @@ msgstr ""
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3265,27 +3376,28 @@ 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:1313
 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 ""
 
@@ -3293,18 +3405,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "NTP 서버 목�"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr ""
 
@@ -3314,7 +3423,8 @@ msgstr ""
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3339,33 +3449,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3374,18 +3502,6 @@ msgstr ""
 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,6 +3509,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "암호 설정� 해주세요!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3401,19 +3521,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 "노�즈"
 
@@ -3433,8 +3553,8 @@ msgstr ""
 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 ""
 
@@ -3446,22 +3566,26 @@ 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:170
@@ -3480,55 +3604,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3661,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:756
 msgid "Operating frequency"
 msgstr "�작 주파수"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "변경� option"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3697,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3640,7 +3752,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 +3761,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:953
 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 +3807,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 +3815,33 @@ msgstr ""
 msgid "Overview"
 msgstr "개요"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3849,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,63 +3860,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "암호"
 
@@ -3808,11 +3926,11 @@ msgstr "암호"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3823,7 +3941,7 @@ msgstr ""
 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 ""
 
@@ -3831,27 +3949,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3869,7 +3987,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 +3996,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:86
 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 +4012,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3902,7 +4024,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 +4035,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
@@ -3934,15 +4060,15 @@ msgstr ""
 msgid "Port"
 msgstr "�트"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3954,11 +4080,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 ""
 
@@ -3966,16 +4092,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:114
 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"
@@ -3985,12 +4111,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4011,35 +4136,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4051,15 +4170,15 @@ 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 ""
@@ -4070,28 +4189,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4101,31 +4221,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4143,17 +4267,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 "정� 프로토콜 변경� �하세요?"
 
@@ -4177,7 +4295,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4199,21 +4317,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 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: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:56
 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 "� �터페�스를 재연결합니다"
 
@@ -4221,80 +4333,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 ""
 
-#: 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4306,7 +4436,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4330,9 +4484,14 @@ msgstr "Resolv 와 Hosts 파�"
 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 "재시작"
 
@@ -4340,7 +4499,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 ""
 
@@ -4352,26 +4511,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "암호 보�기/숨기기"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "변경 취소"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4387,7 +4546,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4399,7 +4558,7 @@ 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 ""
 
@@ -4434,7 +4593,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4451,15 +4610,15 @@ msgstr ""
 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 ""
 
@@ -4468,9 +4627,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4479,17 +4638,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "저장"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "저장 & �용"
@@ -4506,24 +4667,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "작업 관리"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "추가� section"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "삭제� section"
 
@@ -4538,31 +4695,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4570,29 +4729,32 @@ msgstr ""
 msgid "Services"
 msgstr "서비스"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4604,7 +4766,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4616,21 +4778,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4664,11 +4828,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4710,56 +4870,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "시작 프로그램"
@@ -4776,11 +4944,12 @@ msgstr "Static IPv6 Route 경로"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4795,19 +4964,20 @@ 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:976
 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:745
 #: 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 "정지"
 
@@ -4820,6 +4990,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "제출하기"
 
@@ -4839,41 +5010,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4916,6 +5089,8 @@ 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"
@@ -4938,7 +5113,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 ""
 
@@ -4946,45 +5121,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4998,7 +5152,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5016,6 +5170,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"
@@ -5034,6 +5194,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "다�� rule 들� 현재 � 시스템� �용 중입니다."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5044,33 +5208,35 @@ msgid ""
 "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:1794
+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 "
@@ -5085,9 +5251,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5118,7 +5283,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5127,16 +5292,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5148,10 +5307,18 @@ 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/wireless.js:1432
+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 "
@@ -5169,13 +5336,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."
@@ -5183,7 +5350,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>"
@@ -5195,20 +5362,20 @@ msgid ""
 "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 ""
@@ -5224,8 +5391,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "� 페�지는 현재 active �태� 네트워� 연결� 보여�니다."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5235,7 +5402,7 @@ msgstr "� section � 아� 입력� 값� 없습니다"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5243,7 +5410,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "시간대"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5257,7 +5424,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 ""
 
@@ -5281,55 +5448,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "유형"
 
@@ -5337,19 +5490,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5379,10 +5533,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 ""
@@ -5392,21 +5548,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "알수없�"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5420,18 +5586,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5454,11 +5627,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5468,42 +5657,40 @@ msgstr "가� 시간"
 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 ""
 
@@ -5515,64 +5702,61 @@ 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 사용"
 
@@ -5594,81 +5778,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:1257
 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:1313
 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"
 
@@ -5676,41 +5857,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5724,7 +5901,7 @@ msgstr "변경 사항� �용�기를 기다리는 중입니다..."
 msgid "Waiting for command to complete..."
 msgstr "실행한 명령� �나기를 기다리는 중입니다..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5745,7 +5922,7 @@ msgstr ""
 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:1339
 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 "
@@ -5753,61 +5930,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "무선 네트워�가 켜져 있�"
 
@@ -5819,12 +5997,18 @@ msgstr "받� DNS 요청 내용� systlog � 기�합니다"
 msgid "Write system log to file"
 msgstr "System log 출력 파� 경로"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5863,18 +6047,14 @@ msgstr ""
 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:1029
+#: 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 ""
 
@@ -5882,11 +6062,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 ""
 
@@ -5902,22 +6082,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
@@ -5929,22 +6108,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "만료�"
 
@@ -5962,25 +6145,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 ""
 
@@ -5988,6 +6167,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
@@ -6026,21 +6209,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 ""
 
-#: 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 없�"
 
@@ -6048,7 +6228,7 @@ msgstr "link 없�"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr ""
 
@@ -6058,7 +6238,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6073,10 +6255,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6094,66 +6272,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6170,7 +6348,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 ""
 
@@ -6251,8 +6429,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 ""
 
@@ -6289,7 +6467,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 ""
 
@@ -6302,11 +6480,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 ""
 
@@ -6322,14 +6500,19 @@ 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/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
@@ -6340,6 +6523,58 @@ msgstr ""
 msgid "« Back"
 msgstr ""
 
+#~ 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 64de26b22d..c1af8bb130 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- memperibadi --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -168,12 +169,12 @@ msgid ""
 "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:819
 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:352
+#: 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 +184,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,16 +199,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
@@ -216,7 +217,7 @@ msgstr ""
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "MAC-Alamat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -236,69 +237,73 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 ""
 
@@ -312,12 +317,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Pusat akses"
 
@@ -348,35 +353,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -388,10 +405,15 @@ msgstr ""
 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 ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
@@ -423,7 +445,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,12 +455,12 @@ msgid "Administration"
 msgstr "Pentadbiran"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +474,14 @@ msgstr ""
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -480,21 +504,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Izinkan senarai saja"
 
@@ -519,94 +541,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -618,20 +640,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 +647,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -651,8 +659,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 +669,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Associated Stesen"
@@ -676,16 +684,16 @@ 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:1405
 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 ""
 
@@ -707,17 +715,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 +770,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -788,14 +798,6 @@ 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"
@@ -813,11 +815,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -834,16 +836,16 @@ msgid ""
 "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 ""
@@ -852,55 +854,61 @@ msgstr ""
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -924,7 +932,7 @@ msgstr "Rantai"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Laman"
 
@@ -932,7 +940,7 @@ msgstr "Laman"
 msgid "Changes applied."
 msgstr "Laman diterapkan."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -945,20 +953,14 @@ 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:1598
 #: 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 +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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -979,8 +981,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:1809
 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 +990,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:833
 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:1022
 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,15 +1016,15 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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
 #, 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 ""
 
@@ -1031,12 +1033,12 @@ msgstr ""
 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"
@@ -1050,11 +1052,8 @@ msgstr ""
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1067,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:1188
+#: 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:1562
 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 +1087,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1103,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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"
-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:173
@@ -1180,6 +1180,10 @@ msgstr ""
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1189,7 +1193,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 +1203,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1265,7 +1270,7 @@ msgstr ""
 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 ""
 
@@ -1277,15 +1282,15 @@ msgstr ""
 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 +1299,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1315,37 +1320,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1353,13 +1361,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1368,18 +1376,30 @@ msgstr "Padam"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Keterangan"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Disain"
@@ -1398,10 +1418,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:81
+#: 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 +1431,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1425,58 +1456,59 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1486,34 +1518,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
@@ -1539,10 +1570,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1551,7 +1590,7 @@ msgstr "Domain diperlukan"
 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 ""
 
@@ -1573,11 +1612,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1592,39 +1631,40 @@ msgid ""
 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:1370
 msgid "EAP-Method"
 msgstr "EAP-Kaedah"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Sunting"
 
@@ -1634,50 +1674,51 @@ 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:717
+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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1685,7 +1726,7 @@ msgstr ""
 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 ""
 
@@ -1693,31 +1734,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1766,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1733,48 +1774,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1790,6 +1835,11 @@ msgstr ""
 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
@@ -1803,12 +1853,12 @@ msgstr "Kesalahan"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet Adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Beralih"
@@ -1821,6 +1871,10 @@ msgstr ""
 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,20 +1883,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1858,30 +1912,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1900,6 +1966,7 @@ msgstr "Penapis swasta"
 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 +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 ""
 
@@ -1922,11 +1989,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:73
 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 +2001,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 ""
 
@@ -1966,31 +2033,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +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 ""
 
@@ -2006,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 ""
 
@@ -2014,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:808
 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:773
 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:86
 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 ""
 
@@ -2072,6 +2134,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2079,11 +2142,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Setup Umum"
 
@@ -2091,7 +2153,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2099,10 +2161,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2111,7 +2169,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 +2180,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2165,9 +2219,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Menyembunyikan ESSID"
 
@@ -2178,6 +2230,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2185,7 +2238,7 @@ msgstr ""
 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,7 +2246,7 @@ 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 ""
 
@@ -2206,28 +2259,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2250,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
@@ -2257,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 ""
 
@@ -2269,24 +2327,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,16 +2351,16 @@ 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 ""
 
@@ -2312,6 +2369,7 @@ msgstr ""
 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 +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
@@ -2338,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 "Konfigurasi IPv6"
 
@@ -2350,11 +2418,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 +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 ""
 
-#: 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 +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 ""
 
@@ -2409,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:1462
 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 +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 ""
 
@@ -2501,7 +2573,7 @@ msgstr ""
 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"
 
@@ -2523,12 +2595,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 ""
 
@@ -2540,19 +2612,21 @@ msgstr ""
 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 +2634,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
 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:791
 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:953
 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 +2714,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2653,16 +2762,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:1671
 #, 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2679,15 +2788,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2695,33 +2804,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 ""
 
@@ -2742,12 +2852,12 @@ 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:370
-#: 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 ""
 
@@ -2761,24 +2871,24 @@ msgstr "Sewa fail"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2806,7 +2916,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link Pada"
 
@@ -2816,7 +2926,7 @@ msgid ""
 "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:1361
 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 +2935,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:1365
 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,7 +2944,7 @@ 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 ""
 
@@ -2850,7 +2960,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2881,7 +2991,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2891,20 +3005,20 @@ 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 ""
 
@@ -2912,7 +3026,7 @@ msgstr ""
 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 ""
 
@@ -2949,10 +3063,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2977,11 +3087,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"
@@ -2990,31 +3102,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3144,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3043,16 +3155,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3060,7 +3173,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3076,25 +3189,23 @@ msgstr ""
 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:760
+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
@@ -3113,42 +3224,43 @@ msgstr "Memori"
 msgid "Memory usage (%)"
 msgstr "Penggunaan Memori (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3157,31 +3269,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3189,7 +3300,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3252,27 +3363,28 @@ 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:1313
 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 ""
 
@@ -3280,18 +3392,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nama rangkaian baru"
 
@@ -3301,7 +3410,8 @@ msgstr "Navigation"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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,33 +3436,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3361,18 +3489,6 @@ msgstr ""
 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,6 +3496,10 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3388,19 +3508,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"
 
@@ -3420,8 +3540,8 @@ msgstr ""
 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 ""
 
@@ -3433,22 +3553,26 @@ 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:170
@@ -3467,54 +3591,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3648,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3684,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3626,7 +3739,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 +3748,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:953
 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 +3800,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Keseluruhan"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3834,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,63 +3845,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3792,11 +3911,11 @@ msgstr "Kata laluan"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3807,7 +3926,7 @@ msgstr ""
 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 ""
 
@@ -3815,27 +3934,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3853,7 +3972,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 +3981,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:86
 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 +3997,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3886,7 +4009,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 +4020,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
@@ -3918,15 +4045,15 @@ msgstr "Dasar"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3938,11 +4065,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 ""
 
@@ -3950,16 +4077,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:114
 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"
@@ -3969,12 +4096,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -3995,35 +4121,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4035,15 +4155,15 @@ 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 ""
@@ -4054,29 +4174,30 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4086,31 +4207,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4126,17 +4251,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 ""
 
@@ -4160,7 +4279,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4182,21 +4301,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:98
+#: 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:56
 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 ""
 
@@ -4204,80 +4317,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4289,7 +4420,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4313,9 +4468,14 @@ msgstr ""
 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 ""
 
@@ -4323,7 +4483,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 ""
 
@@ -4335,26 +4495,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Kembali"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4370,7 +4530,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4382,7 +4542,7 @@ 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 ""
 
@@ -4417,7 +4577,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4434,15 +4594,15 @@ msgstr ""
 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 ""
 
@@ -4451,9 +4611,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4462,17 +4622,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Simpan"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Simpan & Melaksanakan"
@@ -4489,24 +4651,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Tugas Jadual"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4521,31 +4679,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4553,29 +4713,32 @@ msgstr ""
 msgid "Services"
 msgstr "Perkhidmatan"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4587,7 +4750,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4599,21 +4762,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4647,11 +4812,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4693,56 +4854,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4759,11 +4928,12 @@ msgstr "Laluan IPv6 Statik"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4775,19 +4945,20 @@ msgid ""
 "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:976
 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:745
 #: 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 ""
 
@@ -4800,6 +4971,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Menyerahkan"
 
@@ -4819,41 +4991,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4897,6 +5071,8 @@ 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"
@@ -4919,7 +5095,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 ""
 
@@ -4927,40 +5103,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4976,7 +5136,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -4994,6 +5154,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"
@@ -5016,6 +5182,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Peraturan berikut sedang aktif pada sistem ini."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5026,33 +5196,35 @@ msgid ""
 "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:1794
+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 "
@@ -5062,9 +5234,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5102,7 +5273,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5111,16 +5282,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5130,10 +5295,18 @@ 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/wireless.js:1432
+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 "
@@ -5148,19 +5321,19 @@ 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>"
@@ -5172,22 +5345,22 @@ msgid ""
 "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 ""
@@ -5206,8 +5379,8 @@ msgstr ""
 "Laman ini memberikan gambaran lebih dari saat ini sambungan rangkaian yang "
 "aktif."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5217,7 +5390,7 @@ msgstr "Bahagian ini belum mengandungi nilai-nilai lagi"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5225,7 +5398,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Zon masa"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5236,7 +5409,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 ""
 
@@ -5260,55 +5433,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5316,19 +5475,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5358,10 +5518,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 ""
@@ -5371,21 +5533,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5399,18 +5571,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5430,11 +5609,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5444,42 +5639,40 @@ msgstr "Masa Aktif"
 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 ""
 
@@ -5491,64 +5684,61 @@ 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 ""
 
@@ -5565,81 +5755,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:1257
 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:1313
 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)"
-msgstr ""
-
 #: 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 ""
 
@@ -5647,41 +5834,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5697,7 +5880,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5718,7 +5901,7 @@ msgstr ""
 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:1339
 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 "
@@ -5726,61 +5909,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adapter Wayarles"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr ""
 
@@ -5792,12 +5976,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5832,18 +6022,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5851,11 +6037,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 ""
 
@@ -5871,22 +6057,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
@@ -5898,22 +6083,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5929,25 +6118,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 ""
 
@@ -5955,6 +6140,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
@@ -5993,21 +6182,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -6015,7 +6201,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "tidak ada"
 
@@ -6025,7 +6211,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6040,10 +6228,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6061,66 +6245,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6137,7 +6321,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 ""
 
@@ -6218,8 +6402,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 ""
 
@@ -6256,7 +6440,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 ""
 
@@ -6269,11 +6453,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 ""
 
@@ -6289,14 +6473,19 @@ 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/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
@@ -6307,6 +6496,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 5c75144b5a..d067b6cb20 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -8,7 +8,7 @@ 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 ""
 
@@ -16,11 +16,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +58,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- egendefinert --"
@@ -93,7 +93,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -105,10 +105,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:1321
 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,35 +118,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -165,11 +166,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:819
 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:352
+#: 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 +180,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,16 +197,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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"
 
@@ -214,7 +215,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Navn"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -238,65 +239,69 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +311,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"
 
@@ -321,12 +326,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Aksesspunkt"
 
@@ -357,35 +362,47 @@ msgstr "Aktive DHCP Leier"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktive DHCPv6 Leier"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -397,10 +414,15 @@ msgstr ""
 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Tilleggs vertsfiler"
@@ -432,7 +454,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"
 
@@ -442,12 +464,12 @@ msgid "Administration"
 msgstr "Administrasjon"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +483,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Varsle"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -489,21 +513,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Tillat kun oppførte"
 
@@ -528,94 +550,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -627,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 "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 +656,11 @@ msgstr "Antennekonfigurasjon"
 msgid "Any zone"
 msgstr "Alle soner"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -660,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 ""
@@ -670,13 +678,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Tilkoblede Klienter"
@@ -685,16 +693,16 @@ 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:1405
 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 ""
 
@@ -716,17 +724,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 +779,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -797,14 +807,6 @@ 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"
@@ -822,11 +824,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -846,16 +848,16 @@ msgid ""
 "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"
@@ -864,55 +866,61 @@ msgstr "Bitrate"
 msgid "Bogus NX Domain Override"
 msgstr "Overstyr falske NX Domener"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -936,7 +944,7 @@ msgstr "Lenke"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Endringer"
 
@@ -944,7 +952,7 @@ msgstr "Endringer"
 msgid "Changes applied."
 msgstr "Endringer utført."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -957,20 +965,14 @@ 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:1598
 #: 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 +981,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -991,8 +993,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:1809
 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 +1006,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:833
 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 +1014,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:1022
 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,14 +1036,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1050,12 +1052,12 @@ msgstr "Klient ID som sendes ved DHCP spørring"
 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"
@@ -1071,11 +1073,8 @@ msgstr "Lukk liste..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1088,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1108,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1124,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1201,6 +1201,10 @@ msgstr "Kritisk"
 msgid "Cron Log Level"
 msgstr "Cron logg nivå"
 
+#: 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
@@ -1210,7 +1214,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 +1224,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1232,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1288,7 +1293,7 @@ msgstr "DNS"
 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 ""
 
@@ -1300,15 +1305,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1338,37 +1343,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1378,13 +1386,13 @@ msgstr ""
 "annonserer forskjellige DNS servere til klientene."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1393,18 +1401,30 @@ msgstr "Fjern"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Beskrivelse"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Design"
@@ -1423,10 +1443,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:81
+#: 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 +1456,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1450,26 +1481,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1508,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1513,34 +1545,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1567,10 +1598,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Ikke videresend reverserte oppslag for lokale nettverk"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1579,7 +1618,7 @@ msgstr "Domene kreves"
 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 ""
 
@@ -1603,11 +1642,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1623,20 +1662,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 +1684,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:1370
 msgid "EAP-Method"
 msgstr "EAP-metode"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Endre"
 
@@ -1668,50 +1708,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Endre dette nettverket"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
 
@@ -1719,7 +1760,7 @@ msgstr "Aktiver Jumbo Frames gjennomgang"
 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 ""
 
@@ -1727,31 +1768,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1800,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1767,48 +1808,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1824,6 +1869,11 @@ msgstr ""
 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
@@ -1837,12 +1887,12 @@ msgstr "Feil"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet Tilslutning"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Svitsj"
@@ -1855,6 +1905,10 @@ msgstr ""
 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,21 +1917,21 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1893,30 +1947,42 @@ msgstr "Ekstern systemlogg server port"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Fil"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1935,6 +2001,7 @@ msgstr "Filtrer private"
 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 +2012,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 +2024,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:73
 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 +2036,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 ""
 
@@ -2001,32 +2068,32 @@ msgstr "Flash operasjoner"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2101,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 +2109,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 +2117,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:808
 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:773
 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:86
 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"
 
@@ -2108,6 +2170,7 @@ msgid "Gateway ports"
 msgstr "Gateway porter"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2115,11 +2178,10 @@ msgstr "Gateway porter"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Generelt Oppsett"
 
@@ -2127,7 +2189,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2135,10 +2197,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Det oppgitte passordet var ikke korrekt, passord ble ikke endret!"
@@ -2147,7 +2205,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 +2216,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "GÃ¥ til passord konfigurasjon..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2201,9 +2255,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Skjul <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2214,6 +2266,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2221,7 +2274,7 @@ msgstr ""
 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,7 +2283,7 @@ 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 ""
 
@@ -2243,28 +2296,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2287,6 +2340,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 +2352,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 +2364,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,16 +2388,16 @@ 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 ""
 
@@ -2349,6 +2406,7 @@ msgstr ""
 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 +2421,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 +2443,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 +2455,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 +2467,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 +2489,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 +2514,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:1462
 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 +2559,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"
 
@@ -2537,7 +2609,7 @@ msgstr ""
 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"
 
@@ -2559,12 +2631,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"
 
@@ -2576,19 +2648,21 @@ msgstr "Innkommende:"
 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 +2670,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
 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:791
 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:953
 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 +2750,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2689,15 +2798,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2714,15 +2823,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Nøkkel #%d"
 
@@ -2730,33 +2839,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"
 
@@ -2777,12 +2887,12 @@ 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:370
-#: 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 ""
 
@@ -2796,24 +2906,24 @@ msgstr "<abbr title=\"Leasefile\">Leie-fil</abbr>"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2841,7 +2951,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Forbindelse"
 
@@ -2853,7 +2963,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:1361
 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 +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:1365
 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,7 +2981,7 @@ 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 ""
 
@@ -2887,7 +2997,7 @@ msgstr "Liste over verter som returneren falske NX domene resultater"
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2919,7 +3029,11 @@ msgstr "Laster"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2929,20 +3043,20 @@ 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"
 
@@ -2950,7 +3064,7 @@ msgstr "Lokal IPv6 adresse"
 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"
 
@@ -2992,10 +3106,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Logg nivå"
@@ -3020,11 +3130,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"
@@ -3033,31 +3145,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3187,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3086,16 +3198,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3103,7 +3216,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3119,25 +3232,23 @@ msgstr "Maksimalt antall samtidige DNS spørringer"
 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:760
+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
@@ -3156,42 +3267,43 @@ msgstr "Minne"
 msgid "Memory usage (%)"
 msgstr "Minne forbruk (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modus"
@@ -3200,31 +3312,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3232,7 +3343,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3295,27 +3406,28 @@ 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:1313
 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 ""
 
@@ -3323,18 +3435,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "NTP server kandidater"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Navnet til det nye nettverket"
 
@@ -3344,7 +3453,8 @@ msgstr "Navigasjon"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3369,33 +3479,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3404,18 +3532,6 @@ msgstr ""
 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,6 +3539,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Ruteren er ikke passordbeskyttet!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3431,19 +3551,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"
 
@@ -3463,8 +3583,8 @@ msgstr ""
 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"
 
@@ -3476,22 +3596,26 @@ 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:170
@@ -3510,55 +3634,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3691,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Innstilling endret"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3727,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3670,7 +3782,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 +3791,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:953
 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 +3837,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 +3845,33 @@ msgstr "Overstyr tabellen som brukes for interne ruter"
 msgid "Overview"
 msgstr "Oversikt"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3879,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,63 +3890,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3838,11 +3956,11 @@ msgstr "Passord"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3853,7 +3971,7 @@ msgstr ""
 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 ""
 
@@ -3861,27 +3979,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3899,7 +4017,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 +4026,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:86
 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 +4042,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3932,7 +4054,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 +4065,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
@@ -3964,15 +4090,15 @@ msgstr "Policy"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3984,11 +4110,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 ""
 
@@ -3996,16 +4122,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:114
 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"
@@ -4017,12 +4143,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4043,35 +4168,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4083,15 +4202,15 @@ 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"
@@ -4102,28 +4221,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4133,31 +4253,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4175,19 +4299,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?"
 
@@ -4211,7 +4327,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4233,21 +4349,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:98
+#: 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:56
 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"
 
@@ -4255,80 +4365,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4340,7 +4468,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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,9 +4516,14 @@ msgstr "Oppslag og Vertsfiler"
 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"
 
@@ -4374,7 +4531,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 ""
 
@@ -4386,26 +4543,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Vis/Skjul passord"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Tilbakestill"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4421,7 +4578,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4433,7 +4590,7 @@ 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 ""
 
@@ -4468,7 +4625,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4485,15 +4642,15 @@ msgstr ""
 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 ""
 
@@ -4502,9 +4659,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4513,17 +4670,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Lagre & Aktiver"
@@ -4540,24 +4699,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Planlagte Oppgaver"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Seksjon lagt til"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Seksjon fjernet"
 
@@ -4572,12 +4727,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4585,20 +4746,16 @@ 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: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"
 
@@ -4606,29 +4763,32 @@ msgstr "Tjeneste type"
 msgid "Services"
 msgstr "Tjenester"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4640,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4652,21 +4812,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4700,11 +4862,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4749,57 +4907,65 @@ msgstr "Hvor lagrings enheten blir tilsluttet filsystemet (f.eks. /mnt/sda1)"
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Oppstart"
@@ -4816,11 +4982,12 @@ msgstr "Statiske IPv6 Ruter"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4835,19 +5002,20 @@ 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:976
 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:745
 #: 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"
 
@@ -4860,6 +5028,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Send"
 
@@ -4879,41 +5048,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4956,6 +5127,8 @@ 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"
@@ -4978,7 +5151,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 ""
 
@@ -4986,50 +5159,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5045,7 +5193,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5065,6 +5213,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"
@@ -5089,6 +5243,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Følgende regler er aktiver på systemet."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5099,36 +5257,35 @@ msgid ""
 "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:1794
+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 "
@@ -5144,10 +5301,9 @@ 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:1150
+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!"
@@ -5185,7 +5341,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5194,18 +5350,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Det er ingen aktive leieavtaler."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5217,10 +5365,18 @@ 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/wireless.js:1432
+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 "
@@ -5238,13 +5394,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."
@@ -5252,7 +5408,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>"
@@ -5268,20 +5424,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 ""
@@ -5298,8 +5454,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5309,7 +5465,7 @@ msgstr "Denne seksjonen inneholder ennå ingen verdier"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5317,7 +5473,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5332,7 +5488,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 ""
 
@@ -5356,55 +5512,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5412,19 +5554,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5454,10 +5597,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 ""
@@ -5467,21 +5612,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Uhåndtert"
@@ -5495,18 +5650,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5529,11 +5691,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5543,42 +5721,40 @@ msgstr "Oppetid"
 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"
 
@@ -5590,64 +5766,61 @@ 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"
 
@@ -5668,81 +5841,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:1257
 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:1313
 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"
 
@@ -5750,41 +5920,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5800,7 +5966,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5821,7 +5987,7 @@ msgstr ""
 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:1339
 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 "
@@ -5829,61 +5995,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: 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:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Trådløst nettverk er aktivert"
 
@@ -5895,12 +6062,18 @@ msgstr "Skriv mottatte DNS forespørsler til syslog"
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5941,18 +6114,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5960,11 +6129,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"
 
@@ -5980,22 +6149,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
@@ -6007,22 +6175,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "utgått"
 
@@ -6040,25 +6212,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 ""
 
@@ -6066,6 +6234,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
@@ -6104,21 +6276,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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"
 
@@ -6126,7 +6295,7 @@ msgstr "ingen forbindelse"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "ingen"
 
@@ -6136,7 +6305,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6151,10 +6322,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6172,66 +6339,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6248,7 +6415,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"
 
@@ -6329,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 ""
 
@@ -6367,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 ""
 
@@ -6380,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 ""
 
@@ -6400,14 +6567,19 @@ 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/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
@@ -6418,6 +6590,198 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Tilbake"
 
+#~ 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"
 
@@ -6548,9 +6912,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 8b05143593..7c42296312 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -14,7 +14,7 @@ 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 ""
 
@@ -22,11 +22,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +64,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- własne --"
@@ -99,7 +99,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -111,10 +111,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:1321
 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,35 +124,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr "802.11w maksymalny czas oczekiwania"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -171,11 +172,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:819
 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:352
+#: 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 +186,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,16 +202,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -219,7 +220,7 @@ msgstr "Nazwa diody <abbr title=\"Light Emitting Diode\">LED</abbr>"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -243,7 +244,7 @@ msgstr ""
 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 +252,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +316,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"
 
@@ -327,12 +332,12 @@ 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Punkt dostępowy"
 
@@ -367,35 +372,47 @@ msgstr "Aktywne dzierżawy DHCP"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktywne dzierżawy DHCPv6"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -407,10 +424,15 @@ msgstr "Dodaj klucz"
 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -443,7 +465,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\""
 
@@ -453,12 +475,12 @@ msgid "Administration"
 msgstr "ZarzÄ…dzanie"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -472,12 +494,14 @@ msgstr "Agregacja siły transmisji (ACTATP)"
 msgid "Alert"
 msgstr "Alarm"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\""
@@ -501,21 +525,19 @@ msgstr "Przydzielaj adresy IP po kolei"
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Pozwól tylko wymienionym"
 
@@ -542,15 +564,15 @@ msgid ""
 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:119
 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:781
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -558,82 +580,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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -645,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 "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 +674,11 @@ msgstr "Ustawienia anteny"
 msgid "Any zone"
 msgstr "Dowolna strefa"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 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:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -678,8 +686,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 +698,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Połączone stacje"
@@ -707,16 +715,16 @@ 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:1405
 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 ""
 
@@ -738,17 +746,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 +801,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -819,14 +829,6 @@ 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"
@@ -844,11 +846,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:784
 msgid "Beacon Interval"
 msgstr "Interwał Beaconu"
 
@@ -868,16 +870,16 @@ msgid ""
 "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"
@@ -886,55 +888,61 @@ msgstr "Szybkość transmisji"
 msgid "Bogus NX Domain Override"
 msgstr "Podrób statystyki NXDOMAIN"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -958,7 +966,7 @@ msgstr "�ańcuch"
 msgid "Change login password"
 msgstr "Zmień hasło logowania"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Zmiany"
 
@@ -966,7 +974,7 @@ msgstr "Zmiany"
 msgid "Changes applied."
 msgstr "Zmiany zostały zastosowane."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "Zmiany zostały cofnięte."
 
@@ -979,20 +987,14 @@ 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:1598
 #: 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 +1003,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1013,8 +1015,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:1809
 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 +1028,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:833
 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 +1036,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:1022
 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,14 +1060,14 @@ 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:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1074,12 +1076,12 @@ msgstr "Nazwa (ID) klienta do wysłania podczas negocjacji DHCP"
 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"
@@ -1095,11 +1097,8 @@ msgstr "Zamknij listÄ™..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1112,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1137,14 @@ msgstr ""
 "odporność kluczowych negocjacji, szczególnie w środowiskach o dużym "
 "natężeniu ruchu."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,79 +1153,74 @@ msgstr "Konfiguracja nieudana"
 msgid "Configuration files will be kept"
 msgstr "Pliki konfiguracyjne zostanÄ… zachowane"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "Konfiguracja została zastosowana."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "Konfiguracja została wycofana!"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1231,6 +1230,10 @@ msgstr "Krytyczne"
 msgid "Cron Log Level"
 msgstr "Poziom logowania Cron`a"
 
+#: 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
@@ -1240,7 +1243,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 +1255,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:54
+#: 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 +1263,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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"
 
@@ -1320,7 +1324,7 @@ msgstr "DNS"
 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 ""
 
@@ -1332,15 +1336,15 @@ msgstr ""
 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 +1353,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:962
 msgid "DTIM Interval"
 msgstr "Interwał DTIM"
 
@@ -1370,37 +1374,40 @@ msgstr "Szybkość przesyłania danych"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1410,13 +1417,13 @@ msgstr ""
 "\" rozgłasza domyślne serwery DNS klientom DHCP."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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ń"
 
@@ -1425,18 +1432,30 @@ msgstr "Usuń"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Opis"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Motyw"
@@ -1455,10 +1474,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:81
+#: 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 +1487,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "UrzÄ…dzenie nieosiÄ…galne!"
 
@@ -1482,26 +1512,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1539,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Rozłączaj przy niskim stanie ramek ACK"
 
@@ -1545,35 +1576,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1600,10 +1629,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Nie przekazuj odwrotnych lookup`ów do sieci lokalnych"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr "Czy na pewno chcesz usunąć następujący klucz SSH?"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1612,7 +1649,7 @@ msgstr "Wymagana domena"
 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 ""
 
@@ -1636,11 +1673,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1657,20 +1694,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 +1716,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:1370
 msgid "EAP-Method"
 msgstr "Metoda EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Edycja"
 
@@ -1702,24 +1740,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:717
 msgid "Edit this network"
 msgstr "Edytuj tą sieć"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,27 +1765,28 @@ 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"
 
@@ -1755,7 +1794,7 @@ msgstr "WÅ‚Ä…cz przechodzenie ramek Jumbo"
 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 ""
 
@@ -1763,31 +1802,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 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:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1834,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1803,21 +1842,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1825,30 +1864,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1864,6 +1907,11 @@ msgstr ""
 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
@@ -1877,12 +1925,12 @@ msgstr "BÅ‚Ä…d"
 msgid "Errored seconds (ES)"
 msgstr "Ilość błędów (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Karta Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
@@ -1895,6 +1943,10 @@ msgstr "Wyklucz interfejsy"
 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,22 +1955,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1934,30 +1986,42 @@ msgstr "Port zewnętrznego serwera logów systemowych"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Plik"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1976,6 +2040,7 @@ msgstr "Filtruj prywatne"
 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 +2051,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 +2063,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:73
 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 +2075,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"
 
@@ -2042,32 +2107,32 @@ msgstr "Operacje aktualizacji"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2140,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 +2148,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 +2156,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:808
 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:773
 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:86
 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"
 
@@ -2149,6 +2209,7 @@ msgid "Gateway ports"
 msgstr "Porty bramy"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2156,11 +2217,10 @@ msgstr "Porty bramy"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Ustawienia podstawowe"
 
@@ -2168,7 +2228,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:1339
 msgid "Generate PMK locally"
 msgstr "Wygeneruj PMK lokalnie"
 
@@ -2176,10 +2236,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2190,7 +2246,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 +2257,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:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2244,9 +2296,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ukryj <abbr title=\"Extended Service Set Identifier (NazwÄ™ sieci)\">ESSID</"
@@ -2259,6 +2309,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2266,7 +2317,7 @@ msgstr ""
 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,7 +2325,7 @@ 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"
 
@@ -2287,28 +2338,28 @@ msgstr "Zawartość znacznika Host-Uniq"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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"
 
@@ -2331,6 +2382,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 +2394,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 +2406,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,16 +2430,16 @@ 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 ""
 
@@ -2393,6 +2448,7 @@ msgstr ""
 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 +2463,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 +2485,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 +2497,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 +2509,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 +2531,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 +2556,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:1462
 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 +2606,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"
 
@@ -2587,7 +2657,7 @@ msgstr ""
 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"
 
@@ -2609,12 +2679,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"
 
@@ -2626,19 +2696,21 @@ msgstr "PrzychodzÄ…cy:"
 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 +2719,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
 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:791
 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:953
 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 +2799,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Izoluj klientów"
 
@@ -2740,15 +2847,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Przyłączanie do sieci: %q"
 
@@ -2765,15 +2872,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Klucz #%d"
 
@@ -2781,33 +2888,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"
 
@@ -2828,12 +2936,12 @@ 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:370
-#: 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"
 
@@ -2847,24 +2955,24 @@ msgstr "Plik dzierżaw"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2893,7 +3001,7 @@ msgstr "Stan linii"
 msgid "Line Uptime"
 msgstr "Czas działania linii"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Połączenie aktywne"
 
@@ -2905,7 +3013,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:1361
 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 +3022,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:1365
 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,7 +3031,7 @@ 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 ""
 
@@ -2939,7 +3047,7 @@ msgstr "Lista hostów które dostarczają zafałszowane wyniki NX domain"
 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:51
 msgid "Listen Port"
 msgstr "Nasłuchuj port"
 
@@ -2971,7 +3079,11 @@ msgstr "�adowanie"
 msgid "Loading SSH keys…"
 msgstr "�adowanie kluczy SSH…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2981,20 +3093,20 @@ 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"
 
@@ -3002,7 +3114,7 @@ msgstr "Lokalny adres IPv6"
 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"
 
@@ -3045,10 +3157,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Poziom logowania"
@@ -3073,11 +3181,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"
@@ -3086,31 +3196,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3238,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3141,16 +3251,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3158,7 +3269,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3174,25 +3285,23 @@ msgstr "Maksymalna dozwolona liczba jednoczesnych zapytań DNS"
 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:760
+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
@@ -3211,42 +3320,43 @@ msgstr "Pamięć"
 msgid "Memory usage (%)"
 msgstr "Użycie pamięci (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Tryb"
@@ -3255,31 +3365,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3287,7 +3396,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3350,27 +3459,28 @@ 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:1313
 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 ""
 
@@ -3378,18 +3488,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Lista serwerów NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nazwa nowej sieci"
 
@@ -3399,7 +3506,8 @@ msgstr "Nawigacja"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3424,33 +3532,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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"
@@ -3459,18 +3585,6 @@ msgstr "Brak zgodnej delegacji prefiksu"
 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,6 +3592,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nie ustawiono hasła!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "Nie ma jeszcze kluczy publicznych."
@@ -3486,19 +3604,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"
 
@@ -3518,8 +3636,8 @@ msgstr "Nieprzewidziane błedy CRC (CRC_P)"
 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"
 
@@ -3531,22 +3649,26 @@ 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:170
@@ -3567,54 +3689,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3746,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:756
 msgid "Operating frequency"
 msgstr "Częstotliwość"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Wartość zmieniona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3786,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3730,7 +3841,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 +3850,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:953
 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 +3896,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 +3904,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:1601
+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 +3938,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,63 +3949,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3898,11 +4015,11 @@ msgstr "Hasło"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Wewnętrzne hasło klucza prywatnego"
 
@@ -3913,7 +4030,7 @@ msgstr "Wewnętrzne hasło klucza prywatnego"
 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 ""
 
@@ -3921,27 +4038,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Ścieżka do wewnętrznego klucza prywatnego "
 
@@ -3959,7 +4076,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 +4085,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:86
 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 +4101,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3992,7 +4113,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 +4124,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
@@ -4024,15 +4149,15 @@ msgstr "Zasada"
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4044,11 +4169,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"
 
@@ -4056,16 +4181,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:114
 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"
@@ -4077,12 +4202,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Klucz prywatny"
 
@@ -4103,35 +4227,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Klucz publiczny"
 
@@ -4147,15 +4265,15 @@ 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ść"
@@ -4168,28 +4286,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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4199,31 +4318,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 "
@@ -4243,20 +4366,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ół?"
 
@@ -4280,7 +4394,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "Termin reasocjacji"
 
@@ -4302,21 +4416,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:98
+#: 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:56
 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"
 
@@ -4324,80 +4432,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4411,7 +4537,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:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4435,9 +4585,14 @@ msgstr "Pliki Resolv i Hosts"
 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"
 
@@ -4445,7 +4600,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"
 
@@ -4457,26 +4612,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Odsłoń/Ukryj hasło"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Przywróć"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "Przywróć zmiany"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 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:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "Przywracanie konfiguracji…"
 
@@ -4492,7 +4647,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4504,7 +4659,7 @@ 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"
 
@@ -4540,7 +4695,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4557,15 +4712,15 @@ msgstr "SNR"
 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 ""
 
@@ -4574,9 +4729,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4585,17 +4740,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "SWAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Zapisz"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Zapisz i zastosuj"
@@ -4612,24 +4769,20 @@ msgstr "Zapisz zawartość mtdblock"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Zaplanowane Zadania"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Dodano sekcjÄ™"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Usunięto sekcję"
 
@@ -4647,12 +4800,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4660,20 +4819,16 @@ 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: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"
 
@@ -4681,15 +4836,15 @@ msgstr "Typ serwisu"
 msgid "Services"
 msgstr "Serwisy"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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)."
@@ -4697,15 +4852,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"
 
@@ -4717,7 +4875,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:959
 msgid "Short Preamble"
 msgstr "Krótki Wstęp"
 
@@ -4729,21 +4887,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:1596
 #: 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:1940
+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)"
@@ -4777,11 +4937,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Programowy VLAN"
@@ -4826,7 +4982,7 @@ msgstr "Podaje katalog do którego jest podłączone urządzenie"
 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"
@@ -4834,51 +4990,59 @@ 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "Rozpoczynanie skanowania..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Autostart"
@@ -4895,11 +5059,12 @@ msgstr "Statyczne ścieżki routingu IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4915,19 +5080,20 @@ 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:976
 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:745
 #: 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"
 
@@ -4940,6 +5106,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Wyślij"
 
@@ -4959,41 +5126,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -5037,6 +5206,8 @@ 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"
@@ -5059,7 +5230,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 ""
 
@@ -5067,50 +5238,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5126,7 +5272,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5146,6 +5292,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"
@@ -5171,6 +5323,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Następujące zasady są obecnie aktywne w tym systemie."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "Podany klucz publiczny SSH został już dodany."
@@ -5183,37 +5339,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:1794
+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 "
@@ -5230,10 +5385,9 @@ 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:1150
+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!"
@@ -5271,7 +5425,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5280,18 +5434,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Brak aktywnych dzierżaw."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5303,10 +5449,18 @@ 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/wireless.js:1432
+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 "
@@ -5325,13 +5479,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."
@@ -5339,7 +5493,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>"
@@ -5356,21 +5510,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 ""
@@ -5388,8 +5542,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5399,7 +5553,7 @@ msgstr "Ta sekcja nie zawiera jeszcze żadnych wartości"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5407,7 +5561,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Zaloguj się…"
 
@@ -5421,7 +5575,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"
 
@@ -5445,55 +5599,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5501,19 +5641,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Porty USB"
 
@@ -5543,10 +5684,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"
@@ -5556,21 +5699,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: 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:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "NiezarzÄ…dzalny"
@@ -5584,18 +5737,25 @@ msgstr "Odmontuj"
 msgid "Unnamed key"
 msgstr "Klucz beznazwy"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5619,11 +5779,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5633,42 +5809,40 @@ msgstr "Czas pracy"
 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"
 
@@ -5680,64 +5854,61 @@ 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"
 
@@ -5759,81 +5930,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:1257
 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:1313
 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"
 
@@ -5841,41 +6009,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5891,7 +6055,7 @@ msgstr "Trwa wprowadzenie zmian..."
 msgid "Waiting for command to complete..."
 msgstr "Trwa wykonanie polecenia..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5914,7 +6078,7 @@ msgstr ""
 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:1339
 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 "
@@ -5922,61 +6086,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adapter bezprzewodowy"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Sieć bezprzewodowa jest włączona"
 
@@ -5988,12 +6153,18 @@ msgstr "Zapisz otrzymane żądania DNS do syslog'a"
 msgid "Write system log to file"
 msgstr "Zapisz log systemowy do pliku"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6034,18 +6205,14 @@ msgstr "Rozmiar ZRam"
 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:1029
+#: 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"
 
@@ -6053,11 +6220,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"
 
@@ -6073,22 +6240,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
@@ -6100,22 +6266,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "wygasły"
 
@@ -6133,25 +6303,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"
 
@@ -6159,6 +6325,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
@@ -6197,14 +6367,11 @@ msgstr "klucz z 5 lub 13 znakami"
 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:1344
 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
@@ -6212,7 +6379,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"
 
@@ -6220,7 +6387,7 @@ msgstr "niepowiÄ…zane"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "żaden"
 
@@ -6230,7 +6397,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6245,10 +6414,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6266,66 +6431,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6342,7 +6507,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"
 
@@ -6423,8 +6588,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 ""
 
@@ -6461,7 +6626,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 ""
 
@@ -6474,11 +6639,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 ""
 
@@ -6494,14 +6659,19 @@ 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/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
@@ -6512,6 +6682,210 @@ msgstr "tak"
 msgid "« Back"
 msgstr "« Wróć"
 
+#~ 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)"
 
@@ -6756,9 +7130,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 3c6512ff07..887e1ef7a8 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -13,7 +13,7 @@ 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"
 
@@ -21,11 +21,11 @@ msgstr "%.1f dB"
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalizado --"
@@ -100,7 +100,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -112,10 +112,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:1321
 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,37 +125,37 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "802.11r Fast Transition"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 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:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 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:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 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:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
@@ -177,12 +178,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:819
 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:352
+#: 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 +193,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,18 +211,18 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -230,7 +231,7 @@ msgstr "Nome do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 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:373
+#: 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>"
 
@@ -254,7 +255,7 @@ msgstr ""
 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 +263,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +333,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"
 
@@ -343,12 +348,12 @@ msgstr "Identificador de"
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Ponto de Acceso (AP)"
 
@@ -381,35 +386,47 @@ msgstr "Alocações DHCP ativas"
 msgid "Active DHCPv6 Leases"
 msgstr "Alocações DHCPv6 ativas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -421,10 +438,15 @@ msgstr ""
 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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)"
@@ -456,7 +478,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"
 
@@ -466,12 +488,12 @@ msgid "Administration"
 msgstr "Administração"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -487,12 +509,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\""
@@ -518,23 +542,21 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
@@ -563,15 +585,15 @@ 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:119
 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:781
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -579,81 +601,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:1480
 msgid "Anonymous Identity"
 msgstr "Identidade Anônima"
 
@@ -665,20 +687,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 +694,11 @@ msgstr "Configuração da antena"
 msgid "Any zone"
 msgstr "Qualquer zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 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:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -698,8 +706,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 +718,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Estações associadas"
@@ -727,16 +735,16 @@ 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:1405
 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"
 
@@ -758,17 +766,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 +825,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -843,14 +853,6 @@ 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"
@@ -868,11 +870,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:784
 msgid "Beacon Interval"
 msgstr "Intervalo do quadro de monitoramento (Beacon)"
 
@@ -892,16 +894,16 @@ msgid ""
 "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"
@@ -910,56 +912,62 @@ msgstr "Taxa de bits"
 msgid "Bogus NX Domain Override"
 msgstr "Substituir Domínio NX Falsos"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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"
 
@@ -983,7 +991,7 @@ msgstr "Cadeia"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Alterações"
 
@@ -991,7 +999,7 @@ msgstr "Alterações"
 msgid "Changes applied."
 msgstr "Alterações aplicadas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "As mudanças foram revertidas."
 
@@ -1004,22 +1012,14 @@ 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:1598
 #: 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 +1029,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:1786
 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 +1041,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:1809
 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 +1054,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:833
 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 +1062,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:1022
 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,14 +1086,14 @@ 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:2037
-#: 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:2184
+#: 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 "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"
@@ -1103,12 +1103,12 @@ msgstr ""
 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"
@@ -1124,11 +1124,8 @@ msgstr "Fechar a lista..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1139,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1164,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:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 +1180,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:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "A configuração foi aplicada."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "A configuração foi revertida!"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1224,36 +1236,22 @@ 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1263,6 +1261,10 @@ msgstr "Crítico"
 msgid "Cron Log Level"
 msgstr "Nível de Registro da Cron"
 
+#: 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
@@ -1272,7 +1274,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 +1286,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:54
+#: 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 +1294,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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"
 
@@ -1352,7 +1355,7 @@ msgstr "DNS"
 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"
 
@@ -1364,15 +1367,15 @@ msgstr "DNSSEC"
 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 +1384,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:962
 msgid "DTIM Interval"
 msgstr ""
 "Intervalo <abbr title=\"Mensagem Indicativa de Envio de Tráfego/Delivery "
@@ -1404,37 +1407,40 @@ msgstr "Taxa de Dados"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1445,13 +1451,13 @@ msgstr ""
 "DNS para os clientes."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1460,18 +1466,30 @@ msgstr "Apagar"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Descrição"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Tema"
@@ -1490,10 +1508,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:81
+#: 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 +1521,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "Dispositivo não alcançável!"
 
@@ -1518,26 +1547,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1574,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Desassociar quando tiver baixa confirmação de recebimento"
 
@@ -1582,34 +1612,33 @@ 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 "A tentativa de desconexão falhou"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1638,10 +1667,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Não encaminhe buscas por endereço reverso das redes local"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1650,7 +1687,7 @@ msgstr "Requerer domínio"
 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"
 
@@ -1675,13 +1712,13 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1698,21 +1735,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 +1758,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:1370
 msgid "EAP-Method"
 msgstr "Método EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Editar"
 
@@ -1746,24 +1784,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:717
 msgid "Edit this network"
 msgstr "Editar esta rede"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,27 +1810,28 @@ 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)"
 
@@ -1800,7 +1839,7 @@ msgstr "Ativar o encaminhamento de quadros jumbos (Jumbo Frames)"
 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"
 
@@ -1808,32 +1847,32 @@ msgstr "Habilitar DES Simples"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 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:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1880,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:712
 msgid "Enable this network"
 msgstr "Habilitar esta rede"
 
@@ -1849,24 +1888,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1874,28 +1913,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "Porta do ponto final"
 
@@ -1911,6 +1954,11 @@ msgstr "Entre com valores personalizados"
 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
@@ -1924,12 +1972,12 @@ msgstr "Erro"
 msgid "Errored seconds (ES)"
 msgstr "Segundos com erro (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
@@ -1942,6 +1990,10 @@ msgstr "Excluir interfaces"
 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,22 +2002,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr "Lista dos Detentor de Chave R1 Externa"
 
@@ -1981,35 +2033,47 @@ msgstr "Porta do servidor externo de registro do sistema (syslog)"
 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:1335
 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:1336
 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:1333
 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:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Arquivo"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -2028,6 +2092,7 @@ msgstr "Filtrar endereços privados"
 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 +2106,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 +2118,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:73
 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 +2130,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"
 
@@ -2097,31 +2162,31 @@ msgstr "Operações na memória flash"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2194,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 +2202,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 +2212,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:808
 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:773
 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:86
 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"
 
@@ -2207,6 +2265,7 @@ msgid "Gateway ports"
 msgstr "Acesso remoto a portas encaminhadas"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2214,11 +2273,10 @@ msgstr "Acesso remoto a portas encaminhadas"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Configurações Gerais"
 
@@ -2226,7 +2284,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 "Gerar a <abbr title=\"Chave mestre do emparelhamento/Pairwise Master Key"
@@ -2236,10 +2294,6 @@ 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
 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 +2302,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 +2313,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:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2306,9 +2354,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos"
@@ -2321,6 +2367,7 @@ 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:1939
 msgid "Host"
 msgstr "Equipamento"
 
@@ -2328,7 +2375,7 @@ msgstr "Equipamento"
 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,7 +2385,7 @@ 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"
 
@@ -2351,30 +2398,30 @@ msgstr "Conteúdo da etiqueta única do equipamento"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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"
 
@@ -2397,6 +2444,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 +2456,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 +2468,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,16 +2492,16 @@ 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"
 
@@ -2459,6 +2510,7 @@ msgstr "IPv4+IPv6"
 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 +2525,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 +2547,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 +2559,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 +2573,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 +2595,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 +2620,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:1462
 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 +2669,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"
@@ -2657,7 +2723,7 @@ msgstr ""
 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"
 
@@ -2681,12 +2747,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"
 
@@ -2698,19 +2764,21 @@ msgstr "Entrando:"
 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 +2786,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
 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:791
 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:953
 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 +2866,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Isolar Clientes"
 
@@ -2814,15 +2917,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Juntando-se à rede %q"
 
@@ -2839,15 +2942,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Chave #%d"
 
@@ -2855,33 +2958,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"
 
@@ -2902,12 +3006,12 @@ 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:370
-#: 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"
 
@@ -2921,24 +3025,24 @@ msgstr "Arquivo de atribuições"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2968,7 +3072,7 @@ 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:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Enlace Ativo"
 
@@ -2980,7 +3084,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:1361
 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 +3098,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:1365
 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,7 +3112,7 @@ 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"
 
@@ -3028,7 +3132,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr "Porta de Escuta"
 
@@ -3060,7 +3164,11 @@ msgstr "Carregando"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -3070,20 +3178,20 @@ 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"
 
@@ -3091,7 +3199,7 @@ msgstr "Endereço IPv6 local"
 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"
 
@@ -3135,10 +3243,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Nível de detalhamento de saída dos registros"
@@ -3165,11 +3269,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"
@@ -3178,31 +3284,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3326,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:68
 msgid "MTU"
 msgstr ""
 "<abbr title=\"Maximum Transmission Unit/Unidade Máxima de Transmissão\">MTU</"
@@ -3235,16 +3341,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3254,7 +3361,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3270,27 +3377,23 @@ msgstr "Número máximo permitido de consultas DNS concorrentes"
 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:760
+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
@@ -3309,42 +3412,43 @@ msgstr "Memória"
 msgid "Memory usage (%)"
 msgstr "Uso da memória (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modo"
@@ -3353,31 +3457,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3385,7 +3488,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3448,27 +3551,28 @@ 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:1313
 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"
 
@@ -3476,18 +3580,15 @@ msgstr "Domínio NT"
 msgid "NTP server candidates"
 msgstr "Candidatos a servidor NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nome da nova rede"
 
@@ -3497,7 +3598,8 @@ msgstr "Navegação"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3522,33 +3624,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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"
@@ -3557,18 +3677,6 @@ msgstr "Não casou com nenhum prefixo delegado"
 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,6 +3684,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nenhuma senha definida!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3584,19 +3696,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"
 
@@ -3620,8 +3732,8 @@ msgstr ""
 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"
 
@@ -3633,23 +3745,27 @@ 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:170
 msgid "Notice"
@@ -3667,56 +3783,43 @@ msgstr "Número de entradas DNS em cache (máximo é 10000, 0 desabilita o cache
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3841,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:756
 msgid "Operating frequency"
 msgstr "Frequência de Operação"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Opção alterada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3767,7 +3871,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 +3883,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:114
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3787,15 +3891,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:123
 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:105
 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:125
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
@@ -3803,15 +3907,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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3820,7 +3924,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "Opcional. Porta UDP usada para pacotes saintes ou entrantes."
 
@@ -3841,7 +3945,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 +3954,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:953
 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 +4003,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 +4011,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:1601
+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 +4045,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,63 +4056,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -4012,11 +4122,11 @@ msgstr "Senha"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Senha da Chave Privada interna"
 
@@ -4027,7 +4137,7 @@ msgstr "Senha da Chave Privada interna"
 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"
 
@@ -4035,27 +4145,27 @@ msgstr "Senha2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Caminho para a Chave Privada interna"
 
@@ -4073,7 +4183,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 +4192,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:86
 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 +4208,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:133
 msgid "Persistent Keep Alive"
 msgstr "Manutenção da Conexão Persistente"
 
@@ -4106,7 +4220,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 +4231,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
@@ -4138,15 +4256,15 @@ msgstr "Política"
 msgid "Port"
 msgstr "Porta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4159,11 +4277,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"
 
@@ -4171,16 +4289,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:114
 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"
@@ -4192,12 +4310,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Chave Privada"
 
@@ -4218,35 +4335,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Chave Pública"
 
@@ -4258,17 +4369,17 @@ 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"
@@ -4281,28 +4392,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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4312,31 +4424,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 "
@@ -4359,21 +4475,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?"
 
@@ -4397,7 +4503,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "Limite para Reassociação"
 
@@ -4419,21 +4525,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:98
+#: 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:56
 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"
 
@@ -4441,74 +4541,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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 "
@@ -4518,7 +4616,27 @@ 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4532,7 +4650,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:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4556,9 +4698,14 @@ msgstr "Arquivos de Resolv e Hosts"
 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"
 
@@ -4566,7 +4713,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"
 
@@ -4578,27 +4725,27 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Relevar/esconder senha"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Reverter"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "Reverter as mudanças"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 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:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "Revertendo configurações..."
 
@@ -4614,7 +4761,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:123
 msgid "Route Allowed IPs"
 msgstr "Roteie Andereços IP Autorizados"
 
@@ -4626,7 +4773,7 @@ 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"
 
@@ -4662,7 +4809,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "Execute a verificação do sistema de arquivos"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4679,15 +4826,15 @@ msgstr "SNR"
 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"
 
@@ -4696,9 +4843,9 @@ msgstr "Usuário do SSH"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4707,17 +4854,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
@@ -4734,24 +4883,20 @@ msgstr "Salvar o conteúdo do bloco mtd"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Seção adicionada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Seção removida"
 
@@ -4769,12 +4914,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4782,20 +4933,16 @@ 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: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"
 
@@ -4803,15 +4950,15 @@ msgstr "Tipo do Serviço"
 msgid "Services"
 msgstr "Serviços"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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)."
@@ -4820,17 +4967,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"
 
@@ -4844,7 +4994,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:959
 msgid "Short Preamble"
 msgstr "Preâmbulo curto"
 
@@ -4856,21 +5006,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:1596
 #: 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:1940
+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>)"
@@ -4904,11 +5056,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "VLAN em Software"
@@ -4953,7 +5101,7 @@ msgstr "Especifica o diretório que o dispositivo está conectado"
 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"
@@ -4961,7 +5109,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"
@@ -4969,11 +5117,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:760
+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)."
@@ -4981,7 +5136,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)."
@@ -4989,28 +5144,29 @@ 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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "Iniciando o escaneamento da rede sem fio..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Iniciação"
@@ -5027,11 +5183,12 @@ msgstr "Rotas Estáticas IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -5047,19 +5204,20 @@ 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:976
 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:745
 #: 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"
 
@@ -5072,6 +5230,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5091,43 +5250,45 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -5170,6 +5331,8 @@ 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"
@@ -5192,7 +5355,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"
 
@@ -5200,30 +5363,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!"
@@ -5231,20 +5371,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5262,7 +5401,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5282,6 +5421,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"
@@ -5307,6 +5452,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "As seguintes regras estão atualmente ativas neste sistema."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5317,36 +5466,36 @@ msgid ""
 "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:1794
+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 "
@@ -5363,10 +5512,9 @@ 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:1150
+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!"
@@ -5404,7 +5552,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5413,18 +5561,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Não existem alocações ativas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5436,10 +5576,18 @@ 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/wireless.js:1432
+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 "
@@ -5458,7 +5606,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"
@@ -5466,7 +5614,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."
@@ -5474,7 +5622,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>"
@@ -5490,22 +5638,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 ""
@@ -5523,8 +5671,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5534,7 +5682,7 @@ msgstr "Esta seção ainda não contêm valores"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5542,7 +5690,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Fuso Horário"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5557,7 +5705,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"
 
@@ -5581,55 +5729,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5637,19 +5771,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Portas USB"
 
@@ -5679,10 +5814,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"
@@ -5692,23 +5829,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: 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:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: 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"
@@ -5722,20 +5869,27 @@ msgstr "Desmontar"
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5758,11 +5912,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5772,44 +5942,42 @@ msgstr "Tempo de atividade"
 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"
 
@@ -5821,64 +5989,61 @@ 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"
 
@@ -5900,11 +6065,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:1257
 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:1313
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5912,71 +6077,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"
 
@@ -5984,41 +6146,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -6034,7 +6192,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -6055,7 +6213,7 @@ msgstr "Atenção: Existem mudanças não salvas que serão perdidas ao reinicia
 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:1339
 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 "
@@ -6063,61 +6221,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: 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:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "A rede sem fio está habilitada"
 
@@ -6129,12 +6288,18 @@ msgstr "Escreva as requisições DNS para o servidor de registro (syslog)"
 msgid "Write system log to file"
 msgstr "Escrever registro do sistema (log) no arquivo"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6176,18 +6341,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -6195,11 +6356,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"
 
@@ -6215,22 +6376,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
@@ -6242,22 +6402,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "expirado"
 
@@ -6275,25 +6439,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"
 
@@ -6301,6 +6461,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
@@ -6340,22 +6504,19 @@ 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:1344
 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"
 
@@ -6363,7 +6524,7 @@ msgstr "sem link"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "nenhum"
 
@@ -6373,7 +6534,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6388,10 +6551,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6409,66 +6568,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6485,7 +6644,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"
 
@@ -6566,8 +6725,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 ""
 
@@ -6604,7 +6763,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 ""
 
@@ -6617,11 +6776,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 ""
 
@@ -6637,14 +6796,19 @@ 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/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
@@ -6655,6 +6819,238 @@ msgstr "sim"
 msgid "« Back"
 msgstr "« Voltar"
 
+#~ 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"
 
@@ -6867,9 +7263,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 43357d52b8..7e542b0344 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -13,7 +13,7 @@ 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 ""
 
@@ -21,11 +21,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalizado --"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
@@ -173,12 +174,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:819
 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:352
+#: 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 +189,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,16 +207,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -224,7 +225,7 @@ msgstr "Nome da <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -248,61 +249,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +317,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"
 
@@ -327,12 +332,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Access Point (AP)"
 
@@ -365,35 +370,47 @@ msgstr "Concessões DHCP Ativas"
 msgid "Active DHCPv6 Leases"
 msgstr "Concessões DHCPv6 Ativas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -407,10 +424,15 @@ 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -442,7 +464,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 ""
 
@@ -452,12 +474,12 @@ msgid "Administration"
 msgstr "Administração"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -471,12 +493,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -500,21 +524,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
@@ -541,94 +563,94 @@ msgid ""
 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -640,20 +662,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 +669,11 @@ msgstr "Configuração das Antenas"
 msgid "Any zone"
 msgstr "Qualquer zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -673,8 +681,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 +691,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Estações Associadas"
@@ -698,16 +706,16 @@ 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:1405
 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 ""
 
@@ -729,17 +737,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 +792,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -810,14 +820,6 @@ 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"
@@ -835,11 +837,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -859,16 +861,16 @@ msgid ""
 "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"
@@ -877,55 +879,61 @@ msgstr "Taxa de bits"
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -949,7 +957,7 @@ msgstr "Cadeia"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Alterações"
 
@@ -957,7 +965,7 @@ msgstr "Alterações"
 msgid "Changes applied."
 msgstr "Alterações aplicadas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -970,20 +978,14 @@ 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:1598
 #: 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 +994,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1004,8 +1006,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:1809
 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 +1019,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:833
 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 +1027,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:1022
 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,14 +1049,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1063,12 +1065,12 @@ msgstr "ID de cliente a enviar para pedidos de DHCP"
 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"
@@ -1084,11 +1086,8 @@ msgstr "Fechar lista..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1101,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1121,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1137,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1214,6 +1214,10 @@ msgstr "Critico"
 msgid "Cron Log Level"
 msgstr "Nível de Log do Cron"
 
+#: 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
@@ -1223,7 +1227,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 +1237,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1245,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1301,7 +1306,7 @@ msgstr "DNS"
 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 ""
 
@@ -1313,15 +1318,15 @@ msgstr ""
 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 +1335,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1351,37 +1356,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1392,13 +1400,13 @@ msgstr ""
 "servidores DNS."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1407,18 +1415,30 @@ msgstr "Apagar"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Descrição"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Tema"
@@ -1437,10 +1457,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:81
+#: 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 +1470,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1464,26 +1495,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1522,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1527,34 +1559,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1582,10 +1613,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Não encaminhar lookups reversos para as redes locais"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1594,7 +1633,7 @@ msgstr "Requerer domínio"
 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 ""
 
@@ -1618,11 +1657,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1638,21 +1677,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 +1700,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:1370
 msgid "EAP-Method"
 msgstr "Metodo-EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Editar"
 
@@ -1684,50 +1724,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Editar esta rede"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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"
 
@@ -1735,7 +1776,7 @@ msgstr "Ativar a passagem de Jumbo Frames"
 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 ""
 
@@ -1743,31 +1784,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1816,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1783,48 +1824,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1840,6 +1885,11 @@ msgstr ""
 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
@@ -1853,12 +1903,12 @@ msgstr "Erro"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
@@ -1871,6 +1921,10 @@ msgstr ""
 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 +1933,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,15 +1941,15 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1911,30 +1965,42 @@ msgstr "Porta do Servidor externo de logs de sistema"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Ficheiro"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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"
@@ -1953,6 +2019,7 @@ msgstr "Filtrar endereços privados"
 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 +2030,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 +2042,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:73
 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 +2054,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 ""
 
@@ -2019,31 +2086,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2118,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 +2126,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 +2134,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:808
 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:773
 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:86
 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"
 
@@ -2125,6 +2187,7 @@ msgid "Gateway ports"
 msgstr "Portas de gateway"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2132,11 +2195,10 @@ msgstr "Portas de gateway"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Configuração Geral"
 
@@ -2144,7 +2206,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2152,10 +2214,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2165,7 +2223,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 +2234,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Ir para a configuração da password"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2219,9 +2273,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos"
@@ -2234,6 +2286,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2241,7 +2294,7 @@ msgstr ""
 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,7 +2303,7 @@ 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 ""
 
@@ -2263,28 +2316,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2307,6 +2360,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 +2372,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 +2384,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,16 +2408,16 @@ 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 ""
 
@@ -2369,6 +2426,7 @@ msgstr ""
 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 +2441,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 +2463,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 +2475,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 +2487,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 +2509,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 +2534,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:1462
 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 +2579,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 "
 
@@ -2559,7 +2631,7 @@ msgstr ""
 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"
 
@@ -2581,12 +2653,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"
 
@@ -2598,19 +2670,21 @@ msgstr "Entrada:"
 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 +2692,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
 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:791
 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:953
 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 +2772,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2712,15 +2821,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2737,15 +2846,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Chave #%d"
 
@@ -2753,33 +2862,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"
 
@@ -2800,12 +2910,12 @@ 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:370
-#: 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 ""
 
@@ -2819,24 +2929,24 @@ msgstr "Ficheiro de concessões"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2864,7 +2974,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link Ativo"
 
@@ -2876,7 +2986,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:1361
 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 +2995,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:1365
 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,7 +3004,7 @@ 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 ""
 
@@ -2910,7 +3020,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2942,7 +3052,11 @@ msgstr "A carregar"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2952,20 +3066,20 @@ 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"
 
@@ -2973,7 +3087,7 @@ msgstr "Endereço IPv6 Local"
 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"
 
@@ -3015,10 +3129,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Nível de output do log"
@@ -3043,11 +3153,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"
@@ -3056,31 +3168,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3210,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3109,16 +3221,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3126,7 +3239,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3142,25 +3255,23 @@ msgstr "Número máximo permitido de consultas DNS permitidas"
 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:760
+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
@@ -3179,42 +3290,43 @@ msgstr "Memória"
 msgid "Memory usage (%)"
 msgstr "Uso de memória (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modo"
@@ -3223,31 +3335,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3255,7 +3366,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3318,27 +3429,28 @@ 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:1313
 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 ""
 
@@ -3346,18 +3458,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "Candidatos a servidor NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Nome da nova rede"
 
@@ -3367,7 +3476,8 @@ msgstr "Navegação"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3392,33 +3502,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3427,18 +3555,6 @@ msgstr ""
 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,6 +3562,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Sem password definida!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3454,19 +3574,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"
 
@@ -3486,8 +3606,8 @@ msgstr ""
 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"
 
@@ -3499,22 +3619,26 @@ 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:170
@@ -3533,55 +3657,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3714,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Opção alterada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3750,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3693,7 +3805,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 +3814,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:953
 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 +3866,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Visão Geral"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3900,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,63 +3911,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3859,11 +3977,11 @@ msgstr "Senha"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3874,7 +3992,7 @@ msgstr ""
 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 ""
 
@@ -3882,27 +4000,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3920,7 +4038,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 +4047,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:86
 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 +4063,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3953,7 +4075,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 +4086,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
@@ -3985,15 +4111,15 @@ msgstr "Política"
 msgid "Port"
 msgstr "Porta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -4005,11 +4131,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 ""
 
@@ -4017,16 +4143,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:114
 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"
@@ -4036,12 +4162,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4062,35 +4187,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4102,15 +4221,15 @@ 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"
@@ -4121,28 +4240,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4152,31 +4272,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4194,19 +4318,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?"
 
@@ -4230,7 +4346,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4252,21 +4368,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:98
+#: 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:56
 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"
 
@@ -4274,80 +4384,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4359,7 +4487,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4383,9 +4535,14 @@ msgstr "Ficheiros Resolv e Hosts"
 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"
 
@@ -4393,7 +4550,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 ""
 
@@ -4405,26 +4562,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Revelar/esconder password"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Reverter"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4440,7 +4597,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4452,7 +4609,7 @@ 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 ""
 
@@ -4488,7 +4645,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "Correr uma verificação do sistema de ficheiros"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4505,15 +4662,15 @@ msgstr ""
 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 ""
 
@@ -4522,9 +4679,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4533,17 +4690,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
@@ -4560,24 +4719,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Secção adicionada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Secção removida"
 
@@ -4592,31 +4747,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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"
 
@@ -4624,29 +4781,32 @@ msgstr "Tipo de Serviço"
 msgid "Services"
 msgstr "Serviços"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4658,7 +4818,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4670,21 +4830,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4718,11 +4880,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4764,56 +4922,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4830,11 +4996,12 @@ msgstr "Rotas Estáticas IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4846,19 +5013,20 @@ msgid ""
 "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:976
 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:745
 #: 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"
 
@@ -4871,6 +5039,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Enviar"
 
@@ -4890,41 +5059,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4967,6 +5138,8 @@ 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"
@@ -4989,7 +5162,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 ""
 
@@ -4997,44 +5170,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5050,7 +5205,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5070,6 +5225,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"
@@ -5094,6 +5255,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "As seguintes regras estão actualmente acivas neste sistema."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5104,37 +5269,36 @@ msgid ""
 "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:1794
+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 "
@@ -5150,10 +5314,9 @@ 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:1150
+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!"
@@ -5192,7 +5355,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5201,18 +5364,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Não há concessões ativas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5224,10 +5379,18 @@ 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/wireless.js:1432
+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 "
@@ -5242,13 +5405,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."
@@ -5256,7 +5419,7 @@ 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>"
@@ -5270,20 +5433,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 ""
@@ -5299,8 +5462,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5310,7 +5473,7 @@ msgstr "Esta secção ainda não contêm valores"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5318,7 +5481,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Fuso Horário"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5332,7 +5495,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 ""
 
@@ -5356,55 +5519,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5412,19 +5561,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5454,10 +5604,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 ""
@@ -5467,21 +5619,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: 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"
@@ -5495,18 +5657,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5526,11 +5695,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5540,42 +5725,40 @@ msgstr "Uptime"
 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 ""
 
@@ -5587,64 +5770,61 @@ 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"
 
@@ -5661,81 +5841,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:1257
 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:1313
 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 ""
 
@@ -5743,41 +5920,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5793,7 +5966,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5814,7 +5987,7 @@ msgstr ""
 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:1339
 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,61 +5995,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptador Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "A rede wireless está ativada"
 
@@ -5888,12 +6062,18 @@ msgstr "Escrever os pedidos de DNS para o syslog"
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5935,18 +6115,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5955,11 +6131,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 ""
 
@@ -5975,22 +6151,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
@@ -6002,22 +6177,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "expirou"
 
@@ -6035,25 +6214,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 ""
 
@@ -6061,6 +6236,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
@@ -6100,21 +6279,18 @@ 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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"
 
@@ -6122,7 +6298,7 @@ msgstr "sem link"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "nenhum"
 
@@ -6132,7 +6308,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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,10 +6325,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6168,66 +6342,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6244,7 +6418,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 ""
 
@@ -6325,8 +6499,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 +6537,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 +6550,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 +6570,19 @@ 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/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 +6593,176 @@ msgstr "sim"
 msgid "« Back"
 msgstr "« Voltar"
 
+#~ 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"
 
@@ -6545,9 +6894,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 018932f0e2..e71050917b 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -12,7 +12,7 @@ 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 ""
 
@@ -20,11 +20,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +62,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- particularizat --"
@@ -97,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -109,10 +109,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:1321
 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,35 +122,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -169,11 +170,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:819
 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:352
+#: 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 +184,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,16 +200,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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"
 
@@ -217,7 +218,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Nume"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -239,61 +240,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +308,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"
 
@@ -318,12 +323,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Punct de Acces"
 
@@ -354,35 +359,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -394,10 +411,15 @@ msgstr ""
 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.."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -429,7 +451,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"
 
@@ -439,12 +461,12 @@ msgid "Administration"
 msgstr "Administrare"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +480,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -487,21 +511,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Permite doar cele listate"
 
@@ -527,94 +549,94 @@ msgid ""
 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -626,20 +648,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 +655,11 @@ msgstr "Configurarea Antenei"
 msgid "Any zone"
 msgstr "Orice Zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -659,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 ""
@@ -669,13 +677,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Statiile asociate"
@@ -684,16 +692,16 @@ 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:1405
 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 ""
 
@@ -715,17 +723,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 +778,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -796,14 +806,6 @@ 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"
@@ -821,11 +823,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -842,16 +844,16 @@ msgid ""
 "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"
@@ -860,55 +862,61 @@ msgstr "Bitrate"
 msgid "Bogus NX Domain Override"
 msgstr "Bogus NX Domain Override"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -932,7 +940,7 @@ msgstr "Lant"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Modificari"
 
@@ -940,7 +948,7 @@ msgstr "Modificari"
 msgid "Changes applied."
 msgstr "Modificari aplicate."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -953,20 +961,14 @@ 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:1598
 #: 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 +977,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -987,8 +989,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:1809
 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 +1001,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:833
 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:1022
 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,14 +1027,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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 ""
 
@@ -1041,12 +1043,12 @@ msgstr ""
 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"
@@ -1060,11 +1062,8 @@ msgstr ""
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1077,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1097,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1113,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
@@ -1190,6 +1190,10 @@ msgstr "Critic"
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1199,7 +1203,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 +1213,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1275,7 +1280,7 @@ msgstr "DNS"
 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 ""
 
@@ -1287,15 +1292,15 @@ msgstr ""
 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 +1309,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1325,37 +1330,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1363,13 +1371,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1378,18 +1386,30 @@ msgstr "Sterge"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Descriere"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr ""
@@ -1408,10 +1428,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:81
+#: 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 +1441,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1435,26 +1466,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1493,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1498,34 +1530,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1546,10 +1577,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1558,7 +1597,7 @@ msgstr "Domeniul necesar"
 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 ""
 
@@ -1580,11 +1619,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1598,39 +1637,40 @@ msgid ""
 "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:1370
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Editeaza"
 
@@ -1640,50 +1680,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Editeaza aceasta retea"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1691,7 +1732,7 @@ msgstr ""
 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 ""
 
@@ -1699,31 +1740,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1739,48 +1780,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1796,6 +1841,11 @@ msgstr ""
 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
@@ -1809,12 +1859,12 @@ msgstr "Eroare"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: 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:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch-ul ethernet"
@@ -1827,6 +1877,10 @@ msgstr ""
 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,20 +1889,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1864,30 +1918,42 @@ msgstr "Portul serverului de log-uri extern"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Fisier"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1906,6 +1972,7 @@ msgstr "Filtreaza privatele"
 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 +1983,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 +1995,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:73
 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 +2007,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 ""
 
@@ -1972,32 +2039,32 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2072,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 +2080,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 +2088,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:808
 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:773
 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:86
 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"
 
@@ -2079,6 +2141,7 @@ msgid "Gateway ports"
 msgstr "Porturile gateway"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2086,11 +2149,10 @@ msgstr "Porturile gateway"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Configurare generala"
 
@@ -2098,7 +2160,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2106,10 +2168,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Confirmarea parolei nu se potriveste cu prima, parola neschimbata !"
@@ -2118,7 +2176,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 +2187,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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,9 +2226,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Ascunde <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2185,6 +2237,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2192,7 +2245,7 @@ msgstr ""
 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,7 +2253,7 @@ 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 ""
 
@@ -2213,28 +2266,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2257,6 +2310,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 +2322,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 +2334,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,16 +2358,16 @@ 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 ""
 
@@ -2319,6 +2376,7 @@ msgstr ""
 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 +2391,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 +2413,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 +2425,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 +2437,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 +2459,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 +2484,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:1462
 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 +2529,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 ""
 
@@ -2503,7 +2575,7 @@ msgstr ""
 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 ""
 
@@ -2525,12 +2597,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 ""
 
@@ -2542,19 +2614,21 @@ msgstr "Intrare:"
 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 +2636,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
 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:791
 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:953
 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 +2716,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2655,15 +2764,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2680,15 +2789,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2696,33 +2805,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 ""
 
@@ -2743,12 +2853,12 @@ 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:370
-#: 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 ""
 
@@ -2762,24 +2872,24 @@ msgstr ""
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2807,7 +2917,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
@@ -2817,7 +2927,7 @@ msgid ""
 "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:1361
 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 +2936,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:1365
 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,7 +2945,7 @@ 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 ""
 
@@ -2851,7 +2961,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2882,7 +2992,11 @@ msgstr "Incarcare"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2892,20 +3006,20 @@ 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"
 
@@ -2913,7 +3027,7 @@ msgstr "Adresa IPv6 locala"
 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 ""
 
@@ -2950,10 +3064,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2978,11 +3088,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"
@@ -2991,31 +3103,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3145,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3044,16 +3156,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3061,7 +3174,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3077,25 +3190,23 @@ msgstr "Numarul maxim de intrebari DNS simultane"
 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:760
+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
@@ -3114,42 +3225,43 @@ msgstr "Memorie"
 msgid "Memory usage (%)"
 msgstr "Utilizarea memoriei (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mod"
@@ -3158,31 +3270,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr ""
 
@@ -3190,7 +3301,7 @@ msgstr ""
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3251,27 +3362,28 @@ 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:1313
 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 ""
 
@@ -3279,18 +3391,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Numele interfetei noi"
 
@@ -3300,7 +3409,8 @@ msgstr "Navigare"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3325,33 +3435,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3360,18 +3488,6 @@ msgstr ""
 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,6 +3495,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nici o parola setata !"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3387,19 +3507,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"
 
@@ -3419,8 +3539,8 @@ msgstr ""
 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 ""
 
@@ -3432,22 +3552,26 @@ 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:170
@@ -3466,49 +3590,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3647,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Optiunea schimbata"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3683,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3620,7 +3738,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 +3747,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:953
 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 +3799,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Prezentare generala"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3833,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,63 +3844,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3786,11 +3910,11 @@ msgstr "Parola"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3801,7 +3925,7 @@ msgstr ""
 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 ""
 
@@ -3809,27 +3933,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3847,7 +3971,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 +3980,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:86
 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 +3996,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3880,7 +4008,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 +4019,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
@@ -3912,15 +4044,15 @@ msgstr ""
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3932,11 +4064,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 ""
 
@@ -3944,16 +4076,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:114
 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"
@@ -3963,12 +4095,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -3989,35 +4120,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4029,15 +4154,15 @@ 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"
@@ -4048,28 +4173,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4079,31 +4205,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4121,17 +4251,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 ""
 
@@ -4155,7 +4279,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4177,21 +4301,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:98
+#: 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:56
 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"
 
@@ -4199,80 +4317,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4284,7 +4420,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4308,9 +4468,14 @@ msgstr "Fisierele de rezolvare si hosturi DNS"
 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"
 
@@ -4318,7 +4483,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 ""
 
@@ -4330,26 +4495,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Arata / ascunde parola"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4365,7 +4530,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4377,7 +4542,7 @@ 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 ""
 
@@ -4410,7 +4575,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4427,15 +4592,15 @@ msgstr ""
 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 ""
 
@@ -4444,9 +4609,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4455,17 +4620,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Salveaza"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salveaza si aplica"
@@ -4482,24 +4649,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Operatiuni programate"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Sectiune adaugata"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Sectiune eliminata"
 
@@ -4514,31 +4677,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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"
 
@@ -4546,29 +4711,32 @@ msgstr "Tip de serviciu"
 msgid "Services"
 msgstr "Servicii"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4580,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4592,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 "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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4640,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4686,56 +4852,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Pornire"
@@ -4752,11 +4926,12 @@ msgstr "Rute statice IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4768,19 +4943,20 @@ msgid ""
 "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:976
 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:745
 #: 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"
 
@@ -4793,6 +4969,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Trimite"
 
@@ -4812,41 +4989,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4889,6 +5068,8 @@ 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"
@@ -4911,7 +5092,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 ""
 
@@ -4919,40 +5100,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4966,7 +5131,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -4984,6 +5149,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"
@@ -5002,6 +5173,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5012,33 +5187,35 @@ msgid ""
 "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:1794
+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 "
@@ -5048,9 +5225,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5081,7 +5257,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5090,16 +5266,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5111,10 +5281,18 @@ 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/wireless.js:1432
+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 "
@@ -5129,19 +5307,19 @@ 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>"
@@ -5153,20 +5331,20 @@ msgid ""
 "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 ""
@@ -5181,8 +5359,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5192,7 +5370,7 @@ msgstr ""
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5200,7 +5378,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Fusul orar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5211,7 +5389,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 ""
 
@@ -5235,55 +5413,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5291,19 +5455,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5333,10 +5498,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 ""
@@ -5346,21 +5513,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Neadministrate"
@@ -5374,18 +5551,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5405,11 +5589,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5419,42 +5619,40 @@ msgstr "Uptime"
 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 ""
 
@@ -5466,64 +5664,61 @@ 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 ""
 
@@ -5540,81 +5735,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:1257
 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:1313
 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)"
-msgstr ""
-
 #: 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 ""
 
@@ -5622,41 +5814,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5672,7 +5860,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5693,7 +5881,7 @@ msgstr ""
 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:1339
 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 "
@@ -5701,61 +5889,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptorul wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Reteaua wireless este activata"
 
@@ -5767,12 +5956,18 @@ msgstr "Scrie cererile DNS primite in syslog"
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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,18 +6002,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5826,11 +6017,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 ""
 
@@ -5846,22 +6037,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
@@ -5873,22 +6063,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "expirat"
 
@@ -5904,25 +6098,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 ""
 
@@ -5930,6 +6120,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
@@ -5968,21 +6162,18 @@ msgstr ""
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 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:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "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 ""
 
@@ -5990,7 +6181,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr ""
 
@@ -6000,7 +6191,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6015,10 +6208,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6036,66 +6225,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6112,7 +6301,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"
 
@@ -6193,8 +6382,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 ""
 
@@ -6231,7 +6420,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 ""
 
@@ -6244,11 +6433,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 ""
 
@@ -6264,14 +6453,19 @@ 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/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
@@ -6282,6 +6476,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"
 
@@ -6367,9 +6645,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 b6c199cba0..294e7df1a5 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,7 +15,7 @@ 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 дБ"
 
@@ -23,11 +23,11 @@ msgstr "%.1f дБ"
 msgid "%d Bit"
 msgstr "%d бит"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +65,19 @@ msgid "-- Additional Field --"
 msgstr "-- Дополнительно --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- пользователь�кий --"
@@ -100,7 +100,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 "0 = не и�пользовать порог RSSI, 1 = не измен�ть значение по умолчанию "
@@ -114,10 +114,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:1321
 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,35 +127,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "802.11r Бы�трый Роуминг"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 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:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w Management Frame Protection"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr "802.11w мак�имальное врем� ожидани�"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Идентификатор �абора Базовых Серви�ов\">BSSID</abbr>"
 
@@ -174,11 +175,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:819
 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:352
+#: 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 +189,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,16 +205,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -222,7 +223,7 @@ msgstr "Им� <abbr title=\"Светодиод\">LED</abbr>"
 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:373
+#: 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>"
 
@@ -247,7 +248,7 @@ 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 +256,59 @@ msgstr ""
 "<br />Внимание: вы должны вручную перезапу�тить �лужбу cron, е�ли �тот файл "
 "был пу�тым перед вне�ением ваших изменений."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +318,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 номер у�трой�тва"
 
@@ -328,12 +333,12 @@ msgstr "ATU-C идентификатор производител�"
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Точка до�тупа"
 
@@ -366,35 +371,47 @@ msgstr "�ктивные DHCP аренды"
 msgid "Active DHCPv6 Leases"
 msgstr "�ктивные DHCPv6 аренды"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -407,10 +424,15 @@ 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 "Добавить новый интерфей�..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr "Добавить узел (peer)"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Дополнительный hosts файл"
@@ -442,7 +464,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 "�дре� дл� до�тупа к локальному мо�ту-ретран�л�тору"
 
@@ -452,12 +474,12 @@ msgid "Administration"
 msgstr "Управление"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -471,12 +493,14 @@ msgstr "Aggregate Transmit Power (ACTATP)"
 msgid "Alert"
 msgstr "Тревога"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\""
@@ -502,23 +526,21 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Разрешить только перечи�ленные"
 
@@ -548,15 +570,15 @@ 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:119
 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:781
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -564,82 +586,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:1480
 msgid "Anonymous Identity"
 msgstr "�нонимна� идентификаци�"
 
@@ -651,20 +673,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 +680,11 @@ msgstr "�а�тройка антенн"
 msgid "Any zone"
 msgstr "Люба� зона"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Ошибка <code>%h</code> запро�а на применение"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr "Применить без проверки"
 
@@ -684,8 +692,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 +703,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Подключенные клиенты"
@@ -712,16 +720,16 @@ 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:1405
 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 "Тип аутентификации"
 
@@ -743,17 +751,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 +812,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -830,14 +840,6 @@ 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 "Резервное копирование"
@@ -855,11 +857,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:784
 msgid "Beacon Interval"
 msgstr "Интервал ра��ылки пакетов Beacon"
 
@@ -881,16 +883,16 @@ 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 "Скоро�ть"
@@ -899,56 +901,62 @@ msgstr "Скоро�ть"
 msgid "Bogus NX Domain Override"
 msgstr "Переопределение поддельного NX-домена"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 "Категори�"
 
@@ -972,7 +980,7 @@ msgstr "Цепочка"
 msgid "Change login password"
 msgstr "Изменить пароль"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Изменени�"
 
@@ -980,7 +988,7 @@ msgstr "Изменени�"
 msgid "Changes applied."
 msgstr "Изменени� прин�ты."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "Изменени� были возвращены назад."
 
@@ -993,22 +1001,14 @@ 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:1598
 #: 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 +1017,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 "Проверьте �ту опцию, чтобы удалить �уще�твующие �ети бе�проводного "
@@ -1031,8 +1031,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:1809
 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 +1044,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:833
 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 +1053,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:1022
 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,14 +1077,14 @@ msgstr ""
 "�ажмите \"Сохранить MTD раздел\" дл� �качивани� образа указанного MTD "
 "раздела (В�ИМ��ИЕ: Д���ЫЙ ФУ�КЦИО��Л ТОЛЬКО ДЛЯ ОПЫТ�ЫХ ПОЛЬЗОВ�ТЕЛЕЙ)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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-запро�е"
 
@@ -1093,12 +1093,12 @@ msgstr "ID клиента при DHCP-запро�е"
 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"
@@ -1114,11 +1114,8 @@ msgstr "Закрыть �пи�ок..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1129,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1153,14 @@ msgstr ""
 "Может вызвать проблемы �овме�тимо�ти и �нижение надежно�ти �огла�овани� "
 "нового ключа, при наличии большого трафика."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 +1169,52 @@ msgstr "Ошибка конфигурации"
 msgid "Configuration files will be kept"
 msgstr "Конфигурационные файлы будут �охранены"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "Конфигураци� применена"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "Конфигураци� возвращена назад!"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Подтверждение отключени�"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1212,37 +1224,23 @@ 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:763
 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:1809
 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:173
 msgid "Critical"
 msgstr "Критиче�ка� �итуаци�"
@@ -1251,6 +1249,10 @@ msgstr "Критиче�ка� �итуаци�"
 msgid "Cron Log Level"
 msgstr "Запи�ь �обытий cron"
 
+#: 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
@@ -1260,7 +1262,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 +1274,7 @@ msgstr ""
 "Пользователь�кие файлы (�ертификаты, �крипты) могут о�тать�� в �и�теме. "
 "Чтобы �того не произошло, выполните �начала �бро� к завод�ким на�тройкам."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1282,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 �ерви�"
 
@@ -1340,7 +1343,7 @@ msgstr "DNS"
 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"
 
@@ -1352,15 +1355,15 @@ msgstr "DNSSEC"
 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 +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:962
 msgid "DTIM Interval"
 msgstr "Интервал DTIM"
 
@@ -1390,37 +1393,40 @@ msgstr "Скоро�ть передачи данных"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1431,13 +1437,13 @@ msgstr ""
 "�ерверах."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "Удалить"
 
@@ -1446,18 +1452,30 @@ msgstr "Удалить"
 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:1649
+msgid "Delete permission denied"
+msgstr "�ет разрешений на удаление"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr "Ошибка запро�а на удаление: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Опи�ание"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr "Отменить выбор"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Тема оформлени�"
@@ -1476,10 +1494,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:81
+#: 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 +1507,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "У�трой�тво недо�тупно!"
 
@@ -1503,26 +1532,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1559,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "�е а��оциировать при низком подтверждении"
 
@@ -1566,34 +1596,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1620,10 +1649,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr "�е перенаправл�ть обратные DNS-запро�ы дл� локальных �етей"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "Вы дей�твительно хотите удалить «%s»?"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr "Вы дей�твительно хотите удалить �ледующий SSH ключ?"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 "Требует�� домен"
@@ -1632,7 +1669,7 @@ msgstr "Требует�� домен"
 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 "�е фрагментировать"
 
@@ -1656,11 +1693,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr "Перетащите, чтобы изменить пор�док"
 
@@ -1676,20 +1713,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 +1735,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:1370
 msgid "EAP-Method"
 msgstr "Метод EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Изменить"
 
@@ -1723,24 +1761,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:717
 msgid "Edit this network"
 msgstr "Редактировать �ту �еть"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,27 +1786,28 @@ 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-кадры"
 
@@ -1776,7 +1815,7 @@ msgstr "Пропу�кать Jumbo-кадры"
 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"
 
@@ -1784,31 +1823,31 @@ msgstr "Включить Single DES"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Включить WPS при нажатии на кнопку, в режиме WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1855,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:712
 msgid "Enable this network"
 msgstr "Включить данную �еть"
 
@@ -1824,21 +1863,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1846,28 +1885,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "Порт конечного узла"
 
@@ -1883,6 +1926,11 @@ msgstr "Введите пользователь�кие значени�"
 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
@@ -1896,12 +1944,12 @@ msgstr "Ошибка"
 msgid "Errored seconds (ES)"
 msgstr "Ошибочные �екунды (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet-адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet-коммутатор"
@@ -1914,6 +1962,10 @@ msgstr "И�ключите интерфей�ы"
 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,22 +1974,22 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr "Внешний R0 Key Holder List"
 
@@ -1953,31 +2005,43 @@ msgstr "Порт внешнего �ервера �и�темного журна
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr "FT протокол"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Файл"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr "Файл не до�тупен"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 "Им� загрузочного образа, извещаемого клиентам"
@@ -1996,6 +2060,7 @@ msgstr "Фильтровать ча�тные"
 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 +2074,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 +2086,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:73
 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 +2098,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 "Файл прошивки"
 
@@ -2065,31 +2130,31 @@ msgstr "Операции � прошивкой"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2162,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 +2170,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 +2178,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:808
 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:773
 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:86
 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,6 +2233,7 @@ msgid "Gateway ports"
 msgstr "Порты шлюза"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2180,11 +2241,10 @@ msgstr "Порты шлюза"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "О�новные на�тройки"
 
@@ -2192,7 +2252,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:1339
 msgid "Generate PMK locally"
 msgstr "Создать PMK локально"
 
@@ -2200,10 +2260,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Введённые пароли не �овпадают, пароль не изменён!"
@@ -2212,7 +2268,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 +2279,29 @@ msgstr "О�новные на�тройки �ети"
 msgid "Go to password configuration..."
 msgstr "Перейти к на�тройке парол�..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 "Перезапу�тить"
@@ -2266,9 +2318,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Скрыть <abbr title=\"Ра�ширенный идентификатор �ети\">ESSID</abbr>"
 
@@ -2279,6 +2329,7 @@ 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:1939
 msgid "Host"
 msgstr "Хо�т"
 
@@ -2286,7 +2337,7 @@ msgstr "Хо�т"
 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,7 +2345,7 @@ 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 тега"
 
@@ -2307,28 +2358,28 @@ msgstr "Содержимое Host-Uniq тега"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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-протокол"
 
@@ -2351,6 +2402,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 +2414,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 +2426,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,16 +2450,16 @@ 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 ""
 
@@ -2413,6 +2468,7 @@ msgstr ""
 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 +2483,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 +2505,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 +2517,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 +2529,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 +2551,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 +2576,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:1462
 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 +2625,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 �ерверов игнорируют��"
 
@@ -2607,7 +2677,7 @@ msgstr ""
 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 "Игнорировать интерфей�"
 
@@ -2632,12 +2702,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 "Промежуток времени бездей�тви�"
 
@@ -2649,19 +2719,21 @@ msgstr "Вход�щий:"
 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 +2741,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
 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:791
 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:953
 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 +2821,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Изолировать клиентов"
 
@@ -2763,15 +2870,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Подключение к �ети: %q"
 
@@ -2788,15 +2895,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Ключ №%d"
 
@@ -2804,33 +2911,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"
 
@@ -2851,12 +2959,12 @@ 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:370
-#: 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 "Врем� аренды адре�а"
 
@@ -2870,30 +2978,30 @@ msgstr "Файл аренд"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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: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:300
 msgid "Limit listening to these interfaces, and loopback."
@@ -2915,7 +3023,7 @@ msgstr "Со�то�ние Линии"
 msgid "Line Uptime"
 msgstr "Врем� бе�перебойной работы линии"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Подключение"
 
@@ -2927,7 +3035,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:1361
 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 +3049,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:1365
 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,7 +3063,7 @@ 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 дл� авторизации"
 
@@ -2971,7 +3079,7 @@ msgstr "Спи�ок хо�тов, по�тавл�ющих поддельные
 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:51
 msgid "Listen Port"
 msgstr "Порт дл� вход�щих �оединений"
 
@@ -3004,7 +3112,11 @@ msgstr "Загрузка"
 msgid "Loading SSH keys…"
 msgstr "Загрузка SSH ключей..."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr "Загрузка �одержимого директории..."
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "Загрузка �траницы..."
@@ -3014,20 +3126,20 @@ 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-адре�"
 
@@ -3035,7 +3147,7 @@ msgstr "Локальный IPv6-адре�"
 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 "Запу�к пакетов и �лужб пользовател�, при включении у�трой�тва"
 
@@ -3079,10 +3191,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Запи�ь �обытий"
@@ -3107,11 +3215,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"
@@ -3120,31 +3230,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3272,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3175,16 +3285,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr "Ма�тер"
 
@@ -3192,7 +3303,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr "Мак�имально разрешенное значение интервала про�лушивани� клиента"
 
@@ -3208,27 +3319,23 @@ msgstr "МакÑ�имально допуÑ�тимое количеÑ�тво однÐ
 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:760
+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
@@ -3247,42 +3354,43 @@ msgstr "Оперативна� пам�ть (RAM)"
 msgid "Memory usage (%)"
 msgstr "И�пользование пам�ти (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Режим"
@@ -3291,31 +3399,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Монитор"
 
@@ -3323,7 +3430,7 @@ msgstr "Монитор"
 msgid "More Characters"
 msgstr "Слишком мало �имволов"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr "Больше..."
 
@@ -3360,7 +3467,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 +3479,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,27 +3493,28 @@ 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:1313
 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 домен"
 
@@ -3414,18 +3522,15 @@ msgstr "NT домен"
 msgid "NTP server candidates"
 msgstr "Спи�ок NTP-�ерверов"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Им� новой �ети"
 
@@ -3435,7 +3540,8 @@ msgstr "�авигаци�"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3460,33 +3566,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 "От�ут�твует �оответ�твующа� делегаци� префик�а"
@@ -3495,18 +3619,6 @@ msgstr "От�ут�твует �оответ�твующа� делегаци�
 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,6 +3626,10 @@ msgstr "�ет �етей в радиу�е дей�тви�"
 msgid "No password set!"
 msgstr "Пароль не у�тановлен!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr "Узлы ещё не определены"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "�ет публичных ключей"
@@ -3522,19 +3638,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 "Шум"
 
@@ -3554,8 +3670,8 @@ msgstr "Non Pre-emtive CRC errors (CRC_P)"
 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 "�ичего"
 
@@ -3567,23 +3683,27 @@ 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:170
 msgid "Notice"
@@ -3603,55 +3723,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3780,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:756
 msgid "Operating frequency"
 msgstr "�а�тройка ча�тоты"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Опци� изменена"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3702,7 +3810,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 +3822,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:114
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3722,31 +3830,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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3755,7 +3863,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 "�еоб�зательно. Udp-порт, и�пользуемый дл� и�ход�щих и вход�щих пакетов."
@@ -3777,7 +3885,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 +3894,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:953
 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 +3940,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 +3948,33 @@ msgstr "Ð�азначить таблицу внутренних маршрутоÐ
 msgid "Overview"
 msgstr "Обзор"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3982,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,63 +3993,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "Пароль"
 
@@ -3945,11 +4059,11 @@ msgstr "Пароль"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Пароль к внутреннему Приватному ключу"
 
@@ -3960,7 +4074,7 @@ msgstr "Пароль к внутреннему Приватному ключу"
 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"
 
@@ -3968,27 +4082,27 @@ msgstr "Пароль2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Путь к внутреннему Приватному ключу"
 
@@ -4006,7 +4120,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 +4129,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:86
 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 +4145,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:133
 msgid "Persistent Keep Alive"
 msgstr "По�то�нно держать включенным"
 
@@ -4039,7 +4157,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 +4168,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
@@ -4071,15 +4193,15 @@ msgstr "Политика"
 msgid "Port"
 msgstr "Порт"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
-msgstr ""
+msgstr "Порт %s"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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"
 
@@ -4091,11 +4213,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"
 
@@ -4103,16 +4225,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:114
 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"
@@ -4124,12 +4246,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Приватный ключ"
 
@@ -4150,35 +4271,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Публичный ключ"
 
@@ -4194,17 +4309,17 @@ 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 "Каче�тво"
@@ -4217,28 +4332,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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4248,31 +4364,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr "Скоро�ть получени� / Скоро�ть отправки"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 "Строка в ше�тнадцатеричном коде. О�тавьте пу�той, е�ли ваш провайдер не "
@@ -4295,20 +4415,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 "Вы дей�твительно хотите изменить протокол?"
 
@@ -4332,9 +4443,9 @@ 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:1327
 msgid "Reassociation Deadline"
-msgstr "Срок Реа��оциации"
+msgstr "Срок реа��оциации"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
@@ -4355,21 +4466,15 @@ msgid "Reboots the operating system of your device"
 msgstr ""
 "Программна� перезагрузка вашего у�трой�тва, т.е. выполнить команду 'reboot'"
 
-#: 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: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:56
 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 "Переподключить �тот интерфей�"
 
@@ -4377,74 +4482,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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 +4556,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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr "Требует�� hostapd"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr "Требует�� hostapd � поддержкой EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr "Требует�� hostapd � поддержкой OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr "Требует�� hostapd � поддержкой SAE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4466,10 +4589,34 @@ 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:1316
+"Требует�� поддержка внешней �етью DNSSEC; убедите�ь, что ответы не "
+"подпи�анного домена дей�твительно по�тупают от не подпи�анных доменов"
+
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr "Требует�� wpa-supplicant"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "Требует�� wpa-supplicant � поддержкой EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "Требует�� wpa-supplicant � поддержкой OWE"
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Требует�� wpa-supplicant � поддержкой SAE"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4493,9 +4640,14 @@ msgstr "Файлы resolv и hosts"
 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 "Перезапу�тить"
 
@@ -4503,7 +4655,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 "Перезапу�тить радио-интерфей�"
 
@@ -4515,26 +4667,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Показать/�крыть пароль"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Вернуть"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "Вернуть изменени�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Ошибка <code>%h</code> отмены конфигурации"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "Отмена конфигурации..."
 
@@ -4550,7 +4702,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:123
 msgid "Route Allowed IPs"
 msgstr "Маршрутизировать разрешенные IP-адре�а"
 
@@ -4562,7 +4714,7 @@ 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 "До�тупные режимы работы"
 
@@ -4597,7 +4749,7 @@ msgstr "Провер�ть файловую �и�тему перед монти
 msgid "Run filesystem check"
 msgstr "Проверить"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Ошибка и�полнени�"
 
@@ -4614,15 +4766,15 @@ msgstr "SNR"
 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 логин"
 
@@ -4631,9 +4783,9 @@ msgstr "SSH логин"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4642,17 +4794,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "Разделы подкачки (swap)"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Сохранить и применить"
@@ -4669,24 +4823,20 @@ msgstr "Сохранить �одержимое MTD раздела"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Запланированные задани�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Строки добавлены"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Строки удалены"
 
@@ -4704,12 +4854,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4717,20 +4873,16 @@ 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: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 "Тип �лужбы"
 
@@ -4738,30 +4890,33 @@ msgstr "Тип �лужбы"
 msgid "Services"
 msgstr "Серви�ы"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4773,7 +4928,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:959
 msgid "Short Preamble"
 msgstr "Коротка� преамбула"
 
@@ -4785,21 +4940,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr "Сигнал / шум"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Затухание �игнала (SATN)"
@@ -4833,11 +4990,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Программное обе�печение VLAN"
@@ -4882,7 +5035,7 @@ msgstr "Папка, к которой монтирует�� раздел у�т
 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"
@@ -4890,18 +5043,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:760
+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)."
@@ -4909,7 +5073,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)."
@@ -4917,28 +5081,29 @@ 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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "�ачато �канирование бе�проводных �етей..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Загрузка"
@@ -4955,11 +5120,12 @@ msgstr "Статиче�кие маршруты IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Статиче�кий адре�"
@@ -4974,19 +5140,20 @@ 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:976
 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:745
 #: 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 "О�тановить"
 
@@ -4999,6 +5166,7 @@ msgid "Strong"
 msgstr "Сильна�"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Применить"
 
@@ -5018,43 +5186,45 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr "Символиче�ка� ��ылка"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr "Синхронизировать � NTP-�ервером"
@@ -5097,6 +5267,8 @@ 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"
@@ -5119,7 +5291,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 "Сеть назначени�"
 
@@ -5127,29 +5299,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!"
@@ -5157,20 +5307,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5186,7 +5335,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5212,6 +5361,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"
@@ -5235,6 +5392,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "�а данном у�трой�тве активны �ледующие правила."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "Указанный публичный SSH ключ уже добавлен."
@@ -5246,36 +5407,36 @@ msgid ""
 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:1794
+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 "
@@ -5292,10 +5453,9 @@ 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:1150
+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!"
@@ -5331,7 +5491,7 @@ msgstr ""
 "Загруженный файл прошивки не поддерживает��. Проверьте, что вы загрузили "
 "подход�щую прошивку дл� чипа вашего у�трой�тва."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "�ет активных арендованных адре�ов"
 
@@ -5340,18 +5500,10 @@ msgstr "�ет активных арендованных адре�ов"
 msgid "There are no active leases."
 msgstr "�ет активных арендованных адре�ов."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5363,10 +5515,18 @@ 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/wireless.js:1432
+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 "
@@ -5388,7 +5548,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"
@@ -5396,7 +5556,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."
@@ -5404,7 +5564,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>"
@@ -5420,23 +5580,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 "Это адре� ближайшей точки при�ут�тви� туннельного брокера"
@@ -5452,8 +5612,8 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Страница �одержит �пи�ок в�ех активных на данный момент �етевых �оединений."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5463,7 +5623,7 @@ msgstr "Зде�ь не �одержат�� необходимые значен
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr "Интервал регенерации ключей GTK"
 
@@ -5471,7 +5631,7 @@ msgstr "Интервал регенерации ключей GTK"
 msgid "Timezone"
 msgstr "Ча�овой по��"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "�утентификаци�..."
 
@@ -5486,7 +5646,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 "Тон"
 
@@ -5510,55 +5670,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "Тип"
 
@@ -5566,19 +5712,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB порты"
 
@@ -5608,10 +5755,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 им� хо�та"
@@ -5621,21 +5770,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "�еизве�тна� ошибка (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "�еизве�тный код ошибки"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "�еуправл�емый"
@@ -5649,21 +5808,28 @@ msgstr "Отмонтировать"
 msgid "Unnamed key"
 msgstr "Ключ без имени"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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"
@@ -5684,11 +5850,30 @@ 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:1698
+msgid "Upload file"
+msgstr "Загрузка файла"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr "Загрузка файла..."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5698,42 +5883,40 @@ msgstr "Врем� работы"
 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 на интерфей�е туннел�"
 
@@ -5745,64 +5928,61 @@ 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 "И�пользовать таблицу маршрутизации"
 
@@ -5825,11 +6005,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:1257
 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:1313
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5837,71 +6017,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-запро�ах"
@@ -5910,41 +6087,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5960,7 +6133,7 @@ msgstr "Ожидание применени� изменений..."
 msgid "Waiting for command to complete..."
 msgstr "Ожидание завершени� выполнени� команды..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Ожидание применени� конфигурации... %d �ек"
 
@@ -5983,7 +6156,7 @@ msgstr ""
 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:1339
 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 "
@@ -5994,61 +6167,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Бе�проводной адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Бе�проводна� �еть включена"
 
@@ -6060,12 +6234,20 @@ msgstr "Запи�ывать полученные DNS-запро�ы в �и�т
 msgid "Write system log to file"
 msgstr "Запи�ывать �и�темные �обыти� в файл"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6106,18 +6288,14 @@ msgstr "Размер ZRam"
 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:1029
+#: 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 "авто"
 
@@ -6125,11 +6303,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 "�оед. мо�том"
 
@@ -6145,22 +6323,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
@@ -6172,22 +6349,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "и�текло"
 
@@ -6205,25 +6386,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 "гибридный режим"
 
@@ -6231,6 +6408,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
@@ -6269,21 +6450,18 @@ msgstr "ключ длиной 5 или 13 �имволов"
 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:1344
 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 "нет �оединени�"
 
@@ -6291,7 +6469,7 @@ msgstr "нет �оединени�"
 msgid "non-empty value"
 msgstr "не пу�тое значение"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "нет"
 
@@ -6301,7 +6479,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6316,10 +6496,6 @@ msgstr "выключено"
 msgid "on"
 msgstr "включено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "открыть"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6337,66 +6513,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6413,7 +6589,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 "без тега"
 
@@ -6494,8 +6670,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 "верна� дата (ГГГГ-ММ-ДД)"
 
@@ -6532,7 +6708,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 \".\")"
 
@@ -6545,11 +6721,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 �имволов"
 
@@ -6565,14 +6741,19 @@ 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/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
@@ -6582,3 +6763,9 @@ msgstr "да"
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:20
 msgid "« Back"
 msgstr "« �азад"
+
+#~ 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 be9a5e9138..3f1237d796 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -9,7 +9,7 @@ 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 ""
 
@@ -17,11 +17,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +59,19 @@ msgid "-- Additional Field --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr ""
@@ -94,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -106,10 +106,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:1321
 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,35 +119,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
@@ -164,11 +165,11 @@ msgid ""
 "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:819
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:352
+#: 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 +179,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,16 +194,16 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:62
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
@@ -211,7 +212,7 @@ msgstr ""
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -231,69 +232,73 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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,12 +312,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr ""
 
@@ -343,35 +348,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -383,10 +400,15 @@ msgstr ""
 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 ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
@@ -418,7 +440,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 ""
 
@@ -428,12 +450,12 @@ msgid "Administration"
 msgstr ""
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -447,12 +469,14 @@ msgstr ""
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -475,21 +499,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr ""
 
@@ -514,94 +536,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -613,20 +635,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 +642,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -646,8 +654,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 +664,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr ""
@@ -671,16 +679,16 @@ 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:1405
 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 ""
 
@@ -702,17 +710,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 +765,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -783,14 +793,6 @@ 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 ""
@@ -808,11 +810,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -829,16 +831,16 @@ msgid ""
 "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 ""
@@ -847,55 +849,61 @@ msgstr ""
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -919,7 +927,7 @@ msgstr ""
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr ""
 
@@ -927,7 +935,7 @@ msgstr ""
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -940,20 +948,14 @@ 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:1598
 #: 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 +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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -974,8 +976,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:1809
 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 +985,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:833
 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:1022
 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,14 +1011,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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 ""
 
@@ -1025,12 +1027,12 @@ msgstr ""
 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"
@@ -1044,11 +1046,8 @@ msgstr ""
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1061,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1081,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1097,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 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/luasrc/view/admin_system/password.htm:43
+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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
@@ -1174,6 +1174,10 @@ msgstr ""
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1183,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 ""
 
@@ -1193,52 +1197,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1259,7 +1264,7 @@ msgstr ""
 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 ""
 
@@ -1271,15 +1276,15 @@ msgstr ""
 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 +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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1309,37 +1314,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1347,13 +1355,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 ""
 
@@ -1362,18 +1370,30 @@ msgstr ""
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr ""
@@ -1392,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:81
+#: 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 +1425,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1419,58 +1450,59 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1480,34 +1512,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1528,10 +1559,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 ""
@@ -1540,7 +1579,7 @@ msgstr ""
 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 ""
 
@@ -1562,11 +1601,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1580,39 +1619,40 @@ msgid ""
 "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:1370
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr ""
 
@@ -1622,50 +1662,51 @@ 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:717
+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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1673,7 +1714,7 @@ msgstr ""
 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 ""
 
@@ -1681,31 +1722,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1754,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1721,48 +1762,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1778,6 +1823,11 @@ msgstr ""
 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
@@ -1791,12 +1841,12 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
@@ -1809,6 +1859,10 @@ msgstr ""
 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,20 +1871,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1846,30 +1900,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1888,6 +1954,7 @@ msgstr ""
 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 +1965,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 +1977,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:73
 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 +1989,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 ""
 
@@ -1954,31 +2021,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2053,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 +2061,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 +2069,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:808
 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:773
 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:86
 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 ""
 
@@ -2060,6 +2122,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2067,11 +2130,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2079,7 +2141,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2087,10 +2149,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2099,7 +2157,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 +2168,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 ""
@@ -2151,9 +2205,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2164,6 +2216,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2171,7 +2224,7 @@ msgstr ""
 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,7 +2232,7 @@ 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 ""
 
@@ -2192,28 +2245,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2236,6 +2289,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 +2301,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 +2313,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,16 +2337,16 @@ 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 ""
 
@@ -2298,6 +2355,7 @@ msgstr ""
 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 +2370,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 +2392,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 +2404,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 +2416,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 +2438,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 +2463,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:1462
 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 +2508,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 ""
 
@@ -2482,7 +2554,7 @@ msgstr ""
 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 ""
 
@@ -2504,12 +2576,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 ""
 
@@ -2521,19 +2593,21 @@ msgstr ""
 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 +2615,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
 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:791
 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:953
 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 +2695,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2631,15 +2740,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2656,15 +2765,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2672,33 +2781,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 ""
 
@@ -2719,12 +2829,12 @@ 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:370
-#: 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 ""
 
@@ -2738,24 +2848,24 @@ msgstr ""
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 ""
 
@@ -2783,7 +2893,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
@@ -2793,7 +2903,7 @@ msgid ""
 "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:1361
 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 +2912,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:1365
 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,7 +2921,7 @@ 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 ""
 
@@ -2827,7 +2937,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2858,7 +2968,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2868,20 +2982,20 @@ 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 ""
 
@@ -2889,7 +3003,7 @@ msgstr ""
 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 ""
 
@@ -2926,10 +3040,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2954,11 +3064,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"
@@ -2967,31 +3079,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3121,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3020,16 +3132,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3037,7 +3150,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3053,25 +3166,23 @@ msgstr ""
 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:760
+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
@@ -3090,42 +3201,43 @@ msgstr ""
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3134,31 +3246,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr ""
 
@@ -3166,7 +3277,7 @@ msgstr ""
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3227,27 +3338,28 @@ 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:1313
 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 ""
 
@@ -3255,18 +3367,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr ""
 
@@ -3276,7 +3385,8 @@ msgstr ""
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3301,33 +3411,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3336,18 +3464,6 @@ msgstr ""
 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,6 +3471,10 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3363,19 +3483,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 ""
 
@@ -3395,8 +3515,8 @@ msgstr ""
 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 ""
 
@@ -3408,22 +3528,26 @@ 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:170
@@ -3442,49 +3566,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3623,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3659,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3596,7 +3714,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 +3723,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:953
 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 +3775,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3809,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,63 +3820,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 ""
 
@@ -3762,11 +3886,11 @@ msgstr ""
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3777,7 +3901,7 @@ msgstr ""
 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 ""
 
@@ -3785,27 +3909,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3823,7 +3947,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 +3956,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:86
 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 +3972,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3856,7 +3984,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 +3995,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
@@ -3888,15 +4020,15 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3908,11 +4040,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 ""
 
@@ -3920,16 +4052,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:114
 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"
@@ -3939,12 +4071,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -3965,35 +4096,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4005,15 +4130,15 @@ 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 ""
@@ -4024,28 +4149,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4055,31 +4181,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4095,17 +4225,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 ""
 
@@ -4129,7 +4253,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4151,21 +4275,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 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: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:56
 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 ""
 
@@ -4173,80 +4291,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 ""
 
-#: 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4258,7 +4394,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4282,9 +4442,14 @@ msgstr ""
 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 ""
 
@@ -4292,7 +4457,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 ""
 
@@ -4304,26 +4469,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4339,7 +4504,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4351,7 +4516,7 @@ 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 ""
 
@@ -4384,7 +4549,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4401,15 +4566,15 @@ msgstr ""
 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 ""
 
@@ -4418,9 +4583,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4429,17 +4594,19 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr ""
@@ -4456,24 +4623,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4488,31 +4651,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4520,29 +4685,32 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4554,7 +4722,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4566,21 +4734,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4614,11 +4784,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4660,56 +4826,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4726,11 +4900,12 @@ msgstr ""
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4742,19 +4917,20 @@ msgid ""
 "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:976
 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:745
 #: 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 ""
 
@@ -4767,6 +4943,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr ""
 
@@ -4786,41 +4963,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4863,6 +5042,8 @@ 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"
@@ -4885,7 +5066,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 ""
 
@@ -4893,40 +5074,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4940,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -4958,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"
@@ -4976,6 +5147,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -4986,33 +5161,35 @@ msgid ""
 "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:1794
+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 "
@@ -5022,9 +5199,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5055,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5064,16 +5240,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5083,10 +5253,18 @@ 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/wireless.js:1432
+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 "
@@ -5101,19 +5279,19 @@ 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>"
@@ -5125,20 +5303,20 @@ msgid ""
 "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 ""
@@ -5153,8 +5331,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5164,7 +5342,7 @@ msgstr ""
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5172,7 +5350,7 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5183,7 +5361,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 ""
 
@@ -5207,55 +5385,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 ""
 
@@ -5263,19 +5427,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5305,10 +5470,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 ""
@@ -5318,21 +5485,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5346,18 +5523,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5377,11 +5561,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5391,42 +5591,40 @@ msgstr ""
 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 ""
 
@@ -5438,64 +5636,61 @@ 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 ""
 
@@ -5512,81 +5707,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:1257
 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:1313
 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 ""
-
 #: 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 ""
 
@@ -5594,41 +5786,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5642,7 +5830,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5663,7 +5851,7 @@ msgstr ""
 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:1339
 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 "
@@ -5671,61 +5859,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr ""
 
@@ -5737,12 +5926,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5777,18 +5972,14 @@ msgstr ""
 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:1029
+#: 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 ""
 
@@ -5796,11 +5987,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 ""
 
@@ -5816,22 +6007,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
@@ -5843,22 +6033,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5874,25 +6068,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 ""
 
@@ -5900,6 +6090,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
@@ -5938,21 +6132,18 @@ msgstr ""
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 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:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -5960,7 +6151,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr ""
 
@@ -5970,7 +6161,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -5985,10 +6178,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6006,66 +6195,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6082,7 +6271,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 ""
 
@@ -6163,8 +6352,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 ""
 
@@ -6201,7 +6390,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 ""
 
@@ -6214,11 +6403,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 ""
 
@@ -6234,14 +6423,19 @@ 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/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 3ba2ab2c5a..2250f44814 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -11,7 +11,7 @@ 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 ""
 
@@ -19,11 +19,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +61,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- anpassad --"
@@ -96,7 +96,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +108,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:1321
 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,35 +121,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "802.11r Snabb förvandling"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -166,11 +167,11 @@ msgid ""
 "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:819
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:352
+#: 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 +182,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,16 +199,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
@@ -216,7 +217,7 @@ msgstr ""
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -236,7 +237,7 @@ msgstr ""
 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 +245,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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 ""
 
@@ -314,12 +319,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Accesspunkt"
 
@@ -350,35 +355,47 @@ msgstr "Aktiva DHCP-kontrakt"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktiva DHCPv6-kontrakt"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -390,10 +407,15 @@ msgstr ""
 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"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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"
@@ -425,7 +447,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"
 
@@ -435,12 +457,12 @@ msgid "Administration"
 msgstr "Administration"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +476,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Varning"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -483,21 +507,19 @@ msgstr "Allokera IP sekventiellt"
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Tillåt enbart listade"
 
@@ -524,94 +546,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr "Anonym identitet"
 
@@ -623,20 +645,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 +652,11 @@ msgstr "Konfiguration av antenn"
 msgid "Any zone"
 msgstr "NÃ¥gon zon"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -656,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 ""
@@ -666,13 +674,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Associerade stationer"
@@ -681,16 +689,16 @@ 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:1405
 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"
 
@@ -712,17 +720,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 +775,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -793,14 +803,6 @@ 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"
@@ -818,11 +820,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -839,16 +841,16 @@ msgid ""
 "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"
@@ -857,56 +859,62 @@ msgstr "Bithastighet"
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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"
 
@@ -930,7 +938,7 @@ msgstr "Kedja"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Ändringar"
 
@@ -938,7 +946,7 @@ msgstr "Ändringar"
 msgid "Changes applied."
 msgstr "Tillämpade ändringar"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -951,20 +959,14 @@ 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:1598
 #: 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 +975,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:1786
 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 +989,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:1809
 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 +998,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:833
 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:1022
 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,14 +1024,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1038,12 +1040,12 @@ msgstr "Klient-ID att skicka vid DHCP-förfrågning"
 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"
@@ -1057,11 +1059,8 @@ msgstr "Stäng ner lista..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1074,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1094,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1110,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1187,6 +1187,10 @@ msgstr "Kritisk"
 msgid "Cron Log Level"
 msgstr "Loggnivå för Cron"
 
+#: 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
@@ -1196,7 +1200,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 +1210,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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"
 
@@ -1272,7 +1277,7 @@ msgstr "DNS"
 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 ""
 
@@ -1284,15 +1289,15 @@ msgstr ""
 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 +1306,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1322,37 +1327,40 @@ msgstr "Datahastighet"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1360,13 +1368,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1375,18 +1383,30 @@ msgstr "Radera"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Beskrivning"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr ""
@@ -1405,10 +1425,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:81
+#: 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 +1438,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "Enheten kan inte nås"
 
@@ -1432,26 +1463,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1490,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1495,34 +1527,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1545,10 +1576,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1557,7 +1596,7 @@ msgstr "Domän krävs"
 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"
 
@@ -1581,11 +1620,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1599,39 +1638,40 @@ msgid ""
 "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:1370
 msgid "EAP-Method"
 msgstr "EAP-metod"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Redigera"
 
@@ -1641,50 +1681,51 @@ 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:717
 msgid "Edit this network"
 msgstr "Redigera det här nätverket"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1692,7 +1733,7 @@ msgstr ""
 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 ""
 
@@ -1700,31 +1741,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 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:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1773,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1740,48 +1781,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1797,6 +1842,11 @@ msgstr ""
 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
@@ -1810,12 +1860,12 @@ msgstr "Fel"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet-adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
@@ -1828,6 +1878,10 @@ msgstr "Inkludera inte dessa gränssnitt"
 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,20 +1890,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1865,30 +1919,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Fil"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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,6 +1973,7 @@ msgstr "Filtrera privata"
 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 +1984,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 +1996,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:73
 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 +2008,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 ""
 
@@ -1973,31 +2040,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2072,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 +2080,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 +2088,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:808
 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:773
 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:86
 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"
 
@@ -2079,6 +2141,7 @@ msgid "Gateway ports"
 msgstr "Gateway-portar"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2086,11 +2149,10 @@ msgstr "Gateway-portar"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2098,7 +2160,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2106,10 +2168,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Angiven lösenordsbekräftelse matchade inte, lösenordet ändrades inte!"
@@ -2118,7 +2176,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 +2187,29 @@ msgstr "Globala nätverksalternativ"
 msgid "Go to password configuration..."
 msgstr "Gå till lösenordskonfiguration..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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å"
@@ -2170,9 +2224,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Göm <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2183,6 +2235,7 @@ 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:1939
 msgid "Host"
 msgstr "Värd"
 
@@ -2190,7 +2243,7 @@ msgstr "Värd"
 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,7 +2251,7 @@ 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 ""
 
@@ -2211,28 +2264,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2255,6 +2308,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 +2320,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 +2332,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,16 +2356,16 @@ 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 ""
 
@@ -2317,6 +2374,7 @@ msgstr ""
 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 +2389,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 +2411,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 +2423,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 +2435,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 +2457,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 +2482,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:1462
 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 +2527,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 ""
 
@@ -2501,7 +2573,7 @@ msgstr ""
 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"
 
@@ -2523,12 +2595,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 ""
 
@@ -2540,19 +2612,21 @@ msgstr "Ankommande"
 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 +2634,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
 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:791
 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:953
 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 +2714,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Isolera klienter"
 
@@ -2650,15 +2759,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Ansluter till nätverk: %q"
 
@@ -2675,15 +2784,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Nyckel #%d"
 
@@ -2691,33 +2800,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"
 
@@ -2738,12 +2848,12 @@ 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:370
-#: 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"
 
@@ -2757,24 +2867,24 @@ msgstr "Kontraktsfil"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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"
 
@@ -2802,7 +2912,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Länk På"
 
@@ -2812,7 +2922,7 @@ msgid ""
 "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:1361
 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 +2931,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:1365
 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,7 +2940,7 @@ 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"
 
@@ -2846,7 +2956,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr "Lyssningsportar"
 
@@ -2878,7 +2988,11 @@ msgstr "Laddar"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2888,20 +3002,20 @@ 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"
 
@@ -2909,7 +3023,7 @@ msgstr "Lokal IPv6-adress"
 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"
 
@@ -2946,10 +3060,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2974,11 +3084,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"
@@ -2987,31 +3099,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3141,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3040,16 +3152,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3057,7 +3170,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3073,25 +3186,23 @@ msgstr ""
 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:760
+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
@@ -3110,42 +3221,43 @@ msgstr "Minne"
 msgid "Memory usage (%)"
 msgstr "Minnesanvändning (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Läge"
@@ -3154,31 +3266,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Övervaka"
 
@@ -3186,7 +3297,7 @@ msgstr "Övervaka"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3247,27 +3358,28 @@ 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:1313
 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"
 
@@ -3275,18 +3387,15 @@ msgstr "NT-domän"
 msgid "NTP server candidates"
 msgstr "NTP-serverkandidater"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "Namnet på det nya nätverket"
 
@@ -3296,7 +3405,8 @@ msgstr "Navigering"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3321,33 +3431,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3356,18 +3484,6 @@ msgstr ""
 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,6 +3491,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "Inget lösenord inställt!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3383,19 +3503,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"
 
@@ -3415,8 +3535,8 @@ msgstr ""
 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"
 
@@ -3428,23 +3548,27 @@ 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:170
 msgid "Notice"
@@ -3462,49 +3586,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3643,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Alternativet ändrades"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3679,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3616,7 +3734,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 +3743,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:953
 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 +3795,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Överblick"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3829,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,63 +3840,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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"
 
@@ -3782,11 +3906,11 @@ msgstr "Lösenord"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Lösenordet för den inre privata nyckeln"
 
@@ -3797,7 +3921,7 @@ msgstr "Lösenordet för den inre privata nyckeln"
 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"
 
@@ -3805,27 +3929,27 @@ msgstr "Lösenord2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Genväg till den inre privata nyckeln"
 
@@ -3843,7 +3967,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 +3976,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:86
 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 +3992,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3876,7 +4004,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 +4015,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
@@ -3908,15 +4040,15 @@ msgstr ""
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3928,11 +4060,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"
 
@@ -3940,16 +4072,16 @@ 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:114
 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"
@@ -3959,12 +4091,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Privat nyckel"
 
@@ -3985,35 +4116,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Publik nyckel"
 
@@ -4025,15 +4150,15 @@ 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é"
@@ -4044,28 +4169,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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,31 +4201,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4117,17 +4247,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?"
 
@@ -4151,7 +4275,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4173,21 +4297,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:98
+#: 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:56
 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"
 
@@ -4195,80 +4313,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4280,7 +4416,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4304,9 +4464,14 @@ msgstr "Resolv och Värd-filer"
 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"
 
@@ -4314,7 +4479,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 ""
 
@@ -4326,26 +4491,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Visa/göm lösenord"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Återgå"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4361,7 +4526,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4373,7 +4538,7 @@ 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 ""
 
@@ -4406,7 +4571,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4423,15 +4588,15 @@ msgstr "SNR"
 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"
 
@@ -4440,9 +4605,9 @@ msgstr "Användarnamn för SSH"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4451,17 +4616,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Spara"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Spara och Verkställ"
@@ -4478,24 +4645,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Schemalagda uppgifter"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Sektionen lades till"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Sektionen togs bort"
 
@@ -4510,31 +4673,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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"
 
@@ -4542,29 +4707,32 @@ msgstr "Typ av tjänst"
 msgid "Services"
 msgstr "Tjänster"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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"
 
@@ -4576,7 +4744,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4588,21 +4756,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4636,11 +4806,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4682,56 +4848,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4748,11 +4922,12 @@ msgstr "Statiska IPv6-rutter"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: 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"
@@ -4764,19 +4939,20 @@ msgid ""
 "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:976
 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:745
 #: 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 ""
 
@@ -4789,6 +4965,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Skicka in"
 
@@ -4808,41 +4985,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4885,6 +5064,8 @@ 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"
@@ -4907,7 +5088,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"
 
@@ -4915,40 +5096,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4962,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 +5145,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,6 +5169,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5008,33 +5183,35 @@ msgid ""
 "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:1794
+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,9 +5221,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5077,7 +5253,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5086,16 +5262,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Det finns inga aktiva kontrakt."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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,10 +5277,18 @@ 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/wireless.js:1432
+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 "
@@ -5125,19 +5303,19 @@ 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>"
@@ -5149,20 +5327,20 @@ msgid ""
 "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,8 +5355,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5188,7 +5366,7 @@ msgstr ""
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5196,7 +5374,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5209,7 +5387,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"
 
@@ -5233,55 +5411,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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"
 
@@ -5289,19 +5453,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB-portar"
 
@@ -5331,10 +5496,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 ""
@@ -5344,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 "Otillgängliga Sekunder (UAS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Okänd"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5372,18 +5549,25 @@ msgstr "Avmontera"
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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."
@@ -5403,11 +5587,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5417,42 +5617,40 @@ msgstr "Upptid"
 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 ""
 
@@ -5464,64 +5662,61 @@ 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 ""
 
@@ -5538,81 +5733,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:1257
 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:1313
 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)"
-msgstr ""
-
 #: 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 ""
 
@@ -5620,41 +5812,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5668,7 +5856,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:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5690,7 +5878,7 @@ msgstr ""
 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:1339
 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 "
@@ -5698,61 +5886,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: 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:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Trådlöst nätverk är aktiverat"
 
@@ -5764,12 +5953,18 @@ msgstr "Skriv mottagna DNS-förfrågningar till syslogg"
 msgid "Write system log to file"
 msgstr "Skriv systemlogg till fil"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5806,18 +6001,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5825,11 +6016,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"
 
@@ -5845,22 +6036,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
@@ -5872,22 +6062,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5903,25 +6097,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"
 
@@ -5929,6 +6119,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
@@ -5967,21 +6161,18 @@ msgstr ""
 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:1344
 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"
 
@@ -5989,7 +6180,7 @@ msgstr "ingen länk"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr ""
 
@@ -5999,7 +6190,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6014,10 +6207,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6035,66 +6224,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6111,7 +6300,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"
 
@@ -6192,8 +6381,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 ""
 
@@ -6230,7 +6419,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 ""
 
@@ -6243,11 +6432,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 ""
 
@@ -6263,14 +6452,19 @@ 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/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
@@ -6281,6 +6475,114 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Bakåt"
 
+#~ 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"
 
@@ -6404,9 +6706,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 5406a79684..b3bf0426b8 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -1,7 +1,7 @@
 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 ""
 
@@ -9,11 +9,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +51,19 @@ msgid "-- Additional Field --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr ""
@@ -86,7 +86,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -98,10 +98,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:1321
 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,35 +111,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
@@ -156,11 +157,11 @@ msgid ""
 "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:819
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:352
+#: 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 +171,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,16 +186,16 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:62
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
@@ -203,7 +204,7 @@ msgstr ""
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -223,69 +224,73 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 ""
 
@@ -299,12 +304,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr ""
 
@@ -335,35 +340,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -375,10 +392,15 @@ msgstr ""
 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 ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
@@ -410,7 +432,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 ""
 
@@ -420,12 +442,12 @@ msgid "Administration"
 msgstr ""
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -439,12 +461,14 @@ msgstr ""
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -467,21 +491,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr ""
 
@@ -506,94 +528,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -605,20 +627,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 +634,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -638,8 +646,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 +656,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr ""
@@ -663,16 +671,16 @@ 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:1405
 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 ""
 
@@ -694,17 +702,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 +757,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -775,14 +785,6 @@ 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 ""
@@ -800,11 +802,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -821,16 +823,16 @@ msgid ""
 "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 ""
@@ -839,55 +841,61 @@ msgstr ""
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -911,7 +919,7 @@ msgstr ""
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr ""
 
@@ -919,7 +927,7 @@ msgstr ""
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -932,20 +940,14 @@ 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:1598
 #: 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 +956,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -966,8 +968,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:1809
 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 +977,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:833
 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:1022
 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,14 +1003,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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 ""
 
@@ -1017,12 +1019,12 @@ msgstr ""
 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"
@@ -1036,11 +1038,8 @@ msgstr ""
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1053,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1073,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1089,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 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/luasrc/view/admin_system/password.htm:43
+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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
@@ -1166,6 +1166,10 @@ msgstr ""
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1175,7 +1179,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 +1189,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1251,7 +1256,7 @@ msgstr ""
 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 ""
 
@@ -1263,15 +1268,15 @@ msgstr ""
 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 +1285,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1301,37 +1306,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1339,13 +1347,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 ""
 
@@ -1354,18 +1362,30 @@ msgstr ""
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr ""
@@ -1384,10 +1404,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:81
+#: 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 +1417,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1411,58 +1442,59 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1472,34 +1504,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1520,10 +1551,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 ""
@@ -1532,7 +1571,7 @@ msgstr ""
 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 ""
 
@@ -1554,11 +1593,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1572,39 +1611,40 @@ msgid ""
 "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:1370
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr ""
 
@@ -1614,50 +1654,51 @@ 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:717
+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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1665,7 +1706,7 @@ msgstr ""
 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 ""
 
@@ -1673,31 +1714,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1746,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1713,48 +1754,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1770,6 +1815,11 @@ msgstr ""
 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
@@ -1783,12 +1833,12 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
@@ -1801,6 +1851,10 @@ msgstr ""
 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,20 +1863,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1838,30 +1892,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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,6 +1946,7 @@ msgstr ""
 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 +1957,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 +1969,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:73
 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 +1981,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 ""
 
@@ -1946,31 +2013,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2045,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 +2053,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 +2061,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:808
 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:773
 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:86
 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 ""
 
@@ -2052,6 +2114,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2059,11 +2122,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2071,7 +2133,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2079,10 +2141,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2091,7 +2149,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 +2160,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 ""
@@ -2143,9 +2197,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2156,6 +2208,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 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,7 +2224,7 @@ 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 ""
 
@@ -2184,28 +2237,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2228,6 +2281,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 +2293,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 +2305,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,16 +2329,16 @@ 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 ""
 
@@ -2290,6 +2347,7 @@ msgstr ""
 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 +2362,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 +2384,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 +2396,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 +2408,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 +2430,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 +2455,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:1462
 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 +2500,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 ""
 
@@ -2474,7 +2546,7 @@ msgstr ""
 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 ""
 
@@ -2496,12 +2568,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 ""
 
@@ -2513,19 +2585,21 @@ msgstr ""
 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 +2607,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
 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:791
 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:953
 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 +2687,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2623,15 +2732,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2648,15 +2757,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2664,33 +2773,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 ""
 
@@ -2711,12 +2821,12 @@ 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:370
-#: 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 ""
 
@@ -2730,24 +2840,24 @@ msgstr ""
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 ""
 
@@ -2775,7 +2885,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
@@ -2785,7 +2895,7 @@ msgid ""
 "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:1361
 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 +2904,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:1365
 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,7 +2913,7 @@ 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 ""
 
@@ -2819,7 +2929,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2850,7 +2960,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2860,20 +2974,20 @@ 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 ""
 
@@ -2881,7 +2995,7 @@ msgstr ""
 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 ""
 
@@ -2918,10 +3032,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2946,11 +3056,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"
@@ -2959,31 +3071,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3113,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3012,16 +3124,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3029,7 +3142,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3045,25 +3158,23 @@ msgstr ""
 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:760
+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
@@ -3082,42 +3193,43 @@ msgstr ""
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3126,31 +3238,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr ""
 
@@ -3158,7 +3269,7 @@ msgstr ""
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3219,27 +3330,28 @@ 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:1313
 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 ""
 
@@ -3247,18 +3359,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr ""
 
@@ -3268,7 +3377,8 @@ msgstr ""
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3293,33 +3403,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3328,18 +3456,6 @@ msgstr ""
 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,6 +3463,10 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3355,19 +3475,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 ""
 
@@ -3387,8 +3507,8 @@ msgstr ""
 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 ""
 
@@ -3400,22 +3520,26 @@ 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:170
@@ -3434,49 +3558,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3615,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3651,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3588,7 +3706,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 +3715,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:953
 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 +3767,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3801,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,63 +3812,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 ""
 
@@ -3754,11 +3878,11 @@ msgstr ""
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3769,7 +3893,7 @@ msgstr ""
 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 ""
 
@@ -3777,27 +3901,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3815,7 +3939,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 +3948,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:86
 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 +3964,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3848,7 +3976,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 +3987,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
@@ -3880,15 +4012,15 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3900,11 +4032,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 ""
 
@@ -3912,16 +4044,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:114
 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"
@@ -3931,12 +4063,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -3957,35 +4088,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -3997,15 +4122,15 @@ 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 ""
@@ -4016,28 +4141,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4047,31 +4173,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4087,17 +4217,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 ""
 
@@ -4121,7 +4245,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4143,21 +4267,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 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: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:56
 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 ""
 
@@ -4165,80 +4283,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 ""
 
-#: 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4250,7 +4386,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4274,9 +4434,14 @@ msgstr ""
 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 ""
 
@@ -4284,7 +4449,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 ""
 
@@ -4296,26 +4461,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4331,7 +4496,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4343,7 +4508,7 @@ 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 ""
 
@@ -4376,7 +4541,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4393,15 +4558,15 @@ msgstr ""
 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 ""
 
@@ -4410,9 +4575,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4421,17 +4586,19 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr ""
@@ -4448,24 +4615,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4480,31 +4643,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4512,29 +4677,32 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4546,7 +4714,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4558,21 +4726,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4606,11 +4776,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4652,56 +4818,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4718,11 +4892,12 @@ msgstr ""
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4734,19 +4909,20 @@ msgid ""
 "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:976
 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:745
 #: 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 ""
 
@@ -4759,6 +4935,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr ""
 
@@ -4778,41 +4955,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4855,6 +5034,8 @@ 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"
@@ -4877,7 +5058,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 ""
 
@@ -4885,40 +5066,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4932,7 +5097,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -4950,6 +5115,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"
@@ -4968,6 +5139,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -4978,33 +5153,35 @@ msgid ""
 "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:1794
+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 "
@@ -5014,9 +5191,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5047,7 +5223,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5056,16 +5232,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5075,10 +5245,18 @@ 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/wireless.js:1432
+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 "
@@ -5093,19 +5271,19 @@ 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>"
@@ -5117,20 +5295,20 @@ msgid ""
 "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 ""
@@ -5145,8 +5323,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5156,7 +5334,7 @@ msgstr ""
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5164,7 +5342,7 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5175,7 +5353,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 ""
 
@@ -5199,55 +5377,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 ""
 
@@ -5255,19 +5419,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5297,10 +5462,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 ""
@@ -5310,21 +5477,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5338,18 +5515,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5369,11 +5553,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5383,42 +5583,40 @@ msgstr ""
 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 ""
 
@@ -5430,64 +5628,61 @@ 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 ""
 
@@ -5504,81 +5699,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:1257
 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:1313
 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 ""
-
 #: 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 +5778,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5634,7 +5822,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5655,7 +5843,7 @@ msgstr ""
 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:1339
 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,61 +5851,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr ""
 
@@ -5729,12 +5918,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5769,18 +5964,14 @@ msgstr ""
 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:1029
+#: 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 +5979,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 +5999,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,22 +6025,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5866,25 +6060,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 +6082,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
@@ -5930,21 +6124,18 @@ msgstr ""
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 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:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 ""
 
-#: 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 +6143,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr ""
 
@@ -5962,7 +6153,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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,10 +6170,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -5998,66 +6187,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6074,7 +6263,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 +6344,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 +6382,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 +6395,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 +6415,19 @@ 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/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 9c7d4de956..e311cab7f9 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -12,7 +12,7 @@ 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 ""
 
@@ -20,11 +20,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +62,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- özel --"
@@ -97,7 +97,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -109,10 +109,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:1321
 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,35 +122,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\\\"Temel Servis Ayar Tanımlayıcısı\\\"> BSSID </abbr>"
 
@@ -167,11 +168,11 @@ msgid ""
 "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:819
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:352
+#: 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 +182,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,16 +199,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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ı"
 
@@ -216,7 +217,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Adı"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -240,69 +241,73 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 ""
 
@@ -316,12 +321,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Erişim Noktası"
 
@@ -354,35 +359,47 @@ msgstr "Aktif DHCP Kiraları"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktif DHCPv6 Kiraları"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -394,10 +411,15 @@ msgstr ""
 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..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+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ı"
@@ -429,7 +451,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 ""
 
@@ -439,12 +461,12 @@ msgid "Administration"
 msgstr ""
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +480,14 @@ msgstr ""
 msgid "Alert"
 msgstr "Uyarı"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -488,21 +512,19 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Yanlızca listelenenlere izin ver"
 
@@ -527,94 +549,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -626,20 +648,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 +655,11 @@ msgstr "Anten Yapılandırması"
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -659,8 +667,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 +677,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Ä°liÅŸkili istasyonlar"
@@ -684,16 +692,16 @@ 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:1405
 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ü"
 
@@ -715,17 +723,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 +778,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -796,14 +806,6 @@ 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"
@@ -821,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -842,16 +844,16 @@ msgid ""
 "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ı"
@@ -860,55 +862,61 @@ msgstr "Bit hızı"
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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"
 
@@ -932,7 +940,7 @@ msgstr "Zincir"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "DeÄŸiÅŸiklikler"
 
@@ -940,7 +948,7 @@ msgstr "DeÄŸiÅŸiklikler"
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -953,20 +961,14 @@ 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:1598
 #: 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 +977,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -987,8 +989,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:1809
 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 +998,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:833
 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:1022
 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,14 +1026,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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 ""
 
@@ -1040,12 +1042,12 @@ msgstr ""
 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,11 +1061,8 @@ msgstr ""
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1076,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1096,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1112,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
@@ -1189,6 +1189,10 @@ msgstr "Kritik"
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1198,7 +1202,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 +1212,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1274,7 +1279,7 @@ msgstr ""
 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 ""
 
@@ -1286,15 +1291,15 @@ msgstr ""
 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 +1308,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1324,37 +1329,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1362,13 +1370,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1377,18 +1385,30 @@ msgstr "Sil"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Açıklama"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Tasarım"
@@ -1407,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:81
+#: 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 +1440,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "Cihaz ulaşılamaz!"
 
@@ -1434,26 +1465,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1492,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1497,34 +1529,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1545,10 +1576,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 ""
@@ -1557,7 +1596,7 @@ msgstr ""
 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 ""
 
@@ -1579,11 +1618,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1597,39 +1636,40 @@ msgid ""
 "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:1370
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr ""
 
@@ -1639,50 +1679,51 @@ 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:717
+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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1690,7 +1731,7 @@ msgstr ""
 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 ""
 
@@ -1698,31 +1739,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1771,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1738,48 +1779,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1795,6 +1840,11 @@ msgstr ""
 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
@@ -1808,12 +1858,12 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
@@ -1826,6 +1876,10 @@ msgstr ""
 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,20 +1888,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1863,30 +1917,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1905,6 +1971,7 @@ msgstr ""
 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 +1982,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 +1994,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:73
 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 +2006,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 ""
 
@@ -1971,31 +2038,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2070,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 +2078,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 +2086,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:808
 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:773
 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:86
 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,6 +2139,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2084,11 +2147,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2096,7 +2158,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2104,10 +2166,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2116,7 +2174,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 +2185,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 ""
@@ -2168,9 +2222,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2181,6 +2233,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2188,7 +2241,7 @@ msgstr ""
 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,7 +2249,7 @@ 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 ""
 
@@ -2209,28 +2262,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2253,6 +2306,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 +2318,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 +2330,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,16 +2354,16 @@ 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 ""
 
@@ -2315,6 +2372,7 @@ msgstr ""
 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 +2387,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 +2409,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 +2421,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 +2433,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 +2455,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 +2480,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:1462
 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 +2525,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,7 +2571,7 @@ msgstr ""
 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 ""
 
@@ -2521,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 ""
 
@@ -2538,19 +2610,21 @@ msgstr ""
 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 +2632,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
 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:791
 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:953
 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 +2712,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2648,15 +2757,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2673,15 +2782,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2689,33 +2798,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 ""
 
@@ -2736,12 +2846,12 @@ 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:370
-#: 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 ""
 
@@ -2755,24 +2865,24 @@ msgstr ""
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 ""
 
@@ -2800,7 +2910,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
@@ -2810,7 +2920,7 @@ msgid ""
 "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:1361
 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 +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:1365
 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,7 +2938,7 @@ 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 ""
 
@@ -2844,7 +2954,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2875,7 +2985,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2885,20 +2999,20 @@ 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 ""
 
@@ -2906,7 +3020,7 @@ msgstr ""
 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 ""
 
@@ -2943,10 +3057,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2971,11 +3081,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"
@@ -2984,31 +3096,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3138,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:68
 msgid "MTU"
 msgstr ""
 
@@ -3037,16 +3149,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3054,7 +3167,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3070,25 +3183,23 @@ msgstr ""
 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:760
+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
@@ -3107,42 +3218,43 @@ msgstr "Bellek"
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3151,31 +3263,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr ""
 
@@ -3183,7 +3294,7 @@ msgstr ""
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3244,27 +3355,28 @@ 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:1313
 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 ""
 
@@ -3272,18 +3384,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr ""
 
@@ -3293,7 +3402,8 @@ msgstr ""
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3318,33 +3428,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3353,18 +3481,6 @@ msgstr ""
 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,6 +3488,10 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3380,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 "Parazit"
 
@@ -3412,8 +3532,8 @@ msgstr ""
 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 ""
 
@@ -3425,22 +3545,26 @@ 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:170
@@ -3459,49 +3583,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3613,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 ""
 
@@ -3622,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:953
 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 +3792,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Genel Bakış"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +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 ""
 
@@ -3715,63 +3837,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 ""
 
@@ -3779,11 +3903,11 @@ msgstr ""
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3794,7 +3918,7 @@ msgstr ""
 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 ""
 
@@ -3802,27 +3926,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3840,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 ""
 
@@ -3849,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:86
 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 +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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3873,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 ""
 
@@ -3884,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
@@ -3905,15 +4037,15 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3925,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 ""
 
@@ -3937,16 +4069,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:114
 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"
@@ -3956,12 +4088,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -3982,35 +4113,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4022,15 +4147,15 @@ 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 ""
@@ -4041,28 +4166,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4072,31 +4198,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4112,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 ""
 
@@ -4146,7 +4270,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4168,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:98
+#: 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:56
 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 ""
 
@@ -4190,80 +4308,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 ""
 
-#: 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4275,7 +4411,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4299,9 +4459,14 @@ msgstr ""
 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"
 
@@ -4309,7 +4474,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 ""
 
@@ -4321,26 +4486,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Dönmek"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "DeÄŸiÅŸiklikleri geri al"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4356,7 +4521,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4368,7 +4533,7 @@ 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 ""
 
@@ -4401,7 +4566,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:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4418,15 +4583,15 @@ msgstr "SNR"
 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ı"
 
@@ -4435,9 +4600,9 @@ msgstr "SSH kullanıcı adı"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4446,17 +4611,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Kaydet"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Kaydet & Uygula"
@@ -4473,24 +4640,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Zamanlanmış Görevler"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Bölüm eklendi"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Bölüm kaldırıldı"
 
@@ -4505,31 +4668,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4537,29 +4702,32 @@ msgstr ""
 msgid "Services"
 msgstr "Servisler"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4571,7 +4739,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4583,21 +4751,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:1596
 #: 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:1940
+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)"
@@ -4631,11 +4801,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4677,56 +4843,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4743,11 +4917,12 @@ msgstr ""
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4759,19 +4934,20 @@ msgid ""
 "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:976
 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:745
 #: 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"
 
@@ -4784,6 +4960,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Gönder"
 
@@ -4803,41 +4980,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4880,6 +5059,8 @@ 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"
@@ -4902,7 +5083,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 ""
 
@@ -4910,40 +5091,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4957,7 +5122,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -4975,6 +5140,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"
@@ -4993,6 +5164,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5003,33 +5178,35 @@ msgid ""
 "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:1794
+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 "
@@ -5039,9 +5216,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5072,7 +5248,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5081,16 +5257,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5100,10 +5270,18 @@ 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/wireless.js:1432
+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 "
@@ -5118,19 +5296,19 @@ 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>"
@@ -5142,20 +5320,20 @@ msgid ""
 "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 ""
@@ -5170,8 +5348,8 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5181,7 +5359,7 @@ msgstr ""
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5189,7 +5367,7 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5200,7 +5378,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 ""
 
@@ -5224,55 +5402,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 ""
 
@@ -5280,19 +5444,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5322,10 +5487,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 ""
@@ -5335,21 +5502,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5363,18 +5540,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5394,11 +5578,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5408,42 +5608,40 @@ msgstr "Çalışma Zamanı"
 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 ""
 
@@ -5455,64 +5653,61 @@ 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"
 
@@ -5529,81 +5724,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:1257
 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:1313
 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)"
-msgstr ""
-
 #: 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 ""
 
@@ -5611,41 +5803,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5659,7 +5847,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5680,7 +5868,7 @@ msgstr ""
 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:1339
 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 "
@@ -5688,61 +5876,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr ""
 
@@ -5754,12 +5943,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5796,18 +5991,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5815,11 +6006,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ü"
 
@@ -5835,22 +6026,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
@@ -5862,22 +6052,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "sona ermiÅŸ"
 
@@ -5893,25 +6087,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"
 
@@ -5919,6 +6109,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
@@ -5957,21 +6151,18 @@ msgstr ""
 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:1344
 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"
 
@@ -5979,7 +6170,7 @@ msgstr "bağlantı yok"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "hiçbiri"
 
@@ -5989,7 +6180,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6004,10 +6197,6 @@ 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-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6025,66 +6214,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6101,7 +6290,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"
 
@@ -6182,8 +6371,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 ""
 
@@ -6220,7 +6409,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 ""
 
@@ -6233,11 +6422,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 ""
 
@@ -6253,14 +6442,19 @@ 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/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
@@ -6271,6 +6465,39 @@ msgstr "evet"
 msgid "« Back"
 msgstr "« Geri"
 
+#~ 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 e6eef72ca4..406c6b1c9e 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-08-26 13:25+0300\n"
+"PO-Revision-Date: 2019-09-12 02:44+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"
 
-#: 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 дБ"
 
@@ -17,11 +17,11 @@ msgstr "%.1f дБ"
 msgid "%d Bit"
 msgstr "%d біт"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +35,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 +59,19 @@ msgid "-- Additional Field --"
 msgstr "-- Додаткові пол� --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- нетипово --"
@@ -94,7 +94,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 "0 = не викори�товувати поріг RSSI, 1 = не змінюваим типові значенн� драйвера"
@@ -107,10 +107,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:1321
 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,36 +120,36 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "Швидкий перехід 802.11r"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "Мак�имальний тайм-аут запиту а�оціації 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr "Захи�т кадрів управлінн� 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr "Мак�имальний тайм-аут 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 "<abbr title=\"Basic Service Set Identifier — ідентифікатор о�новної �лужби "
@@ -174,13 +175,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:819
 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:352
+#: 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 +191,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,17 +208,17 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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>"
 
@@ -228,7 +229,7 @@ msgstr ""
 "<abbr title=\"Media Access Control — управлінн� до�тупом до но�і�\">MAC</"
 "abbr>-адре�а"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
+#: 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>"
 
@@ -253,7 +254,7 @@ msgstr ""
 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 +262,67 @@ msgstr ""
 "<br/>Примітка: �кщо перед редагуванн�м, файл crontab був порожній, вам "
 "потрібно вручну перезапу�тити �лужби cron."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +332,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-при�трою"
 
@@ -342,12 +347,12 @@ msgstr "Ідентифікатор по�тачальника �и�теми ATU
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "Точка до�тупу"
 
@@ -378,35 +383,47 @@ msgstr "�ктивні оренди DHCP"
 msgid "Active DHCPv6 Leases"
 msgstr "�ктивні оренди DHCPv6"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -418,10 +435,15 @@ msgstr "Додати ключ"
 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 "Додати новий інтерфей�..."
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr "Додати вузол"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Додаткові файли hosts"
@@ -453,7 +475,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 "�дре�а дл� до�тупу до мо�ту локального ретран�л�тора"
 
@@ -463,12 +485,12 @@ msgid "Administration"
 msgstr "�дміні�труванн�"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,18 +498,20 @@ 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:174
 msgid "Alert"
 msgstr "Тривога"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\""
@@ -512,24 +536,22 @@ 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Дозволити тільки зазначені"
 
@@ -558,99 +580,99 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr "�нонімне по�відченн�"
 
@@ -662,20 +684,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 +691,11 @@ msgstr "Конфигураці� антени"
 msgid "Any zone"
 msgstr "Будь-�ка зона"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Стала�� помилка запиту на за�то�уванн� зі �тату�ом <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr "За�то�увати без позначки"
 
@@ -695,8 +703,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 +715,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Приєднано �танції"
@@ -724,16 +732,16 @@ 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:1405
 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 "Тип автентифікації"
 
@@ -755,17 +763,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 +819,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -837,14 +847,6 @@ 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 "Резервне копіюванн�"
@@ -862,11 +864,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:784
 msgid "Beacon Interval"
 msgstr "Інтервал ма�ка"
 
@@ -888,74 +890,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:173
 msgid "Bogus NX Domain Override"
 msgstr "Відкидати підробки NX-домену"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 "Категорі�"
 
@@ -979,7 +987,7 @@ msgstr "Ланцюжок"
 msgid "Change login password"
 msgstr "Змінити пароль дл� входу"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Зміни"
 
@@ -987,7 +995,7 @@ msgstr "Зміни"
 msgid "Changes applied."
 msgstr "Зміни за�то�овано."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "Зміни було �ка�овано."
 
@@ -1000,22 +1008,14 @@ 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:1598
 #: 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 +1024,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "Позначте цей параметр, щоб видалити і�нуючі мережі з цього радіо."
 
@@ -1036,8 +1036,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:1809
 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 +1049,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:833
 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 +1057,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:1022
 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,14 +1081,14 @@ msgstr ""
 "�ати�ніть \"Зберегти mtdblock\", щоб завантажити вказаний файл mtdblock. "
 "(ПРИМІТК�: ЦЕ ФУ�КЦІЯ ДЛЯ ПРОФЕСІО��ЛІВ!)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1097,12 +1097,12 @@ msgstr "Ідентифікатор клієнта дл� відправки пр
 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"
@@ -1118,11 +1118,8 @@ msgstr "Згорнути �пи�ок..."
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1133,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1157,14 @@ msgstr ""
 "Може викликати проблеми �умі�но�ті та зниженн� �тійко�ті узгодженн� ключа, "
 "о�обливо в �ередовищах з великою завантажені�тю трафіку."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 +1173,52 @@ msgstr "Помилка налаштуванн�"
 msgid "Configuration files will be kept"
 msgstr "Конфігураційні файли буде збережено"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "Конфігурацію за�то�овано."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "Конфігурацію було відкочено!"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Підтвердіть від'єднанн�"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1217,37 +1229,23 @@ 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:763
 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:1809
 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:173
 msgid "Critical"
 msgstr "Критичний"
@@ -1256,6 +1254,10 @@ msgstr "Критичний"
 msgid "Cron Log Level"
 msgstr "Рівень виведенн� інформації Cron"
 
+#: 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
@@ -1265,7 +1267,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 +1280,7 @@ msgstr ""
 "запобігти цьому, �початку виконайте відновленн� мікропрограми до її "
 "початкового �тану."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1288,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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"
 
@@ -1346,7 +1349,7 @@ msgstr "DNS"
 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"
 
@@ -1358,15 +1361,15 @@ msgstr ""
 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 +1378,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:962
 msgid "DTIM Interval"
 msgstr ""
 "Інтервал <abbr title=\"Delivery Traffic Indication Message — Повідомленн� "
@@ -1398,37 +1401,40 @@ msgstr "Швидк. передаванн�"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1439,13 +1445,13 @@ msgstr ""
 "�ервери дл� клієнтів."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "Видалити"
 
@@ -1454,18 +1460,30 @@ msgstr "Видалити"
 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:1649
+msgid "Delete permission denied"
+msgstr "Дозволу на видаленн� не надано"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr "Помилка запиту на видаленн�: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Опи�"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr "Ска�увати вибір"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Стиль"
@@ -1484,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:81
+#: 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 +1515,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "При�трій недо��жний!"
 
@@ -1511,26 +1540,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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1567,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Роз'єднувати за низького підтвердженн�"
 
@@ -1574,34 +1604,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1631,10 +1660,18 @@ msgstr ""
 "�е пере�пр�мовувати зворотні <abbr title=\"Domain Name System — �и�тема "
 "доменних імен\">DNS</abbr>-запити дл� локальних мереж"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "Справді видалити \"%s\"?"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr "Справді видалити такий SSH ключ?"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 "Потрібен домен"
@@ -1643,7 +1680,7 @@ msgstr "Потрібен домен"
 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 "�е фрагментувати"
 
@@ -1668,11 +1705,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr "Перет�гніть, щоб змінити пор�док"
 
@@ -1688,21 +1725,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 +1748,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:1370
 msgid "EAP-Method"
 msgstr "EAP-Метод"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Редагувати"
 
@@ -1736,24 +1774,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:717
 msgid "Edit this network"
 msgstr "Редагувати цю мережу"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,27 +1799,28 @@ 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-фрейми"
 
@@ -1789,7 +1828,7 @@ msgstr "Пропу�кати Jumbo-фрейми"
 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"
 
@@ -1797,31 +1836,31 @@ msgstr "Увімкнути Single DES"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Увімкнути кнопку WPS, потребує WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1868,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:712
 msgid "Enable this network"
 msgstr "Увімкнути цю мережу"
 
@@ -1837,21 +1876,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:1294
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1859,29 +1898,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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "Порт кінцевого вузла"
 
@@ -1897,6 +1940,11 @@ msgstr "Введіть вла�ні значенн�"
 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
@@ -1910,12 +1958,12 @@ msgstr "Помилка"
 msgid "Errored seconds (ES)"
 msgstr "Секунд з помилками (<abbr title=\"Errored seconds\">ES</abbr>)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet-адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet-комутатор"
@@ -1928,6 +1976,10 @@ msgstr "Виключити інтерфей�и"
 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,20 +1988,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr "Зовнішній �пи�ок вла�ників ключів R1"
 
@@ -1965,30 +2017,42 @@ msgstr "Порт зовнішнього �ервера �и�темного жу
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr "Протокол FT"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "Файл"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr "Файл недо�тупний"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 "І'м� завантажувального образу, що оголошуєть�� клієнтам"
@@ -2007,6 +2071,7 @@ msgstr "Фільтрувати приватні"
 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 +2084,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 +2096,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:73
 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 +2108,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 "Файл мікропрограми"
 
@@ -2075,31 +2140,31 @@ msgstr "Операції прошиванн�"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2172,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 +2180,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 +2188,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:808
 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:773
 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:86
 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"
 
@@ -2183,6 +2243,7 @@ msgid "Gateway ports"
 msgstr "Порти шлюзу"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2190,11 +2251,10 @@ msgstr "Порти шлюзу"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "Загальні налаштуванн�"
 
@@ -2202,7 +2262,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:1339
 msgid "Generate PMK locally"
 msgstr "Генерувати PMK локально"
 
@@ -2210,10 +2270,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "О�кільки пароль і підтвердженн� не �півпадають, то пароль не змінено!"
@@ -2222,7 +2278,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 +2289,29 @@ msgstr "Глобальні параметри мережі"
 msgid "Go to password configuration..."
 msgstr "Перейти до конфігурації парол�..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 "Призупинити"
@@ -2278,9 +2330,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Приховати <abbr title=\"Extended Service Set Identifier — ідентифікатор "
@@ -2293,6 +2343,7 @@ 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:1939
 msgid "Host"
 msgstr "Вузол"
 
@@ -2300,7 +2351,7 @@ msgstr "Вузол"
 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,7 +2359,7 @@ 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"
 
@@ -2321,28 +2372,28 @@ msgstr "Змі�т тегу Host-Uniq"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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-протокол"
 
@@ -2365,6 +2416,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 +2428,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 +2440,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,16 +2464,16 @@ 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"
 
@@ -2427,6 +2482,7 @@ msgstr "IPv4+IPv6"
 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 +2497,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 +2519,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 +2531,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 +2545,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 +2567,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 +2592,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:1462
 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 +2641,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-�ерверів ігнорують��"
 
@@ -2621,9 +2691,9 @@ msgstr ""
 
 #: 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 "Ігнорувати интерфей�"
 
@@ -2648,12 +2718,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 "Тайм-аут безді�льно�ті"
 
@@ -2665,19 +2735,21 @@ msgstr "Вхідний:"
 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 +2757,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
 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:791
 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:953
 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 +2837,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "Ізолювати клієнтів"
 
@@ -2780,15 +2887,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "Приєднанн� до мережі: %q"
 
@@ -2805,15 +2912,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "Ключ #%d"
 
@@ -2821,33 +2928,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"
 
@@ -2868,12 +2976,12 @@ 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:370
-#: 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 "Ча� оренди"
 
@@ -2887,24 +2995,24 @@ msgstr "Файл оренд"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "Межа"
 
@@ -2934,7 +3042,7 @@ msgstr "Стан лінії"
 msgid "Line Uptime"
 msgstr "Ча� безперервної роботи лінії"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Зв'�зок в�тановлено"
 
@@ -2946,7 +3054,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:1361
 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 +3070,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:1365
 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,7 +3088,7 @@ 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-ключів дл� авторизації"
 
@@ -2996,7 +3104,7 @@ msgstr "СпиÑ�ок доменів, Ñ�кі підтримують резульÑ
 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:51
 msgid "Listen Port"
 msgstr "Порти про�луховуванн�"
 
@@ -3029,7 +3137,11 @@ msgstr "Завантаженн�"
 msgid "Loading SSH keys…"
 msgstr "Завантаженн� SSH-ключів…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr "Завантаженн� вмі�ту каталогу…"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "Завантаженн� поданн�…"
@@ -3039,20 +3151,20 @@ 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"
 
@@ -3060,7 +3172,7 @@ msgstr "Локальна адре�а IPv6"
 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 "Локальний запу�к"
 
@@ -3104,10 +3216,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr "Рівень виведенн� інформаціі до журналу"
@@ -3134,11 +3242,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"
@@ -3147,31 +3257,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3299,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3202,16 +3312,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr "О�новний"
 
@@ -3219,7 +3330,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr "Мак�имальний дозволений інтервал про�луховуванн�"
 
@@ -3235,27 +3346,23 @@ msgstr "МакÑ�имально допуÑ�тима кількіÑ�Ñ‚ÑŒ одночÐ
 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:760
+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
@@ -3274,42 +3381,43 @@ msgstr "Пам'�ть"
 msgid "Memory usage (%)"
 msgstr "Викори�танн� пам'�ті, %"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Режим"
@@ -3318,31 +3426,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Ди�петчер"
 
@@ -3350,7 +3457,7 @@ msgstr "Ди�петчер"
 msgid "More Characters"
 msgstr "Більше �имволів"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr "Докладніше…"
 
@@ -3413,27 +3520,28 @@ 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:1313
 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"
 
@@ -3441,20 +3549,17 @@ msgstr "Домен NT"
 msgid "NTP server candidates"
 msgstr "Кандидати дл� �инхронізації �ервера NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
-msgstr "�азва (ім'�) нової мережі"
+msgstr "�азва нової мережі"
 
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
 msgid "Navigation"
@@ -3462,7 +3567,8 @@ msgstr "�авігаці�"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3487,33 +3593,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 "Делегуванн� відповідних префік�ів від�утнє"
@@ -3522,18 +3646,6 @@ msgstr "ДелегуваннÑ� відповідних префікÑ�ів відÑ
 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,6 +3653,10 @@ msgstr "�емає мереж у межах до��жно�ті"
 msgid "No password set!"
 msgstr "Пароль не в�тановлено!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr "Жодного вузла ще не визначено"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "Відкритих ключів поки що немає."
@@ -3549,19 +3665,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 "Шум"
 
@@ -3581,8 +3697,8 @@ msgstr "�е запобіжні помилки CRC (CRC_P)"
 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 "Жоден"
 
@@ -3594,23 +3710,27 @@ 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:170
 msgid "Notice"
@@ -3628,55 +3748,42 @@ msgstr "Кількі�ть кешованих запи�ів DNS (мак�. - 10
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3805,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:756
 msgid "Operating frequency"
 msgstr "Робоча ча�тота"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "Опці� змінена"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3727,7 +3835,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 +3847,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:114
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3748,30 +3856,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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3780,7 +3888,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 "�еобов'�зково. UDP-порт, �кий викори�товуєть�� дл� вихідних та вхідних "
@@ -3803,7 +3911,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 +3920,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:953
 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 +3966,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 +3975,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Огл�д"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +4009,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,63 +4022,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "Пароль"
 
@@ -3974,11 +4088,11 @@ msgstr "Пароль"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "Пароль внутрішнього закритого ключа"
 
@@ -3989,7 +4103,7 @@ msgstr "Пароль внутрішнього закритого ключа"
 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"
 
@@ -3997,27 +4111,27 @@ msgstr "Пароль2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "Шл�х до внутрішнього закритого ключа"
 
@@ -4035,7 +4149,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 +4158,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:86
 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 +4174,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:133
 msgid "Persistent Keep Alive"
 msgstr "Завжди тримати ввімкненим"
 
@@ -4068,7 +4186,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 +4197,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
@@ -4100,15 +4222,15 @@ msgstr "Політика"
 msgid "Port"
 msgstr "Порт"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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"
 
@@ -4120,11 +4242,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"
 
@@ -4132,16 +4254,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:114
 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"
@@ -4153,12 +4275,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr "Приватний ключ"
 
@@ -4179,35 +4300,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "Відкритий ключ"
 
@@ -4223,15 +4338,15 @@ 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 "Які�ть"
@@ -4244,28 +4359,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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4275,31 +4391,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr "Швидкі�ть прийм./перед."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 "Сирі ші�тнадц�ткові байти. Залиште порожнім, �кщо ваш інтернет-провайдер не "
@@ -4322,20 +4442,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 "Дій�но змінити протокол?"
 
@@ -4359,7 +4470,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "Кінцевий термін реа��оціації"
 
@@ -4381,21 +4492,15 @@ msgstr "Перезавантаженн�..."
 msgid "Reboots the operating system of your device"
 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: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:56
 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 "Перепідключити цей інтерфей�"
 
@@ -4403,73 +4508,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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 "
@@ -4479,7 +4582,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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr "Потребує hostapd"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr "Потребує hostapd з підтримкою EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr "Потребує hostapd з підтримкою OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr "Потребує hostapd з підтримкою SAE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4495,7 +4618,31 @@ msgstr ""
 "Потребує підтримки ви�хідною мережею DNSSEC; переконайте��, що відповіді "
 "непідпи�аного домену дій�но поход�ть із непідпи�аних доменів"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr "Потребує wpa-�уплікатора"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "Потребує wpa-�уплікатора з підтримкою EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "Потребує wpa-�уплікатора з підтримкою OWE"
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Потребує wpa-�уплікатора з підтримкою SAE"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4519,9 +4666,14 @@ msgstr "Файли resolv і hosts"
 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 "Перезавантажити"
 
@@ -4529,7 +4681,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 "Перезавантажити радіоінтерфей�"
 
@@ -4541,26 +4693,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "Показати/приховати пароль"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Ска�увати"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "Ска�увати зміни"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Помилка запиту на �ка�уванн� зі �тату�ом <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "Відкат конфігурації…"
 
@@ -4576,7 +4728,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:123
 msgid "Route Allowed IPs"
 msgstr "Маршрутизаці� дозволених IP-адре�"
 
@@ -4588,7 +4740,7 @@ 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 "Служба оголошень маршрутизатора"
 
@@ -4623,7 +4775,7 @@ msgstr "Виконати перевірку файлової �и�теми пе
 msgid "Run filesystem check"
 msgstr "Виконати перевірку файлової �и�теми"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Помилка виконанн�"
 
@@ -4640,15 +4792,15 @@ msgstr ""
 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"
 
@@ -4657,9 +4809,9 @@ msgstr "Ім'� кори�тувача SSH"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4668,17 +4820,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "Зберегти"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Зберегти і за�то�увати"
@@ -4695,24 +4849,20 @@ msgstr "Зберегти вмі�т mtdblock"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Заплановані завданн�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "Секцію додано"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "Секцію видалено"
 
@@ -4730,12 +4880,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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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"
@@ -4743,20 +4899,16 @@ 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: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 "Тип �ерві�у"
 
@@ -4764,15 +4916,15 @@ msgstr "Тип �ерві�у"
 msgid "Services"
 msgstr "Серві�и"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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)."
@@ -4780,15 +4932,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-�ервера"
 
@@ -4802,7 +4957,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:959
 msgid "Short Preamble"
 msgstr "Коротка преамбула"
 
@@ -4814,21 +4969,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr "Сигнал / шум"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Затуханн� �игналу (SATN)"
@@ -4862,11 +5019,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Програмово реалізований VLAN"
@@ -4911,7 +5064,7 @@ msgstr "Визначає каталог, до �кого приєднаний п
 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"
@@ -4919,7 +5072,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"
@@ -4927,11 +5080,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:760
+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)."
@@ -4939,7 +5102,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)."
@@ -4947,28 +5110,29 @@ 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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "Розпочато �кануванн� бездротових мереж..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "Запу�к"
@@ -4985,11 +5149,12 @@ msgstr "Статичні маршрути IPv6"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Статична адре�а"
@@ -5005,19 +5170,20 @@ 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:976
 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:745
 #: 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 "Зупинити"
 
@@ -5030,6 +5196,7 @@ msgid "Strong"
 msgstr "Ви�ока"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "�аді�лати"
 
@@ -5049,43 +5216,45 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr "Символічне по�иланн�"
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr "Синхронізувати з NTP-�ервером"
@@ -5128,6 +5297,8 @@ 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"
@@ -5150,7 +5321,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 "Цільова мережа"
 
@@ -5158,30 +5329,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!"
@@ -5189,21 +5337,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5219,7 +5366,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5243,6 +5390,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"
@@ -5267,6 +5420,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "�аразі в цій �и�темі активні такі правила."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "�аданий відкритий SSH-ключ вже було додано."
@@ -5279,35 +5436,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:1794
+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 "
@@ -5325,10 +5482,9 @@ 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:1150
+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!"
@@ -5366,7 +5522,7 @@ msgstr ""
 "Завантажений файл образу не мі�тить підтримуваний формат. Переконайте��, що "
 "ви вибираєте універ�альний формат образу дл� вашої платформи."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "�емає жодних активних оренд"
 
@@ -5375,18 +5531,10 @@ msgstr "�емає жодних активних оренд"
 msgid "There are no active leases."
 msgstr "�ктивних оренд немає."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5398,10 +5546,18 @@ 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/wireless.js:1432
+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 "
@@ -5422,7 +5578,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"
@@ -5430,7 +5586,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."
@@ -5438,7 +5594,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>"
@@ -5454,24 +5610,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 ""
@@ -5488,8 +5644,8 @@ msgstr "У цьому Ñ�пиÑ�ку наведено працюючі наразÑ
 msgid "This page gives an overview over currently active network connections."
 msgstr "Ц� �торінка надає огл�д поточних активних мережевих підключень."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5499,7 +5655,7 @@ msgstr "Ц� �екці� поки що не мі�тить значень"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr "Інтервал ча�у дл� зміни ключа GTK"
 
@@ -5507,7 +5663,7 @@ msgstr "Інтервал ча�у дл� зміни ключа GTK"
 msgid "Timezone"
 msgstr "Ча�овий по��"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "До входу…"
 
@@ -5522,7 +5678,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 "Тоновий"
 
@@ -5546,55 +5702,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "Тип"
 
@@ -5602,19 +5744,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB-порт"
 
@@ -5644,10 +5787,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"
@@ -5657,21 +5802,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 "�едо�тупні �екунди (<abbr title=\"Unavailable Seconds\">UAS</abbr>)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "�евідомо"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "�евідома помилка (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "�евідомий код помилки"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "�екерований"
@@ -5685,18 +5840,25 @@ msgstr "Демонтувати"
 msgid "Unnamed key"
 msgstr "Безіменний ключ"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 "�епідтримуваний тип протоколу."
@@ -5719,11 +5881,30 @@ 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:1698
+msgid "Upload file"
+msgstr "Відвантажити файл"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr "Відвантажити файл…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5733,42 +5914,40 @@ msgstr "Ча� безперервної роботи"
 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"
 
@@ -5780,64 +5959,61 @@ 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 "Викори�товувати таблицю маршрутизації"
 
@@ -5852,17 +6028,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:1257
 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:1313
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5871,71 +6050,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"
 
@@ -5943,41 +6119,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5993,7 +6165,7 @@ msgstr "Очікуємо, доки зміни наберуть чинно�ті.
 msgid "Waiting for command to complete..."
 msgstr "Очікуємо завершенн� виконанн� команди..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Очікуванн� на за�то�уванн� конфігурації… %d c"
 
@@ -6015,7 +6187,7 @@ msgstr ""
 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:1339
 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 "
@@ -6026,61 +6198,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Бездротовий адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "Бездротову мережу ввімкнено"
 
@@ -6092,12 +6265,20 @@ msgstr "Запи�увати отримані DNS-запити до �и�тем
 msgid "Write system log to file"
 msgstr "Запи�увати cи�темний журнал до файлу"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -6138,18 +6319,14 @@ msgstr "Розмір ZRam"
 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:1029
+#: 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 "авто"
 
@@ -6157,11 +6334,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 "з'єд. мо�том"
 
@@ -6177,22 +6354,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
@@ -6204,22 +6380,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "минув"
 
@@ -6237,25 +6417,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 "гібридний режим"
 
@@ -6263,6 +6439,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
@@ -6303,21 +6483,18 @@ 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:1344
 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 "нема з'єднанн�"
 
@@ -6325,7 +6502,7 @@ msgstr "нема з'єднанн�"
 msgid "non-empty value"
 msgstr "непу�те значенн�"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "нема нічого"
 
@@ -6335,7 +6512,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6350,10 +6529,6 @@ msgstr "вимкнено"
 msgid "on"
 msgstr "увімкнено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "відкрита"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6371,66 +6546,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6447,7 +6622,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 "не позначено"
 
@@ -6528,8 +6703,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 "дій�на дата (РРРР-ММ-ДД)"
 
@@ -6566,7 +6741,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 \".\")"
 
@@ -6579,11 +6754,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 �имволів"
 
@@ -6599,14 +6774,19 @@ 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/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
@@ -6616,3 +6796,9 @@ msgstr "так"
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:20
 msgid "« Back"
 msgstr "« �азад"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Комутатор %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLAN на %q (%s)"
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 2b1d0bb355..242414e0d5 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -12,7 +12,7 @@ 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 ""
 
@@ -20,11 +20,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,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:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "--tùy chỉnh--"
@@ -98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Dịch vụ căn bản đặt Identifier\">BSSID</abbr>"
 
@@ -168,11 +169,11 @@ msgid ""
 "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:819
 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:352
+#: 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 +183,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,16 +200,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
@@ -217,7 +218,7 @@ msgstr ""
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -237,69 +238,73 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 ""
 
@@ -313,12 +318,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "�iểm truy cập"
 
@@ -349,35 +354,47 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -389,10 +406,15 @@ msgstr ""
 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 ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
@@ -424,7 +446,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 ""
 
@@ -434,12 +456,12 @@ msgid "Administration"
 msgstr "Quản trị"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +475,14 @@ msgstr ""
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -481,21 +505,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "Chỉ cho phép danh sách liệt kê"
 
@@ -520,94 +542,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -619,20 +641,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 +648,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -652,8 +660,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 +670,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr ""
@@ -677,16 +685,16 @@ 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:1405
 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 ""
 
@@ -708,17 +716,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 +771,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -789,14 +799,6 @@ 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 ""
@@ -814,11 +816,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -835,16 +837,16 @@ msgid ""
 "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 ""
@@ -853,55 +855,61 @@ msgstr ""
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 ""
 
@@ -925,7 +933,7 @@ msgstr "chuá»—i"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "Thay đổi"
 
@@ -933,7 +941,7 @@ msgstr "Thay đổi"
 msgid "Changes applied."
 msgstr "Thay đổi đã áp dụng"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr ""
 
@@ -946,20 +954,14 @@ 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:1598
 #: 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 +970,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -980,8 +982,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:1809
 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 +991,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:833
 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:1022
 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,14 +1017,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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 ""
 
@@ -1031,12 +1033,12 @@ msgstr ""
 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"
@@ -1050,11 +1052,8 @@ msgstr ""
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1067,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-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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1087,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,77 +1103,73 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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"
-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:173
@@ -1180,6 +1180,10 @@ msgstr ""
 msgid "Cron Log Level"
 msgstr ""
 
+#: 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
@@ -1189,7 +1193,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 +1203,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1211,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 ""
 
@@ -1267,7 +1272,7 @@ msgstr ""
 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 ""
 
@@ -1279,15 +1284,15 @@ msgstr ""
 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 +1301,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1317,37 +1322,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1355,13 +1363,13 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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"
 
@@ -1370,18 +1378,30 @@ msgstr "Xóa"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "Mô tả"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "Thiết kế"
@@ -1400,10 +1420,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:81
+#: 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 +1433,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1427,58 +1458,59 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1488,34 +1520,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1540,10 +1571,18 @@ msgstr ""
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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"
@@ -1552,7 +1591,7 @@ msgstr "Domain yêu cầu"
 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 ""
 
@@ -1576,11 +1615,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1596,40 +1635,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:1370
 msgid "EAP-Method"
 msgstr "EAP-Method"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "Chỉnh sửa"
 
@@ -1639,50 +1679,51 @@ 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:717
+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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 ""
 
@@ -1690,7 +1731,7 @@ msgstr ""
 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 ""
 
@@ -1698,31 +1739,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1771,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1738,48 +1779,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1795,6 +1840,11 @@ msgstr ""
 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
@@ -1808,12 +1858,12 @@ msgstr "Lá»—i"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: 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:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Bộ chuyển đảo ethernet"
@@ -1826,6 +1876,10 @@ msgstr ""
 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,20 +1888,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1863,30 +1917,42 @@ msgstr ""
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 ""
@@ -1905,6 +1971,7 @@ msgstr "Filter private"
 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 +1982,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 +1994,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:73
 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 +2006,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 ""
 
@@ -1971,31 +2038,31 @@ msgstr ""
 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:781
 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:1030
 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:1031
 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:1032
 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 +2070,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 +2078,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 +2086,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:808
 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:773
 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:86
 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,6 +2139,7 @@ msgid "Gateway ports"
 msgstr ""
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2084,11 +2147,10 @@ msgstr ""
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr ""
 
@@ -2096,7 +2158,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2104,10 +2166,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
@@ -2116,7 +2174,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 +2185,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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"
@@ -2170,9 +2224,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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Giấu <abbr title=\"Chế độ mở rộng đặt Identifier\">ESSID</abbr>"
 
@@ -2183,6 +2235,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2190,7 +2243,7 @@ msgstr ""
 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,7 +2251,7 @@ 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 ""
 
@@ -2211,28 +2264,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2255,6 +2308,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 +2320,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 +2332,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,16 +2356,16 @@ 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 ""
 
@@ -2317,6 +2374,7 @@ msgstr ""
 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 +2389,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 +2411,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 +2423,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 +2435,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 +2457,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 +2482,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:1462
 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 +2527,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 ""
 
@@ -2506,7 +2578,7 @@ msgstr ""
 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"
 
@@ -2528,12 +2600,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 ""
 
@@ -2545,19 +2617,21 @@ msgstr ""
 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 +2639,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
 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:791
 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:953
 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 +2719,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2658,15 +2767,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2683,15 +2792,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr ""
 
@@ -2699,33 +2808,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 ""
 
@@ -2746,12 +2856,12 @@ 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:370
-#: 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 ""
 
@@ -2765,24 +2875,24 @@ msgstr "Leasefile"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "
 
@@ -2810,7 +2920,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link On"
 
@@ -2820,7 +2930,7 @@ msgid ""
 "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:1361
 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 +2939,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:1365
 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,7 +2948,7 @@ 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 ""
 
@@ -2854,7 +2964,7 @@ msgstr ""
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2885,7 +2995,11 @@ msgstr ""
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2895,20 +3009,20 @@ 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 ""
 
@@ -2916,7 +3030,7 @@ msgstr ""
 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 ""
 
@@ -2953,10 +3067,6 @@ msgstr ""
 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:167
 msgid "Log output level"
 msgstr ""
@@ -2981,11 +3091,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"
@@ -2994,31 +3106,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +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:68
 msgid "MTU"
 msgstr ""
 
@@ -3047,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3064,7 +3177,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3080,25 +3193,23 @@ msgstr ""
 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:760
+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
@@ -3117,42 +3228,43 @@ msgstr "Bá»™ nhá»›"
 msgid "Memory usage (%)"
 msgstr "Memory usage (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Chế độ"
@@ -3161,31 +3273,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -3193,7 +3304,7 @@ msgstr "Monitor"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3256,27 +3367,28 @@ 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:1313
 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 ""
 
@@ -3284,18 +3396,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr ""
 
@@ -3305,7 +3414,8 @@ msgstr "Sự đi�u hướng"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3330,33 +3440,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3365,18 +3493,6 @@ msgstr ""
 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,6 +3500,10 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3392,19 +3512,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 ""
 
@@ -3424,8 +3544,8 @@ msgstr ""
 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 ""
 
@@ -3437,22 +3557,26 @@ 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:170
@@ -3471,55 +3595,42 @@ msgstr ""
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3652,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:756
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3688,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3631,7 +3743,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 +3752,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:953
 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 +3804,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Nhìn chung"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3838,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,63 +3849,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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ã"
 
@@ -3797,11 +3915,11 @@ msgstr "Mật mã"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3812,7 +3930,7 @@ msgstr ""
 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 ""
 
@@ -3820,27 +3938,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3858,7 +3976,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 +3985,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:86
 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 +4001,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3891,7 +4013,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 +4024,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
@@ -3923,15 +4049,15 @@ msgstr "Chính sách"
 msgid "Port"
 msgstr "Cá»­a "
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3943,11 +4069,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 ""
 
@@ -3955,16 +4081,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:114
 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"
@@ -3974,12 +4100,11 @@ msgstr ""
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4000,35 +4125,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4040,15 +4159,15 @@ 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 ""
@@ -4059,28 +4178,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4090,31 +4210,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4132,17 +4256,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 ""
 
@@ -4166,7 +4284,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4188,21 +4306,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:98
+#: 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:56
 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 ""
 
@@ -4210,80 +4322,98 @@ 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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4295,7 +4425,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4319,9 +4473,14 @@ msgstr ""
 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 ""
 
@@ -4329,7 +4488,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 ""
 
@@ -4341,26 +4500,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revert"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4376,7 +4535,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4388,7 +4547,7 @@ 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 ""
 
@@ -4423,7 +4582,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4440,15 +4599,15 @@ msgstr ""
 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 ""
 
@@ -4457,9 +4616,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4468,17 +4627,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "LÆ°u"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Lưu & áp dụng "
@@ -4495,24 +4656,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr ""
 
@@ -4527,31 +4684,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 ""
 
@@ -4559,29 +4718,32 @@ msgstr ""
 msgid "Services"
 msgstr "Dịch vụ "
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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 ""
 
@@ -4593,7 +4755,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4605,21 +4767,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4653,11 +4817,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4699,56 +4859,64 @@ msgstr ""
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr ""
@@ -4765,11 +4933,12 @@ msgstr "Static IPv6 Routes"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
@@ -4781,19 +4950,20 @@ msgid ""
 "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:976
 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:745
 #: 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 ""
 
@@ -4806,6 +4976,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "Trình "
 
@@ -4825,41 +4996,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4902,6 +5075,8 @@ 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"
@@ -4924,7 +5099,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 ""
 
@@ -4932,40 +5107,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4979,7 +5138,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -4999,6 +5158,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"
@@ -5019,6 +5184,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5029,33 +5198,35 @@ msgid ""
 "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:1794
+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 "
@@ -5065,9 +5236,8 @@ 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:1150
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
@@ -5104,7 +5274,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:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5113,16 +5283,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5132,10 +5296,18 @@ 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/wireless.js:1432
+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 "
@@ -5150,19 +5322,19 @@ 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>"
@@ -5176,20 +5348,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 ""
@@ -5207,8 +5379,8 @@ 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:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5218,7 +5390,7 @@ msgstr "Phần này chưa có giá trị nào"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5226,7 +5398,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "Múi gi� "
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5237,7 +5409,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 ""
 
@@ -5261,55 +5433,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "
 
@@ -5317,19 +5475,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5359,10 +5518,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 ""
@@ -5372,21 +5533,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5400,18 +5571,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 ""
@@ -5431,11 +5609,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5445,42 +5639,40 @@ msgstr "Uptime"
 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 ""
 
@@ -5492,64 +5684,61 @@ 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 ""
 
@@ -5566,81 +5755,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:1257
 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:1313
 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)"
-msgstr ""
-
 #: 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 ""
 
@@ -5648,41 +5834,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5696,7 +5878,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5717,7 +5899,7 @@ msgstr ""
 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:1339
 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 "
@@ -5725,61 +5907,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: 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:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr ""
 
@@ -5791,12 +5974,18 @@ msgstr ""
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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,18 +6024,14 @@ msgstr ""
 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:1029
+#: 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"
 
@@ -5855,11 +6040,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 ""
 
@@ -5875,22 +6060,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
@@ -5902,22 +6086,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr ""
 
@@ -5935,25 +6123,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 ""
 
@@ -5961,6 +6145,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
@@ -5999,21 +6187,18 @@ msgstr ""
 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -6021,7 +6206,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "không "
 
@@ -6031,7 +6216,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6046,10 +6233,6 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6067,66 +6250,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6143,7 +6326,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 ""
 
@@ -6224,8 +6407,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 ""
 
@@ -6262,7 +6445,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 ""
 
@@ -6275,11 +6458,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 ""
 
@@ -6295,14 +6478,19 @@ 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/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
@@ -6313,6 +6501,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 ee14379385..48d64a4e87 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -13,7 +13,7 @@ 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"
 
@@ -21,11 +21,11 @@ msgstr "%.1f dB"
 msgid "%d Bit"
 msgstr "%d Bit"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +63,19 @@ msgid "-- Additional Field --"
 msgstr "-- 更多选项 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 自定义 --"
@@ -98,7 +98,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr "0 = �使用 RSSI 阈值，1 = 驱动默认值"
 
@@ -110,10 +110,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:1321
 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,35 +123,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr "802.11r 快速切�"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "802.11w 关� SA 查询最大超时"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w 管�帧�护"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr "802.11w 最大超时"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -170,11 +171,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:819
 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:352
+#: 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 +185,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,17 +201,17 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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> �称"
 
@@ -219,7 +220,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> �称"
 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:373
+#: 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>"
 
@@ -242,62 +243,66 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +311,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 设备��"
 
@@ -321,12 +326,12 @@ msgstr "ATU-C 系统供应商 ID"
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "接入点 AP"
 
@@ -357,35 +362,47 @@ msgstr "已分�的 DHCP 租约"
 msgid "Active DHCPv6 Leases"
 msgstr "已分�的 DHCPv6 租约"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -397,10 +414,15 @@ msgstr "添加密钥"
 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 "添加新接�…"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "�外的 HOSTS 文件"
@@ -432,7 +454,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 "接入本地中继桥的地�"
 
@@ -442,12 +464,12 @@ msgid "Administration"
 msgstr "管��"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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,12 +483,14 @@ msgstr "总�射功率（ACTATP）"
 msgid "Alert"
 msgstr "警戒"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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\" 的别�"
@@ -489,21 +513,19 @@ msgstr "顺�分� IP"
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "仅�许列表内"
 
@@ -528,95 +550,95 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr "匿�身份"
 
@@ -628,20 +650,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 +657,11 @@ msgstr "天线�置"
 msgid "Any zone"
 msgstr "任�区域"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "应用请求失败，状� <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -661,8 +669,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 +679,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "已连接站点"
@@ -686,16 +694,16 @@ 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:1405
 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 "认�类型"
 
@@ -717,17 +725,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 +780,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -798,14 +808,6 @@ 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 "备份"
@@ -823,11 +825,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:784
 msgid "Beacon Interval"
 msgstr "Beacon é—´éš”"
 
@@ -846,16 +848,16 @@ msgid ""
 "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 "传输速率"
@@ -864,55 +866,61 @@ msgstr "传输速率"
 msgid "Bogus NX Domain Override"
 msgstr "忽略虚�空域�解�"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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 "分类"
 
@@ -936,7 +944,7 @@ msgstr "链"
 msgid "Change login password"
 msgstr "更改登录密�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "更改数"
 
@@ -944,7 +952,7 @@ msgstr "更改数"
 msgid "Changes applied."
 msgstr "更改已应用。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "更改已��。"
 
@@ -957,20 +965,14 @@ 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:1598
 #: 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 +981,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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "选中此选项以从无线中删除现有网络。"
 
@@ -991,8 +993,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:1809
 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 +1004,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:833
 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:1022
 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,14 +1032,14 @@ msgstr ""
 "�击“�存 mtdblock�以下载指定的 mtdblock 文件。（注�：此功能适用于专业人"
 "士�）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1046,12 +1048,12 @@ msgstr "请求 DHCP 时��的客户端 ID"
 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"
@@ -1065,11 +1067,8 @@ msgstr "关闭列表…"
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +1082,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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1105,14 @@ msgstr ""
 "�度。此解决方法�能会导致互�作性问题，并�低密钥�商的��性，特别是在��"
 "负载较�的环境中。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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 +1121,52 @@ msgstr "�置失败"
 msgid "Configuration files will be kept"
 msgstr "将�留�置文件"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "�置已应用。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "�置已回滚�"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1161,36 +1175,22 @@ 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1200,6 +1200,10 @@ msgstr "致命错误"
 msgid "Cron Log Level"
 msgstr "Cron 日志级别"
 
+#: 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
@@ -1209,7 +1213,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 +1224,53 @@ msgid ""
 msgstr ""
 "自定义文件（�书�脚本）会�留在系统上。若无需�留，请先执行��出厂设置。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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 �务"
 
@@ -1286,7 +1291,7 @@ msgstr "DNS"
 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"
 
@@ -1298,15 +1303,15 @@ msgstr "DNSSEC"
 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 +1320,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:962
 msgid "DTIM Interval"
 msgstr "DTIM é—´éš”"
 
@@ -1336,37 +1341,40 @@ msgstr "数�速率"
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1376,13 +1384,13 @@ msgstr ""
 "示通告��的 DNS �务器给客户端。"
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "删除"
 
@@ -1391,18 +1399,30 @@ msgstr "删除"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "�述"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "主题"
@@ -1421,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:81
+#: 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 +1454,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "无法连接到设备"
 
@@ -1448,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 "网络诊断"
 
-#: 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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,33 +1506,34 @@ 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr "在低 Ack 应答时断开连接"
 
@@ -1511,34 +1543,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1562,10 +1593,18 @@ msgstr "�转�公共域��务器无法回应的请求"
 msgid "Do not forward reverse lookups for local networks"
 msgstr "�转�本地网络的��查询"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr "您真的�删除以下 SSH 密钥�？"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 "忽略空域�解�"
@@ -1574,7 +1613,7 @@ msgstr "忽略空域�解�"
 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 "�止分片"
 
@@ -1597,11 +1636,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1617,40 +1656,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:1370
 msgid "EAP-Method"
 msgstr "EAP 类型"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "编辑"
 
@@ -1660,51 +1700,52 @@ 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:717
 msgid "Edit this network"
 msgstr "编辑此网络"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 "�用巨型帧�传"
 
@@ -1712,7 +1753,7 @@ msgstr "�用巨型帧�传"
 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"
 
@@ -1720,31 +1761,31 @@ msgstr "�用�个 DES"
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "�用 WPS 一键加密按钮，需� WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1793,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:712
 msgid "Enable this network"
 msgstr "�用此网络"
 
@@ -1760,48 +1801,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr "端点端�"
 
@@ -1817,6 +1862,11 @@ msgstr "输入自定义值"
 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
@@ -1830,12 +1880,12 @@ msgstr "错误"
 msgid "Errored seconds (ES)"
 msgstr "错误秒数（ES）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "以太网适�器"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "以太网交�机"
@@ -1848,6 +1898,10 @@ msgstr "排除接�"
 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,20 +1910,20 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr "外部 <abbr title=\"R1 Key Holder\">R1KH</abbr> 列表"
 
@@ -1885,30 +1939,42 @@ msgstr "外部系统日志�务器端�"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr "FT �议"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "文件"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 "�客户端通告的�动镜�文件�"
@@ -1927,6 +1993,7 @@ msgstr "过滤本地包"
 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 +2004,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 +2016,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:73
 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 +2028,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 "固件文件"
 
@@ -1993,31 +2060,31 @@ msgstr "刷新�作"
 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:781
 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:1030
 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:1031
 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:1032
 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 +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 "强制使用 NAT-T"
 
@@ -2033,7 +2100,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 +2108,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:808
 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:773
 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:86
 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"
 
@@ -2101,6 +2161,7 @@ msgid "Gateway ports"
 msgstr "网关端�"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2108,11 +2169,10 @@ msgstr "网关端�"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "基本设置"
 
@@ -2120,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:1339
 msgid "Generate PMK locally"
 msgstr "本地生� PMK"
 
@@ -2128,10 +2188,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "由于密�验��匹�，密�没有更改�"
@@ -2140,7 +2196,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 +2207,29 @@ msgstr "全局网络选项"
 msgid "Go to password configuration..."
 msgstr "跳转到密��置页…"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 "挂起"
@@ -2192,9 +2244,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "�� <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2205,6 +2255,7 @@ 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:1939
 msgid "Host"
 msgstr "主机"
 
@@ -2212,7 +2263,7 @@ msgstr "主机"
 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 "主机到期超时"
 
@@ -2220,7 +2271,7 @@ 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 标签内容"
 
@@ -2233,28 +2284,28 @@ msgstr "Host-Uniq 标签内容"
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 �议"
 
@@ -2277,6 +2328,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 +2340,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 +2352,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,16 +2376,16 @@ 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"
 
@@ -2339,6 +2394,7 @@ msgstr "IPv4+IPv6"
 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 +2409,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 +2431,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 +2443,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 +2455,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 +2477,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 +2502,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:1462
 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 +2547,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 �务器地�"
 
@@ -2527,7 +2597,7 @@ msgstr ""
 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 "忽略此接�"
 
@@ -2551,12 +2621,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 "活动超时"
 
@@ -2568,19 +2638,21 @@ msgstr "入站："
 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 +2660,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
 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:791
 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:953
 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 +2740,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "隔离客户端"
 
@@ -2678,15 +2785,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr "加入网络：%q"
 
@@ -2703,15 +2810,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "密� #%d"
 
@@ -2719,33 +2826,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"
 
@@ -2766,12 +2874,12 @@ 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:370
-#: 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 "租期"
 
@@ -2785,24 +2893,24 @@ msgstr "租约文件"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "客户数"
 
@@ -2830,7 +2938,7 @@ msgstr "线路状�"
 msgid "Line Uptime"
 msgstr "线路�行时间"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "活动链接"
 
@@ -2841,7 +2949,7 @@ msgid ""
 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:1361
 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 +2961,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:1365
 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,7 +2974,7 @@ 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 密钥文件列表"
 
@@ -2882,7 +2990,7 @@ msgstr "�许虚�空域��应的�务器列表"
 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:51
 msgid "Listen Port"
 msgstr "监�端�"
 
@@ -2913,7 +3021,11 @@ msgstr "加载中"
 msgid "Loading SSH keys…"
 msgstr "正在加载 SSH 密钥…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2923,20 +3035,20 @@ 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 地�"
 
@@ -2944,7 +3056,7 @@ msgstr "本地 IPv6 地�"
 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 "本地�动脚本"
 
@@ -2981,10 +3093,6 @@ msgstr "如果有多个 IP å�¯ç”¨ï¼Œåˆ™æ ¹æ�®è¯·æ±‚æ�¥æº�çš„å­�网æ�¥æœ¬åœ°åŒ–ä¸
 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:167
 msgid "Log output level"
 msgstr "日志记录等级"
@@ -3009,11 +3117,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"
@@ -3022,31 +3132,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3174,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:68
 msgid "MTU"
 msgstr "MTU"
 
@@ -3075,16 +3185,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3092,7 +3203,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr "�许的最大监�间隔"
 
@@ -3108,27 +3219,23 @@ msgstr "�许的最大并� DNS 查询数"
 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:760
+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
@@ -3147,42 +3254,43 @@ msgstr "内存"
 msgid "Memory usage (%)"
 msgstr "内存使用率（%）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "模�"
@@ -3191,31 +3299,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "监�"
 
@@ -3223,7 +3330,7 @@ msgstr "监�"
 msgid "More Characters"
 msgstr "需�更多字符"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3284,27 +3391,28 @@ 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:1313
 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 域"
 
@@ -3312,18 +3420,15 @@ msgstr "NT 域"
 msgid "NTP server candidates"
 msgstr "候选 NTP �务器"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "新网络的�称"
 
@@ -3333,7 +3438,8 @@ msgstr "导航"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3358,33 +3464,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 "无匹�的�缀委托"
@@ -3393,18 +3517,6 @@ msgstr "无匹�的�缀委托"
 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,6 +3524,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "未设置密��"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr "当�还没有公钥。"
@@ -3420,19 +3536,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 "噪声"
 
@@ -3452,8 +3568,8 @@ msgstr "�抢� CRC 错误（CRC_P）"
 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 "æ— "
 
@@ -3465,23 +3581,27 @@ 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:170
 msgid "Notice"
@@ -3499,53 +3619,42 @@ msgstr "缓存的 DNS �目数�（最大 10000，0 表示�缓存）"
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3676,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:756
 msgid "Operating frequency"
 msgstr "工作频率"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "选项已更改"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3716,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3642,7 +3752,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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "�选，用于传出和传入数�包的 UDP 端�。"
 
@@ -3663,7 +3773,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 +3782,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:953
 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 +3834,33 @@ msgstr "�设内部路由表"
 msgid "Overview"
 msgstr "总览"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3868,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,63 +3879,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "密�"
 
@@ -3829,11 +3945,11 @@ msgstr "密�"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr "内部�钥的密�"
 
@@ -3844,7 +3960,7 @@ msgstr "内部�钥的密�"
 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"
 
@@ -3852,27 +3968,27 @@ msgstr "密� 2"
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr "内部�钥的路径"
 
@@ -3890,7 +4006,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 +4015,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:86
 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 +4031,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:133
 msgid "Persistent Keep Alive"
 msgstr "�续 Keep-Alive"
 
@@ -3923,7 +4043,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 +4054,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
@@ -3955,15 +4079,15 @@ msgstr "ç­–ç•¥"
 msgid "Port"
 msgstr "端�"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3975,11 +4099,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"
 
@@ -3987,16 +4111,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:114
 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"
@@ -4006,12 +4130,11 @@ msgstr "在指定数é‡�çš„ LCP å“�应故障å�Žå�‡å®šé“¾è·¯å·²æ–­å¼€ï¼Œ0 为忽ç•
 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:949
 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:46
 msgid "Private Key"
 msgstr "�钥"
 
@@ -4032,35 +4155,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr "公钥"
 
@@ -4074,15 +4191,15 @@ 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 "质�"
@@ -4094,28 +4211,29 @@ msgid ""
 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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4125,31 +4243,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 �求，�则请留空"
 
@@ -4168,19 +4290,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 "确定�切��议？"
 
@@ -4204,7 +4318,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr "�关�截止时间"
 
@@ -4226,21 +4340,15 @@ msgstr "正在��…"
 msgid "Reboots the operating system of your device"
 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: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:56
 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 "�连此接�"
 
@@ -4248,73 +4356,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:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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 "
@@ -4323,7 +4429,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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4337,7 +4463,31 @@ msgid ""
 "come from unsigned domains"
 msgstr "需�上级支� DNSSEC，验�未签�的�应确实是�自未签�的域�"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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,9 +4511,14 @@ msgstr "HOSTS 和解�文件"
 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 "��"
 
@@ -4371,7 +4526,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 "��无线接�"
 
@@ -4383,26 +4538,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "显示/�� 密�"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "��"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr "��更改"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "��请求失败，状� <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "正在���置…"
 
@@ -4418,7 +4573,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:123
 msgid "Route Allowed IPs"
 msgstr "路由�许的 IP"
 
@@ -4430,7 +4585,7 @@ 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 "路由通告�务"
 
@@ -4463,7 +4618,7 @@ msgstr "挂载设备��行文件系统检查"
 msgid "Run filesystem check"
 msgstr "文件系统检查"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4480,15 +4635,15 @@ msgstr "SNR"
 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 用户�"
 
@@ -4497,9 +4652,9 @@ msgstr "SSH 用户�"
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4508,17 +4663,19 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "交�分区"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "�存"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "�存并应用"
@@ -4535,24 +4692,20 @@ msgstr "�存 mtdblock 内容"
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "计划任务"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "添加的节点"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "移除的节点"
 
@@ -4569,31 +4722,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 "�务类型"
 
@@ -4601,15 +4756,15 @@ msgstr "�务类型"
 msgid "Services"
 msgstr "�务"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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)."
@@ -4617,15 +4772,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 �务器"
 
@@ -4637,7 +4795,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:959
 msgid "Short Preamble"
 msgstr "Short Preamble"
 
@@ -4649,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "信�衰�（SATN）"
@@ -4697,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "软件 VLAN"
@@ -4745,56 +4901,64 @@ msgstr "指定设备的挂载目录"
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "正在�动无线扫�…"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "�动项"
@@ -4811,11 +4975,12 @@ msgstr "�� IPv6 路由"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "��地�"
@@ -4829,19 +4994,20 @@ 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:976
 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:745
 #: 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 "关闭"
 
@@ -4854,6 +5020,7 @@ msgid "Strong"
 msgstr "强"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "�交"
 
@@ -4873,41 +5040,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr "与 NTP �务器�步"
@@ -4950,6 +5119,8 @@ 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"
@@ -4972,7 +5143,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 "目标网络"
 
@@ -4980,43 +5151,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5032,7 +5184,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5050,6 +5202,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"
@@ -5072,6 +5230,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "以下规则当�在系统中处于活动状�。"
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr "已添加给定的 SSH 公钥。"
@@ -5082,33 +5244,35 @@ msgid ""
 "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:1794
+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 "
@@ -5122,10 +5286,9 @@ 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:1150
+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!"
@@ -5157,7 +5320,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr "�支�所上传的映�文件格�，请选择适�当�平�的通用映�文件。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5166,16 +5329,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "没有已分�的租约。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5185,10 +5342,18 @@ 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/wireless.js:1432
+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 "
@@ -5205,20 +5370,20 @@ 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>"
@@ -5232,20 +5397,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 的地�"
@@ -5260,8 +5425,8 @@ msgstr "系统中正在�行的进程概况和它们的状�信�。"
 msgid "This page gives an overview over currently active network connections."
 msgstr "活跃的网络连接概况。"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5271,7 +5436,7 @@ msgstr "尚无任何�置"
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr "�新加密 GTK 的时间间隔"
 
@@ -5279,7 +5444,7 @@ msgstr "�新加密 GTK 的时间间隔"
 msgid "Timezone"
 msgstr "时区"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "去登录…"
 
@@ -5292,7 +5457,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"
 
@@ -5316,55 +5481,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "类型"
 
@@ -5372,19 +5523,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB 接�"
 
@@ -5414,10 +5566,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 主机�"
@@ -5427,21 +5581,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "未知"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "未知错误（%s）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "��置�议"
@@ -5455,18 +5619,25 @@ msgstr "�载分区"
 msgid "Unnamed key"
 msgstr "未命�的密钥"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 "�支�的�议类型"
@@ -5488,11 +5659,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5502,42 +5689,40 @@ msgstr "�行时间"
 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"
 
@@ -5549,64 +5734,61 @@ 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 "使用路由表"
 
@@ -5626,11 +5808,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:1257
 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:1313
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5638,71 +5820,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 选项"
 
@@ -5710,41 +5889,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5760,7 +5935,7 @@ msgstr "正在应用更改…"
 msgid "Waiting for command to complete..."
 msgstr "等待命令执行完�…"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5781,7 +5956,7 @@ msgstr "警告：一些未�存的�置将在���丢失�"
 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:1339
 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 "
@@ -5791,61 +5966,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "无线适�器"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "无线网络已�用"
 
@@ -5857,12 +6033,18 @@ msgstr "将收到的 DNS 请求写入系统日志"
 msgid "Write system log to file"
 msgstr "将系统日志写入文件"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5899,18 +6081,14 @@ msgstr "ZRam 大�"
 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:1029
+#: 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 +6096,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 "桥接的"
 
@@ -5938,22 +6116,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
@@ -5965,22 +6142,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "过期时间"
 
@@ -5998,25 +6179,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 "混�模�"
 
@@ -6024,6 +6201,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
@@ -6062,21 +6243,18 @@ msgstr "密钥为 5 或 13 个字符"
 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:1344
 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 "未连接"
 
@@ -6084,7 +6262,7 @@ msgstr "未连接"
 msgid "non-empty value"
 msgstr "�空值"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "æ— "
 
@@ -6094,7 +6272,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6109,10 +6289,6 @@ msgstr "å…³"
 msgid "on"
 msgstr "å¼€"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "开放�"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6130,66 +6306,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6206,7 +6382,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 "未标记"
 
@@ -6287,8 +6463,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）"
 
@@ -6325,7 +6501,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�“*��“#��“!�或“.�）"
 
@@ -6338,11 +6514,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 字符之间的值"
 
@@ -6358,14 +6534,19 @@ 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/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
@@ -6376,6 +6557,221 @@ msgstr "是"
 msgid "« Back"
 msgstr "« �退"
 
+#~ 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 "高级"
 
@@ -6632,9 +7028,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 02751cb161..3a70954d71 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -11,7 +11,7 @@ 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 ""
 
@@ -19,11 +19,11 @@ msgstr ""
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1734
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2189
 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 +61,19 @@ msgid "-- Additional Field --"
 msgstr "-- 更多�項 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1449
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1581
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:308
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:408
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1172
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1568
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:309
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:409
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
 #: 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:409
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:410
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1174
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 自訂 --"
@@ -96,7 +96,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:813
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,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:1321
 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,35 +121,35 @@ 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:1350
 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:1294
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1169
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:1517
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1168
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1547
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1177
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1554
 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:830
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
@@ -166,11 +167,11 @@ msgid ""
 "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:819
 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:352
+#: 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 +181,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,16 +197,16 @@ 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:379
+#: 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:53
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
 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:62
+#: 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> �稱"
 
@@ -214,7 +215,7 @@ msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> �稱"
 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:373
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
@@ -238,61 +239,65 @@ msgstr ""
 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:855
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1600
+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 +306,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,12 +321,12 @@ msgstr ""
 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:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:906
 msgid "Access Point"
 msgstr "存�點 (AP)"
 
@@ -352,35 +357,47 @@ msgstr "已分�的DHCP租用"
 msgid "Active DHCPv6 Leases"
 msgstr "已分�的DHCPv6租用"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2038
-#: 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:2185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: 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:686
-#: modules/luci-base/htdocs/luci-static/resources/form.js:687
+#: modules/luci-base/htdocs/luci-static/resources/form.js:688
+#: modules/luci-base/htdocs/luci-static/resources/form.js:701
 #: modules/luci-base/htdocs/luci-static/resources/form.js:702
-#: modules/luci-base/htdocs/luci-static/resources/form.js:703
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1338
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1327
 #: 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/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/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
@@ -392,10 +409,15 @@ msgstr ""
 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 "增加新界�"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:96
+msgid "Add peer"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "�外的HOST檔案"
@@ -427,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 "存�本地中繼橋接�置"
 
@@ -437,12 +459,12 @@ msgid "Administration"
 msgstr "管�"
 
 #: 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:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 #: 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"
@@ -456,12 +478,14 @@ msgstr ""
 msgid "Alert"
 msgstr "警示"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1713
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1829
 #: 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 ""
@@ -484,21 +508,19 @@ msgstr ""
 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:986
 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:890
 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:766
 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:889
 msgid "Allow listed only"
 msgstr "僅�許列表內"
 
@@ -523,94 +545,94 @@ 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:119
 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:781
 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:1480
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -622,20 +644,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 +651,11 @@ msgstr "天線設定"
 msgid "Any zone"
 msgstr "任��域"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2074
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2529
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1960
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2415
 msgid "Apply unchecked"
 msgstr ""
 
@@ -655,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 ""
@@ -665,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:1947
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "已連接�置"
@@ -680,16 +688,16 @@ 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:1405
 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 ""
 
@@ -711,17 +719,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 +774,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:1600
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -792,14 +802,6 @@ 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 "備份"
@@ -817,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:784
 msgid "Beacon Interval"
 msgstr ""
 
@@ -840,16 +842,16 @@ msgid ""
 "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 "傳輸速率"
@@ -858,55 +860,61 @@ msgstr "傳輸速率"
 msgid "Bogus NX Domain Override"
 msgstr "忽略NX網域解�"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1719
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1835
 #: 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:1692
+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:1784
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
+#: 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:1819
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
 #: 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,7 +938,7 @@ msgstr "�"
 msgid "Change login password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 msgid "Changes"
 msgstr "待修改"
 
@@ -938,7 +946,7 @@ msgstr "待修改"
 msgid "Changes applied."
 msgstr "修改已套用"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2097
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2552
 msgid "Changes have been reverted."
 msgstr "設定值已還原."
 
@@ -951,20 +959,14 @@ 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:1598
 #: 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 +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:1786
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -985,8 +987,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:1809
 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 +998,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:833
 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 +1006,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:1022
 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,14 +1026,14 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2037
-#: 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:2184
+#: 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 "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"
 
@@ -1040,12 +1042,12 @@ msgstr "當�求DHCP時�傳�的用戶識別碼ID"
 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,11 +1061,8 @@ msgstr "關閉清單"
 #: 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:39
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1945
 #: 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 +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:1188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1096,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1837
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2292
 #: 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,78 +1112,74 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2008
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2463
 msgid "Configuration has been applied."
 msgstr "設定值已套用"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1941
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid "Configuration has been rolled back!"
 msgstr "設定值已復原"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
 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:1983
+#: 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:2438
 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:763
 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:1809
 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:173
 msgid "Critical"
@@ -1189,6 +1189,10 @@ msgstr "緊急"
 msgid "Cron Log Level"
 msgstr "Cron日誌等級"
 
+#: 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
@@ -1198,7 +1202,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 +1214,7 @@ msgstr ""
 "已修改的檔案(如憑證和腳本)�能會殘留在系統中.如果���這項�題,您�以先行�"
 "設�置"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
+#: 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 +1222,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:1210
 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:1218
 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:1226
 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:61
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:107
+#: 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:1267
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: 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,7 +1283,7 @@ msgstr "網域�稱伺�器"
 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 ""
 
@@ -1290,15 +1295,15 @@ msgstr ""
 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 +1312,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:962
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1328,37 +1333,40 @@ msgstr ""
 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:1170
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1218
 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:65
+#: 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 "
@@ -1368,13 +1376,13 @@ msgstr ""
 "的DNS伺�器到客戶端."
 
 #: modules/luci-base/htdocs/luci-static/resources/form.js:750
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1002
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1003
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1321
+#: modules/luci-base/htdocs/luci-static/resources/form.js:998
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1004
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1312
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
 #: 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 "刪除"
 
@@ -1383,18 +1391,30 @@ msgstr "刪除"
 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:1649
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1651
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:722
 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:962
 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:105
 msgid "Description"
 msgstr "�述"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+msgid "Deselect"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:223
 msgid "Design"
 msgstr "設計�劃"
@@ -1413,10 +1433,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:81
+#: 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 +1446,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:736
 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:1982
+#: 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:2437
 msgid "Device unreachable!"
 msgstr "無法連線到設備!"
 
@@ -1440,59 +1471,60 @@ 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:1549
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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:972
 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:712
 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-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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1519
 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:986
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
@@ -1502,34 +1534,33 @@ 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:1169
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1948
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1163
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1990
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2310
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1614
 #: 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
 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:769
 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:769
 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
@@ -1553,10 +1584,18 @@ msgstr "��被公用�稱伺�器回應的請求�轉發"
 msgid "Do not forward reverse lookups for local networks"
 msgstr "�本地網域�轉發�解�鎖定"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1634
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1632
+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 "網域必�的"
@@ -1565,7 +1604,7 @@ msgstr "網域必�的"
 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 ""
 
@@ -1589,11 +1628,11 @@ 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:956
+#: modules/luci-base/htdocs/luci-static/resources/form.js:953
 msgid "Drag to reorder"
 msgstr ""
 
@@ -1609,39 +1648,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:1370
 msgid "EAP-Method"
 msgstr "EAP�定驗證方�"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:976
-#: modules/luci-base/htdocs/luci-static/resources/form.js:977
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1247
+#: modules/luci-base/htdocs/luci-static/resources/form.js:973
+#: modules/luci-base/htdocs/luci-static/resources/form.js:974
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1238
 #: 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:719
 msgid "Edit"
 msgstr "編輯"
 
@@ -1651,50 +1691,51 @@ 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:717
 msgid "Edit this network"
 msgstr "修改這個網路"
 
+#: 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:175
 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:714
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:753
 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 "啟用超大訊框�穿"
 
@@ -1702,7 +1743,7 @@ msgstr "啟用超大訊框�穿"
 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 ""
 
@@ -1710,31 +1751,31 @@ msgstr ""
 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:1206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1575
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "啟用 WPS 按鈕, 這需� WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1562
 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 +1783,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:712
 msgid "Enable this network"
 msgstr ""
 
@@ -1750,48 +1791,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:1294
 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:991
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1601
 #: 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:125
 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:129
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1807,6 +1852,11 @@ msgstr ""
 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
@@ -1820,12 +1870,12 @@ msgstr "錯誤"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1731
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1847
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "乙太網路�"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1722
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1838
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "乙太交�器"
@@ -1838,6 +1888,10 @@ msgstr ""
 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,21 +1900,21 @@ 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:1361
 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:1365
 msgid "External R1 Key Holder List"
 msgstr ""
 
@@ -1876,30 +1930,42 @@ msgstr "外部系統日誌伺�器埠號"
 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:1335
 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:1336
 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:1333
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1935
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2390
 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:1556
 msgid "File"
 msgstr "檔案"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1509
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1693
+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 "開機影�檔通知給用戶端"
@@ -1918,6 +1984,7 @@ msgstr "�人�濾器"
 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 +1995,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 +2007,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:73
 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 +2019,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 ""
 
@@ -1984,31 +2051,31 @@ msgstr "執行更新"
 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:781
 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:1030
 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:1031
 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:1032
 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 +2083,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 +2091,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 +2099,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:808
 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:773
 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:86
 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"
 
@@ -2090,6 +2152,7 @@ msgid "Gateway ports"
 msgstr "閘�埠號"
 
 #: 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:111
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
@@ -2097,11 +2160,10 @@ msgstr "閘�埠號"
 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:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:795
 msgid "General Setup"
 msgstr "一般設置"
 
@@ -2109,7 +2171,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:1339
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2117,10 +2179,6 @@ 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
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "�入的密碼���,密碼將�變更"
@@ -2129,7 +2187,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 +2198,29 @@ msgstr "全域網路設定"
 msgid "Go to password configuration..."
 msgstr "�往密碼設定�"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:899
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1417
+#: modules/luci-base/htdocs/luci-static/resources/form.js:896
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1404
 #: 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 ""
@@ -2181,9 +2235,7 @@ msgid ""
 "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:940
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "隱� <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2194,6 +2246,7 @@ 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:1939
 msgid "Host"
 msgstr ""
 
@@ -2201,7 +2254,7 @@ msgstr ""
 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,7 +2262,7 @@ 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 ""
 
@@ -2222,28 +2275,28 @@ msgstr ""
 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:19
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: 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:56
 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 ""
 
@@ -2266,6 +2319,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 +2331,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 +2343,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,16 +2367,16 @@ 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 ""
 
@@ -2328,6 +2385,7 @@ msgstr ""
 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 +2400,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 +2422,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 +2434,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 +2446,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 +2468,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 +2493,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:1462
 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 +2538,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伺�器��將被忽視"
 
@@ -2516,7 +2588,7 @@ msgstr ""
 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 "被忽視的介�"
 
@@ -2538,12 +2610,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 "閒置�期"
 
@@ -2555,19 +2627,21 @@ msgstr "輸入"
 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 +2649,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
 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:791
 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:953
 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 +2729,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:7
+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:77
+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:949
 msgid "Isolate Clients"
 msgstr "隔離用戶端"
 
@@ -2666,15 +2775,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:1671
 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:1608
 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:1813
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2691,15 +2800,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:1235
 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:1260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1262
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1275
 msgid "Key #%d"
 msgstr "鑰匙  #%d"
 
@@ -2707,33 +2816,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,12 +2864,12 @@ 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:370
-#: 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 "租賃時間長度"
 
@@ -2773,24 +2883,24 @@ msgstr "租賃檔案"
 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:1839
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2294
 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 "�制"
 
@@ -2818,7 +2928,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:96
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "�接"
 
@@ -2828,7 +2938,7 @@ msgid ""
 "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:1361
 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 +2947,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:1365
 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,7 +2956,7 @@ 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 ""
 
@@ -2862,7 +2972,7 @@ msgstr "列出供應��NX網域�果的主機群"
 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:51
 msgid "Listen Port"
 msgstr ""
 
@@ -2893,7 +3003,11 @@ msgstr "讀�中"
 msgid "Loading SSH keys…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1252
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1814
+msgid "Loading directory contents…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2903,20 +3017,20 @@ 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��"
 
@@ -2924,7 +3038,7 @@ msgstr "本地IPv6��"
 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 "本地啟動"
 
@@ -2962,10 +3076,6 @@ msgstr "若有多個IPå�¯ç”¨, 本地化主機å��稱端看請求的å­�網路而è¨
 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:167
 msgid "Log output level"
 msgstr "日誌輸出等級"
@@ -2990,11 +3100,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"
@@ -3003,31 +3115,31 @@ 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1938
 #: 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:885
 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:797
 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:892
 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 +3157,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:68
 msgid "MTU"
 msgstr "最大傳輸單�MTU"
 
@@ -3056,16 +3168,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:2036
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2183
 msgid "Master"
 msgstr ""
 
@@ -3073,7 +3186,7 @@ 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:981
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
@@ -3089,25 +3202,23 @@ msgstr "�許�時齊發的DNS請求的最大數�"
 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:760
+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
@@ -3126,42 +3237,43 @@ msgstr "記憶體"
 msgid "Memory usage (%)"
 msgstr "記憶體使用 (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2039
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2186
 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:805
 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:63
 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:1321
 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:800
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1599
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "模�"
@@ -3170,31 +3282,30 @@ 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:2040
-#: 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:2187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Monitor"
 msgstr "監視"
 
@@ -3202,7 +3313,7 @@ msgstr "監視"
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:844
+#: modules/luci-base/htdocs/luci-static/resources/form.js:841
 msgid "More…"
 msgstr ""
 
@@ -3263,27 +3374,28 @@ 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:1313
 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 ""
 
@@ -3291,18 +3403,15 @@ msgstr ""
 msgid "NTP server candidates"
 msgstr "NTP伺�器備�"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:879
+#: modules/luci-base/htdocs/luci-static/resources/form.js:876
 #: 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:60
+#: 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:1788
 msgid "Name of the new network"
 msgstr "新網路的�稱"
 
@@ -3312,7 +3421,8 @@ msgstr "導覽"
 
 #: 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:833
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1937
 #: 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
@@ -3337,33 +3447,51 @@ 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:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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:1048
+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:1759
+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 ""
@@ -3372,18 +3500,6 @@ msgstr ""
 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,6 +3507,10 @@ msgstr ""
 msgid "No password set!"
 msgstr "尚未設定密碼!"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:101
+msgid "No peers defined yet"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
 msgid "No public keys present yet."
 msgstr ""
@@ -3399,19 +3519,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 "雜訊比"
 
@@ -3431,8 +3551,8 @@ msgstr ""
 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 "ç„¡"
 
@@ -3444,22 +3564,26 @@ 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:170
@@ -3478,53 +3602,42 @@ msgstr "快�DNS項目數�(最大值為10000,輸入0代表�快�)"
 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:78
+#: 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:75
+#: 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:361
+#: 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 +3659,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:756
 msgid "Operating frequency"
 msgstr "�作頻率"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1846
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2301
 msgid "Option changed"
 msgstr "�項已變更"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2303
 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:1520
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:63
 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:73
 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 +3695,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:114
 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:123
 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:105
 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:125
 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:68
 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:129
 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:133
 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:51
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3636,7 +3750,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 +3759,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:953
 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 +3811,33 @@ msgstr "覆蓋之�內部使用的路由表"
 msgid "Overview"
 msgstr "�覽"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1601
+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 +3845,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,63 +3856,65 @@ 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:1356
 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-network/htdocs/luci-static/resources/view/network/wireless.js:1498
 #: 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
+#: 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 "密碼"
 
@@ -3802,11 +3922,11 @@ msgstr "密碼"
 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:1398
 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:1455
 msgid "Password of inner Private Key"
 msgstr ""
 
@@ -3817,7 +3937,7 @@ msgstr ""
 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 ""
 
@@ -3825,27 +3945,27 @@ msgstr ""
 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:1380
 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:1386
 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:1392
 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:1437
 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:1443
 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:1449
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3863,7 +3983,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 +3992,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:86
 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 +4008,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:133
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3896,7 +4020,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 +4031,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
@@ -3928,15 +4056,15 @@ msgstr "ç­–ç•¥"
 msgid "Port"
 msgstr "埠"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:139
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
 msgid "Port %s"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: 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 ""
 
@@ -3948,11 +4076,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 ""
 
@@ -3960,16 +4088,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:114
 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"
@@ -3979,12 +4107,11 @@ msgstr "å�‡è‹¥åœ¨çµ¦äºŽå¤šæ¬¡çš„ LCP 呼å�«å¤±æ•—後終點將死, 使用0忽略å
 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:949
 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:46
 msgid "Private Key"
 msgstr ""
 
@@ -4005,35 +4132,29 @@ 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:268
 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:878
 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:110
 msgid "Public Key"
 msgstr ""
 
@@ -4045,15 +4166,15 @@ 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 "�質"
@@ -4064,28 +4185,29 @@ msgid ""
 "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:1344
 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:1350
 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:813
 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:777
 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"
@@ -4095,31 +4217,35 @@ 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:1941
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1194
 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:1202
 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:1186
 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:1170
 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:1178
 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:1162
 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 ""
 
@@ -4137,19 +4263,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 "確定�更��定?"
 
@@ -4173,7 +4291,7 @@ 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:1327
 msgid "Reassociation Deadline"
 msgstr ""
 
@@ -4195,21 +4313,15 @@ msgstr "�新啟動中..."
 msgid "Reboots the operating system of your device"
 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: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:56
 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,80 +4329,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 ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:724
 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:1786
 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:1521
 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:46
 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:110
 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:119
 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:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1103
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1517
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4302,7 +4432,31 @@ msgid ""
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1316
+#: 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:1110
+#: 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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1122
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1115
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: 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:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1125
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1356
 #: 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
@@ -4326,9 +4480,14 @@ msgstr "解�和Hosts檔案"
 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 "�啟"
 
@@ -4336,7 +4495,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 +4507,26 @@ 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-base/htdocs/luci-static/resources/ui.js:115
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
 msgid "Reveal/hide password"
 msgstr "明示/隱� 密碼"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "回溯"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1954
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2106
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2561
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2086
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2541
 msgid "Reverting configuration…"
 msgstr "正在還原設定值..."
 
@@ -4383,7 +4542,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:123
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4395,7 +4554,7 @@ 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 ""
 
@@ -4428,7 +4587,7 @@ msgstr "掛載這個設備�先跑系統檢查"
 msgid "Run filesystem check"
 msgstr "執行系統檢查"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:652
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4445,15 +4604,15 @@ msgstr ""
 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 ""
 
@@ -4462,9 +4621,9 @@ msgstr ""
 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:1597
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "基地��務設定識別碼SSID"
@@ -4473,17 +4632,19 @@ msgstr "基地��務設定識別碼SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1175
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1310
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1167
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1352
 #: 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/htdocs/luci-static/resources/view/system/crontab.js:48
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 #: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
 msgid "Save"
 msgstr "�存"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1304
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1348
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2316
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "�存並啟用"
@@ -4500,24 +4661,20 @@ msgstr ""
 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/htdocs/luci-static/resources/view/system/crontab.js:39
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
 msgid "Scheduled Tasks"
 msgstr "排程任務"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Section added"
 msgstr "新增的�段"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1844
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Section removed"
 msgstr "�段移除"
 
@@ -4532,31 +4689,33 @@ 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:1511
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1804
+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: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 "�務型態"
 
@@ -4564,29 +4723,32 @@ msgstr "�務型態"
 msgid "Services"
 msgstr "��務"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:853
+#: 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伺�器"
 
@@ -4598,7 +4760,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:959
 msgid "Short Preamble"
 msgstr ""
 
@@ -4610,21 +4772,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:1596
 #: 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:1940
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4658,11 +4822,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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4706,56 +4866,64 @@ msgstr "指定這個設備被附掛到那個目錄"
 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:760
+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:1803
 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:2051
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2506
 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:1606
 msgid "Starting wireless scan..."
 msgstr "開始無線掃�..."
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
 msgid "Startup"
 msgstr "開機自動執行"
@@ -4772,11 +4940,12 @@ msgstr "�態IPv6路由"
 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:1266
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1382
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "�態��"
@@ -4790,19 +4959,20 @@ 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:976
 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:745
 #: 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 "�止"
 
@@ -4815,6 +4985,7 @@ msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Submit"
 msgstr "�交"
 
@@ -4834,41 +5005,43 @@ 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:148
+#: 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:1725
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1841
 #: 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-base/htdocs/luci-static/resources/ui.js:1542
+msgid "Symbolic link"
+msgstr ""
+
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
 msgid "Sync with NTP-Server"
 msgstr ""
@@ -4911,6 +5084,8 @@ 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"
@@ -4933,7 +5108,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 ""
 
@@ -4941,47 +5116,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:1788
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4997,7 +5149,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:1942
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2397
 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 "
@@ -5017,6 +5169,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"
@@ -5039,6 +5197,10 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "以下的�則�正作用在系統中."
 
+#: 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:144
 msgid "The given SSH public key has already been added."
 msgstr ""
@@ -5049,34 +5211,35 @@ msgid ""
 "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:1794
+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 "
@@ -5090,10 +5253,9 @@ 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:1150
+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!"
@@ -5127,7 +5289,7 @@ msgid ""
 msgstr ""
 "以上傳的映�檔�包�支�格�. 請確�您�擇的是��您的平�採用的通用映�檔."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:404
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5136,16 +5298,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "租賃尚未啟動."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2066
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2521
 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
@@ -5155,10 +5311,18 @@ 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/wireless.js:1432
+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 "
@@ -5175,13 +5339,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."
@@ -5189,7 +5353,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>"
@@ -5203,20 +5367,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通用��"
@@ -5231,8 +5395,8 @@ msgstr "這清單�供目�正在執行的系統的執行緒和狀態的�覽
 msgid "This page gives an overview over currently active network connections."
 msgstr "這一��供目�正在活動中網路連線的�覽."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:721
-#: modules/luci-base/htdocs/luci-static/resources/form.js:851
+#: modules/luci-base/htdocs/luci-static/resources/form.js:720
+#: modules/luci-base/htdocs/luci-static/resources/form.js:848
 #: 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"
@@ -5242,7 +5406,7 @@ msgstr "這部分尚未有任何設定值."
 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:967
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
@@ -5250,7 +5414,7 @@ msgstr ""
 msgid "Timezone"
 msgstr "時�"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5263,7 +5427,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 ""
 
@@ -5287,55 +5451,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:97
+#: 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:68
+#: 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:93
+#: 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:1728
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1844
 #: 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 "åž‹æ…‹"
 
@@ -5343,19 +5493,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:101
+#: 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:117
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5385,10 +5536,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 ""
@@ -5398,21 +5551,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:1268
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "未知"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1421
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1537
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1265
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1381
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "未託管"
@@ -5426,18 +5589,25 @@ msgstr ""
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1801
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2256
 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 "�支�的�定型態"
@@ -5459,11 +5629,27 @@ 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:1698
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1673
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1618
+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"
@@ -5473,42 +5659,40 @@ msgstr "上傳花費時間"
 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存活時間"
 
@@ -5520,64 +5704,61 @@ 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 "使用路由表"
 
@@ -5597,81 +5778,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:1257
 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:1313
 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�包時�傳�的製造商類別碼"
 
@@ -5679,41 +5857,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:906
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 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:1049
 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:1050
 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:1803
 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:944
 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:1803
 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:1075
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5729,7 +5903,7 @@ msgstr "等待修改被啟用..."
 msgid "Waiting for command to complete..."
 msgstr "等待完整性指令..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2033
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2488
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5750,7 +5924,7 @@ msgstr "警告: 目�存在未儲存的設定,這些設定將會在�置�啟
 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:1339
 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 "
@@ -5758,61 +5932,62 @@ 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:14
 #: 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:1716
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1832
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "無線網�"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1702
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2139
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1818
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2283
 #: 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:796
 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:751
 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:751
 msgid "Wireless network is enabled"
 msgstr "無線網路已啟用"
 
@@ -5824,12 +5999,18 @@ msgstr "寫入已接收的DNS請求到系統日誌中"
 msgid "Write system log to file"
 msgstr "將系統日誌寫入檔案"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1555
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1542
+#: 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 "
@@ -5866,18 +6047,14 @@ msgstr ""
 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:1029
+#: 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 "自動"
 
@@ -5885,11 +6062,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 "已橋接"
 
@@ -5905,22 +6082,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
@@ -5932,22 +6108,26 @@ 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:888
 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:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:416
 msgid "expired"
 msgstr "�期"
 
@@ -5965,25 +6145,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 ""
 
@@ -5991,6 +6167,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
@@ -6029,21 +6209,18 @@ msgstr ""
 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:1344
 msgid "minutes"
 msgstr ""
 
-#: 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 "ç„¡"
 
-#: 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 "無連線"
 
@@ -6051,7 +6228,7 @@ msgstr "無連線"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1243
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1234
 msgid "none"
 msgstr "ç„¡"
 
@@ -6061,7 +6238,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:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:779
 #: 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
@@ -6076,10 +6255,6 @@ msgstr "關閉"
 msgid "on"
 msgstr "é–‹å•Ÿ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "打開"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
 msgid "output"
@@ -6097,66 +6272,66 @@ 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:53
 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:967
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:976
 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/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:1327
 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:239
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:391
+#: 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:1449
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1436
 #: 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
@@ -6173,7 +6348,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 "尚未標籤"
 
@@ -6254,8 +6429,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 ""
 
@@ -6292,7 +6467,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 ""
 
@@ -6305,11 +6480,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 ""
 
@@ -6325,14 +6500,19 @@ 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/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
@@ -6343,6 +6523,189 @@ msgstr "是的"
 msgid "« Back"
 msgstr "« 倒退"
 
+#~ 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 "進階"
 
@@ -6481,9 +6844,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 b895013736..99c172a96b 100755
--- a/modules/luci-base/root/usr/libexec/rpcd/luci
+++ b/modules/luci-base/root/usr/libexec/rpcd/luci
@@ -274,6 +274,66 @@ local methods = {
 		end
 	},
 
+	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"
@@ -335,11 +395,12 @@ local methods = {
 			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")
 
 			local wifi_features = { "eap", "11n", "11ac", "11r", "11w", "acs", "sae", "owe", "suiteb192" }
 
 			if fs.access("/usr/sbin/hostapd") then
-				rv.hostapd = {}
+				rv.hostapd = { cli = fs.access("/usr/sbin/hostapd_cli") }
 
 				local _, feature
 				for _, feature in ipairs(wifi_features) do
@@ -349,7 +410,7 @@ local methods = {
 			end
 
 			if fs.access("/usr/sbin/wpa_supplicant") then
-				rv.wpasupplicant = {}
+				rv.wpasupplicant = { cli = fs.access("/usr/sbin/wpa_cli") }
 
 				local _, feature
 				for _, feature in ipairs(wifi_features) do
@@ -407,6 +468,113 @@ local methods = {
 
 			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
+
+				return { result = ports }
+			else
+				return { error = err }
+			end
+		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 5ffcbdc2e6..d364508c27 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
@@ -20,21 +20,36 @@
 	"luci-access": {
 		"description": "Grant access to basic LuCI procedures",
 		"read": {
+			"file": {
+				"/": [ "list" ],
+				"/*": [ "list" ],
+				"/etc/crontabs/root": [ "read" ],
+				"/etc/rc.local": [ "read" ],
+				"/proc/sys/kernel/hostname": [ "read" ]
+			},
 			"ubus": {
-				"iwinfo": [ "info" ],
-				"luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices" ],
+				"file": [ "list", "read", "stat" ],
+				"iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ],
+				"luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices", "getWirelessDevices", "getSwconfigFeatures", "getSwconfigPortState" ],
 				"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/luci-uploads/*": [ "write" ],
+				"/etc/rc.local": [ "write" ]
+			},
 			"ubus": {
+				"file": [ "write", "remove" ],
+				"iwinfo": [ "scan" ],
 				"luci": [ "setInitAction", "setLocaltime" ],
-				"uci": [ "add", "apply", "confirm", "delete", "order", "set" ]
+				"uci": [ "add", "apply", "confirm", "delete", "order", "set", "rename" ]
 			},
 			"uci": [ "*" ]
 		}
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 2572615138..0000000000
--- 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 5958765da7..bf5627d64d 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 1e9c402e0c..3acb6d1a16 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
@@ -345,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'));
@@ -363,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/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
new file mode 100644
index 0000000000..c79deea27a
--- /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.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 0000000000..b281bb1808
--- /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 f30e47ec7c..0000000000
--- 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 108a141f88..0000000000
--- 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 57e6bbb04c..6c254c059e 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,1950 @@
-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)) ]);
+}
 
-	ev.target.previousElementSibling.value = '1';
-	return true;
+function render_network_badge(radioNet) {
+	return render_signal_badge(radioNet.isUp() ? radioNet.getSignalPercent() : -1,  radioNet.getSignal(), radioNet.getNoise());
 }
 
-function wifi_restart(ev) {
-	L.halt();
+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'),
+	    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';
+	}
+
+	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 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');
+
+	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');
+	}
 
-	findParent(ev.target, '.table').querySelectorAll('[data-disabled="false"]').forEach(function(s) {
-		L.dom.content(s, E('em', _('Wireless is restarting...')));
+	return map.save().then(function() {
+		L.ui.changes.apply()
 	});
+}
+
+function next_free_sid(offset) {
+	var sid = 'wifinet' + offset;
 
-	L.post(L.url('admin/network/wireless_reconnect', ev.target.getAttribute('data-radio')), L.run);
+	while (uci.get('wireless', sid))
+		sid = 'wifinet' + (++offset);
+
+	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');
 
-document.querySelectorAll('[data-network]').forEach(function(n) {
-	networks.push(n.getAttribute('data-network'));
+		this.setValues(band, this.bands[mode.value]);
+		this.toggleWifiChannel(elem);
+	},
+
+	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';
+
+		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 : '?') : ''
+		]));
 
-			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') ]);
+		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;
+	},
+
+	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');
 
-				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'))
-				], ' | ');
+			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');
+
+				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;
+				};
+
+
+				encr.value('none', _('No Encryption'));
+				encr.value('wep-open',   _('WEP Open System'));
+				encr.value('wep-shared', _('WEP Shared Key'));
+
+				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) {
+						encr.value('psk', 'WPA-PSK');
+						encr.value('psk2', 'WPA2-PSK');
+						encr.value('psk-mixed', 'WPA-PSK/WPA2-PSK Mixed Mode');
+					}
+					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) {
+						encr.value('sae', 'WPA3-SAE');
+						encr.value('sae-mixed', 'WPA2-PSK/WPA3-SAE Mixed Mode');
+					}
+
+					if (has_ap_eap || has_sta_eap) {
+						encr.value('wpa', 'WPA-EAP');
+						encr.value('wpa2', 'WPA2-EAP');
+					}
+
+					if (has_ap_owe || has_sta_owe) {
+						encr.value('owe', 'OWE');
+					}
+
+					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') {
+					encr.value('psk', 'WPA-PSK');
+					encr.value('psk2', 'WPA2-PSK');
+					encr.value('psk+psk2', 'WPA-PSK/WPA2-PSK Mixed Mode');
+				}
+
+
+				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');
+				};
+
+
+				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) ? slot : 1;
+				};
+
+				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.default = '';
+							o.value('', _('Disabled (default)'));
+							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 = 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 b20607e2e9..f8623be93e 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 ca66e9f365..0000000000
--- 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 de7b8676e8..0000000000
--- 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 b98086dea6..0000000000
--- 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 edeb193ef7..0000000000
--- 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 2e6c026bb2..0000000000
--- 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 e8a3058826..0000000000
--- 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 54720d6889..0000000000
--- 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 9d4afd2b27..0000000000
--- 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 6e741b419a..0000000000
--- 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 5a61ba099c..0000000000
--- 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 89bb404fd8..0000000000
--- 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 93ae2f51fb..0000000000
--- 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-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 0000000000..c8baa47229
--- /dev/null
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js
@@ -0,0 +1,52 @@
+'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 : '')),
+			E('div', { 'class': 'right' }, [
+				E('button', {
+					'class': 'btn cbi-button-positive important',
+					'click': L.ui.createHandlerFn(this, 'handleSave')
+				}, _('Save'))
+			])
+		]);
+	}
+});
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 a5bda05761..8a93aeb8c8 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,8 +2,9 @@
 'require uci';
 'require rpc';
 'require form';
+'require tools.widgets as widgets';
 
-var callLeds, callUSB, callNetdevs;
+var callLeds, callUSB;
 
 callLeds = rpc.declare({
 	object: 'luci',
@@ -17,31 +18,17 @@ callUSB = rpc.declare({
 	expect: { '': {} }
 });
 
-callNetdevs = rpc.declare({
-	object: 'luci',
-	method: 'getIfaddrs',
-	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();
-	}
-});
-
 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;
 
@@ -53,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'));
 
@@ -66,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'));
@@ -102,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')
@@ -117,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');
@@ -146,6 +140,7 @@ return L.view.extend({
 		}
 
 		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/startup.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
new file mode 100644
index 0000000000..3c026e0889
--- /dev/null
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
@@ -0,0 +1,143 @@
+'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));
+	},
+
+	handleSave: 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': 'right' }, [
+						E('button', {
+							'class': 'btn cbi-button-positive important',
+							'click': L.ui.createHandlerFn(this, 'handleSave')
+						}, _('Save'))
+					])
+				])
+			])
+		]);
+
+		L.ui.tabs.initTabGroup(view.lastElementChild.childNodes);
+
+		return view;
+	}
+});
diff --git a/modules/luci-mod-system/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
index d73a1cbdb4..b9785994ad 100644
--- a/modules/luci-mod-system/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua
@@ -21,8 +21,8 @@ function index()
 		entry({"admin", "system", "admin", "sshkeys", "json"}, post_on({ keys = true }, "action_sshkeys"))
 	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)
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 beb24e7cae..0000000000
--- 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/startup.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
deleted file mode 100644
index 99ddb09701..0000000000
--- 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/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 0000000000..07bed36c23
--- /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 85c5cd6042..0000000000
--- 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-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 0000000000..84396ede08
--- /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 2ed34faf71..0000000000
--- 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 0000000000..7423a08585
--- /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 8817f18d6d..0000000000
--- 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 0000000000..a74708fd01
--- /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 0000000000..f26ced7b40
--- /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 0000000000..6a8f506bc9
--- /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 0000000000..abfe1c8fc4
--- /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 0000000000..eba58f4248
--- /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 0000000000..fa0e68ddc3
--- /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 0000000000..006ebfbf08
--- /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 5a37582faf..0000000000
--- 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 3c9f41f6b5..0000000000
--- 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 708a9c5add..0000000000
--- 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 50a706974d..0000000000
--- 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 49281ee41d..0000000000
--- 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 eca9750adb..0000000000
--- 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 37d4ec901a..0000000000
--- 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-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 0000000000..3ab6c01d61
--- /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 3fe4ef33aa..0000000000
--- 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 0000000000..14fc8f6d35
--- /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 5adfccae48..0000000000
--- 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 0000000000..9378cc518b
--- /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 0000000000..66bc5ac24f
--- /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 0000000000..13bb3548a7
--- /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 0000000000..57a7b6a0e1
--- /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 0000000000..483ac9e555
--- /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 0000000000..5d71c43376
--- /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 0000000000..006adc1a1e
--- /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 604f019ee6..0000000000
--- 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 5f468bc14c..0000000000
--- 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 004fd7ef67..0000000000
--- 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 063d8c07eb..0000000000
--- 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 6a828efe96..0000000000
--- 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 0000000000..ec8e8a152e
--- /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 e53262b5dc..0000000000
--- 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 0000000000..eeda91f6e6
--- /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 383bc4662f..0000000000
--- 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 0000000000..b3082276b1
--- /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 3381d85e47..0000000000
--- 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 0000000000..87ccc9df1c
--- /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 3d85d02f40..0000000000
--- 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 0000000000..ab76326eee
--- /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 64e256a517..0000000000
--- 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 f8f1c11105..7e9c8eb324 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 062d274b75..b8892fbf0a 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 d74077853a..91f87c69c1 100644
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -401,10 +401,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;
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 7ce195cc9f..76eeec05eb 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()">