treewide: i18n - sync translations

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

30 files changed, 1844 insertions, 1501 deletions

diff --git a/applications/luci-app-upnp/po/bg/upnp.po b/applications/luci-app-upnp/po/bg/upnp.po
index 4bda86049..463c922e9 100644
--- a/applications/luci-app-upnp/po/bg/upnp.po
+++ b/applications/luci-app-upnp/po/bg/upnp.po
@@ -12,192 +12,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
diff --git a/applications/luci-app-upnp/po/ca/upnp.po b/applications/luci-app-upnp/po/ca/upnp.po
index ea183d428..3b6289297 100644
--- a/applications/luci-app-upnp/po/ca/upnp.po
+++ b/applications/luci-app-upnp/po/ca/upnp.po
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9.1-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -24,163 +24,170 @@ msgstr ""
 "Els ACL especifiquen quins ports externs es poden redirigir a quines adreces "
 "i ports interns"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Acció"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Redireccions UPnP actives"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Ajusts avançats"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Permet que s'afegeixin redireccions només a les adreces IP peticionant"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Número de model anunciat"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Número de sèrie anunciat"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Interval de neteja de regles"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Llindar de neteja de regles"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Adreça de client"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Port de client"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "S’estan recollint dades…"
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Comentari"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Descripció"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID de dispositiu"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Enllaç de baixada"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Habilita la funcionalitat NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Habilita la funcionalitat UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Habilita el registre addicional"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Habilita mode segur"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Port extern"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Ports externs"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Ajusts generals"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Amfitrió"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Adreces internes"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Ports interns"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "ACLs de MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Ajusts de MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Interval de notificació"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Posa informació extra de depuració en el registre de sistema"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Reporta el temps actiu del sistema en lloc del del dimoni"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Inicia el servei UPnP i NAP-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "No hi ha redireccions actives."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -188,27 +195,32 @@ msgstr ""
 "UPnP permet als clients de la xarxa local configurar automàticament el "
 "router."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Fitxer d'arrendament UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Enllaç de pujada"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valor en KByte/s, només per informació"
 
+#~ msgid "Collecting data..."
+#~ msgstr "S’estan recollint dades…"
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Suprimeix la redirecció"
 
diff --git a/applications/luci-app-upnp/po/cs/upnp.po b/applications/luci-app-upnp/po/cs/upnp.po
index 0ec77d5bc..cf2f21b69 100644
--- a/applications/luci-app-upnp/po/cs/upnp.po
+++ b/applications/luci-app-upnp/po/cs/upnp.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -20,190 +20,202 @@ msgstr ""
 "ACL stanovují, které vnější porty by měly být přesměrovány na které vnitřní "
 "adresy a porty"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Akce"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Aktivní přesměrování UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Pokročilé nastavení"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Inzerovat jako IGDv1 zařízení místo IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Povolit přesměrování pouze na dotazující ip adresy"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Oznámené číslo modelu"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Oznámené sériové číslo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Interval čištění pravidel"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Práh čištění pravidel"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Adresa klienta"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Port klienta"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Probíhá sběr dat..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Komentář"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Odstranit"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Popis"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID zařízení"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "Povolit režim IGDv1"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Povolit funkčnost NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Povolit funkčnost UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Povolit přídavné logování"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Povolit bezpečný režim"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Vnější port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Vnější porty"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Obecné nastavení"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Hostitel"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Vnitřní adresy"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Vnitřní porty"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP ACL listy"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Nastavení MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Interval oznamování"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Prezentační URL"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protokol"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Vypisovat extra ladící informace do systémového záznamu"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Hlásit uptime systému namísto uptime daemonu"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Spustit službu UPnP a NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Neexistují žádná aktivní přesměrování."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPnP umožňuje klientům v místní síti automaticky nakonfigurovat router."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Soubor UPnP výpůjček"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Univerzální Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Pouze informační hodnoty (v KByte/s)"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Probíhá sběr dat..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Odstranit přesměrování"
 
diff --git a/applications/luci-app-upnp/po/de/upnp.po b/applications/luci-app-upnp/po/de/upnp.po
index 61234b7c6..00947005c 100644
--- a/applications/luci-app-upnp/po/de/upnp.po
+++ b/applications/luci-app-upnp/po/de/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,163 +22,170 @@ msgstr ""
 "ACLs definieren, welche externen Ports zu welchen internen Adressen und "
 "Ports weitergeleitet werden dürfen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Aktion"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Aktive UPnP-Weiterleitungen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Als IGDv1-Gerät anstelle von IGDv2 bekanntgeben"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Nur Weiterleitungen zurück zum anfordernden Client zulassen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Angekündigte Modellnummer"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Angekündigte Seriennummer"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Aufräumintervall für Weiterleitungen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Aufräumschwellenwert für Weiterleitungen"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Clientadresse"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Clientport"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Sammle Daten..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Kommentar"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Löschen"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Beschreibung"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "Geräte-UUID"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Download-Bandbreite"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "IGDv1 Modus aktivieren"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "NAT-PMP Funktionalität aktivieren"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "UPnP Funktionalität aktivieren"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Erweiterte Protokollierung aktivieren"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Sicheren Modus aktivieren"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Externer Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Externe Ports"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Host"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Interne Adressen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Interne Ports"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP ACLs"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "MiniUPnP-Einstellungen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Benachrichtigungsintervall"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Präsentations-URL"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Schreibt zusätzliche Debug-Informationen in das Systemprotokoll"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Systemlaufzeit statt Prozesslaufzeit melden"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "UPnP und NAT-PMP Dienst starten"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Es gibt keine aktiven Weiterleitungen."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,27 +193,32 @@ msgstr ""
 "UPnP erlaubt es Clients im lokalen Netzwerk automatisch Port-Weiterleitungen "
 "auf diesem Router einzurichten."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP Lease-Datei"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Wert in Kilobyte/s, nur informativ"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Sammle Daten..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Weiterleitung löschen"
 
diff --git a/applications/luci-app-upnp/po/el/upnp.po b/applications/luci-app-upnp/po/el/upnp.po
index d10d51469..ddc45f8aa 100644
--- a/applications/luci-app-upnp/po/el/upnp.po
+++ b/applications/luci-app-upnp/po/el/upnp.po
@@ -14,191 +14,203 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Συλλογή δεδομένων..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
+
+#~ msgid "Collecting data..."
+#~ msgstr "Συλλογή δεδομένων..."
diff --git a/applications/luci-app-upnp/po/en/upnp.po b/applications/luci-app-upnp/po/en/upnp.po
index 12c992017..1384be62d 100644
--- a/applications/luci-app-upnp/po/en/upnp.po
+++ b/applications/luci-app-upnp/po/en/upnp.po
@@ -12,192 +12,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Enable secure mode"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
diff --git a/applications/luci-app-upnp/po/es/upnp.po b/applications/luci-app-upnp/po/es/upnp.po
index bce555bc0..e6ad5c3d5 100644
--- a/applications/luci-app-upnp/po/es/upnp.po
+++ b/applications/luci-app-upnp/po/es/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,163 +22,170 @@ msgstr ""
 "Los ACL especifican qué puertos externos pueden ser redirigidos hacia qué "
 "direcciones y puertos internos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Acción"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Redirecciones UPnP activas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Anunciarse como dispositivo IGDv1 en lugar de IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Permitir añadir redirecciones sólo a IPs que lo soliciten"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Número de modelo declarado"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Número de serie declarado"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Intervalo de borrado de reglas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Umbral de borrado de reglas"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Dirección del cliente"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Puerto del cliente"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Recolectando datos…"
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Comentario"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Eliminar"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Descripción"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID del dispositivo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Enlace descendente"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "Activar modo IGDv1"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Activar la funcionalidad NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Activar la funcionalidad UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Activar registro adicional"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Activar modo seguro"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Puerto externo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Puertos externos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Configuración general"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Host"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Direcciones internas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Puertos internos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "ACLs MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Configuración MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Intervalo de notificación"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Puerto"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL de presentación"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Escribe información de depuración extra en el registro del sistema"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Informar del tiempo activo del sistema en vez de el del demonio"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Iniciar servicio UPnP y NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Sin redirecciones activas."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,27 +193,32 @@ msgstr ""
 "UPnP permite a los clientes en la red local configurar automáticamente el "
 "enrutador."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Tiempo de conexión UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Plug & Play universal"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Enlace ascendente"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valor en KBytes/s (sólo informativo)"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Recolectando datos…"
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Borrar redirección"
 
diff --git a/applications/luci-app-upnp/po/fr/upnp.po b/applications/luci-app-upnp/po/fr/upnp.po
index 0a13fd9c0..e12e7b8f2 100644
--- a/applications/luci-app-upnp/po/fr/upnp.po
+++ b/applications/luci-app-upnp/po/fr/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,166 +22,173 @@ msgstr ""
 "Les ACLs définissent quels ports externes peuvent être redirigés, vers "
 "quelles adresses et ports internes"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Redirections UPnP actives"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 "Permet d'ajouter des redirections seulement vers les adresses IP qui font "
 "des demandes"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Numéro de modèle annoncé"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Numéro de série annoncé"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Intervalle des règles de nettoyage"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Niveau des règles de nettoyage"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Adresse du client"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Port du client"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Récupération des données…"
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Commentaire"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Effacer"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Description"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID du périphérique"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Lien descendant"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Activer la fonctionnalité NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Activer la fonctionnalité UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Activer la journalisation additionnelle"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Activer le mode sécurisé"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Port externe"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Ports externes"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Hôte"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Adresses internes"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Ports internes"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "ACLs MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Paramètres MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Intervalle de notification"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL de présentation"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocole"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Rajoute des informations de debug dans le journal-système"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 "Indiquer la durée de fonctionnement du système plutôt que celle du démon UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Démarrer les services UPnP et NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Il n'y a pas de redirections actives."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -189,27 +196,32 @@ msgstr ""
 "UPnP permet à des clients du réseau local de configurer automatiquement le "
 "routeur."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Fichier des baux UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Lien remontant"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valeur en Ko/s, pour information seulement"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Récupération des données…"
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Détruire la redirection"
 
diff --git a/applications/luci-app-upnp/po/he/upnp.po b/applications/luci-app-upnp/po/he/upnp.po
index 277c744b6..cb7b3e862 100644
--- a/applications/luci-app-upnp/po/he/upnp.po
+++ b/applications/luci-app-upnp/po/he/upnp.po
@@ -8,191 +8,200 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
diff --git a/applications/luci-app-upnp/po/hi/upnp.po b/applications/luci-app-upnp/po/hi/upnp.po
index f28b12ff7..199fa6087 100644
--- a/applications/luci-app-upnp/po/hi/upnp.po
+++ b/applications/luci-app-upnp/po/hi/upnp.po
@@ -12,192 +12,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
diff --git a/applications/luci-app-upnp/po/hu/upnp.po b/applications/luci-app-upnp/po/hu/upnp.po
index 29fd39cc8..50e63a099 100644
--- a/applications/luci-app-upnp/po/hu/upnp.po
+++ b/applications/luci-app-upnp/po/hu/upnp.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -20,165 +20,172 @@ msgstr ""
 "Az ACL-ek határozzák meg, hogy melyik külső portok melyik belső portokra és "
 "címekre kerülhetnek továbbításra"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Művelet"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Aktív UPnP átirányítások"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Speciális beállítások"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 "Kizárólag a kérést küldő IP címre történő továbbítás hozzáadásának "
 "engedélyezése"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Bejelentett modellszám"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Bejelentett sorozatszám"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Szabály törlési időköz"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Szabály törlési küszöbérték"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Ügyfél cím"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Ügyfél port"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Adatok összegyűjtése…"
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Törlés"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Leírás"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "Eszköz UUID"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Befelé jövő kapcsolat"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "IGDv1 mód engedélyezése"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "NAT-PMP funkció engedélyezése"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "UPnP funkció engedélyezése"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "További naplózás engedélyezése"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Biztonságos mód engedélyezése"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Külső port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Külső portok"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Gép"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Belső címek"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Belső portok"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP ACL-ek"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "MiniUPnP beállítások"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Értesítési időköz"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Bemutató URL"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "További nyomkövetési információk írása a rendszernaplóba."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "A démon helyett a rendszer működési idejét jeleníti meg"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "UPnP és NAT-PMP szolgáltatás elindítása"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Nincsenek aktív átírányítások."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,27 +193,32 @@ msgstr ""
 "Az UPnP lehetővé teszi a hálózatban lévő ügyfelek számára hogy automatikusan "
 "beállítsák a routert."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP bérlet fájl"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Univerzális Plug and Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Kifelé menő kapcsolat"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Érték KByte/s-ban, csak tájékoztató jellegű"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Adatok összegyűjtése…"
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Átirányítás törlése"
 
diff --git a/applications/luci-app-upnp/po/it/upnp.po b/applications/luci-app-upnp/po/it/upnp.po
index 511100ab6..630b08c5e 100644
--- a/applications/luci-app-upnp/po/it/upnp.po
+++ b/applications/luci-app-upnp/po/it/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,163 +22,170 @@ msgstr ""
 "Le ACL specificano quali porte esterne possono essere redirezionate agli "
 "indirizzi interni e porte."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Azione"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Attiva reindirizzamento UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Opzioni Avanzate"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Permetti l'aggiunta della mappatura solo agli indirizzi IP richiedenti"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Numero di modello annunciato"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Numero seriale annunciato"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Cancella le regole"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Pulisci le regole degli eventi"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Indirizzo IP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Porta"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Raccolgo i dati..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Descrizione"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID del dispositivo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Abilita il protocollo NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Abilita il protocollo UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Abilita log addizionale"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Abilita la modalità sicura"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Porta Esterna"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Porte Esterne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Opzioni Generali"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Indirizzi Interni"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Porte Interne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP ACLs"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Opzioni di MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Intervello di notifica"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL di presentazione"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Scrivi nel log di sistema le informazioni di extra debugging"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Mostra l'uptime del sistema invece del demone"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Avvia il servizo UPnP e NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Non ci sono mappature attive."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,27 +193,32 @@ msgstr ""
 "UPnP permette ai dispositivi nella rete locale di configurare "
 "automaticamente il router."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP lease file"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valori in KByte/s, (informativo)"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Raccolgo i dati..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Cancella Mappatura"
 
diff --git a/applications/luci-app-upnp/po/ja/upnp.po b/applications/luci-app-upnp/po/ja/upnp.po
index fa31005c2..ec4a862c4 100644
--- a/applications/luci-app-upnp/po/ja/upnp.po
+++ b/applications/luci-app-upnp/po/ja/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.9\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,163 +22,170 @@ msgstr ""
 "アクセス制御リスト(ACL) は、どの外部ポートからどの内部アドレス及びポートへリ"
 "ダイレクトするかを設定します。"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "動作"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "稼働中のUPnPリダイレクト"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "要求元IPアドレスへの転送のみ、追加を許可します。"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "通知するモデル番号"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "通知するシリアル番号"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "ルール消去間隔"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "ルール消去しきい値"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "クライアント・アドレス"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "クライアント・ポート"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "データ収集中です..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "コメント"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "削除"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "説明"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "デバイス UUID"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "ダウンリンク"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "NAT-PMP機能を有効にする"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "UPnP機能を有効にする"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "ログ機能を有効にする"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "セキュアモードを有効にする"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "外部ポート"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "外部ポート"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "内部アドレス"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "内部ポート"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP アクセス制御リスト (ACL)"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "MiniUPnP 設定"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "通知間隔"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "ポート"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "プレゼンテーションURL"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "追加のデバッグ情報をシステムログへ挿入する"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "サービスの起動時間の代わりにシステムの起動時間を使用する"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "UPnP及びNAT-PMPサービスを開始する"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "有効なリダイレクトはありません。"
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,23 +193,28 @@ msgstr ""
 "UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータを"
 "構成することができます。"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP リースファイル"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "ユニバーサル プラグ & プレイ"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "アップリンク"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "クライアントへの情報提供のみに使用される、KByte/sの値です。"
+
+#~ msgid "Collecting data..."
+#~ msgstr "データ収集中です..."
diff --git a/applications/luci-app-upnp/po/ko/upnp.po b/applications/luci-app-upnp/po/ko/upnp.po
index 36a36346c..ec26ae775 100644
--- a/applications/luci-app-upnp/po/ko/upnp.po
+++ b/applications/luci-app-upnp/po/ko/upnp.po
@@ -12,192 +12,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
diff --git a/applications/luci-app-upnp/po/mr/upnp.po b/applications/luci-app-upnp/po/mr/upnp.po
index aff1a53fc..3f320ef16 100644
--- a/applications/luci-app-upnp/po/mr/upnp.po
+++ b/applications/luci-app-upnp/po/mr/upnp.po
@@ -14,195 +14,207 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "प्रगत सेटिंग्ज"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "डेटा संकलित करीत आहे ..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "वर्णन"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "सामान्य सेटिंग्ज"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "पोर्ट"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "प्रोटोकॉल"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
+#~ msgid "Collecting data..."
+#~ msgstr "डेटा संकलित करीत आहे ..."
+
 #~ msgid ""
 #~ "UPNP allows clients in the local network to automatically configure the "
 #~ "router."
diff --git a/applications/luci-app-upnp/po/ms/upnp.po b/applications/luci-app-upnp/po/ms/upnp.po
index f0b317fb4..59f4ec235 100644
--- a/applications/luci-app-upnp/po/ms/upnp.po
+++ b/applications/luci-app-upnp/po/ms/upnp.po
@@ -12,191 +12,203 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Tindakan"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Mengumpul data..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Keterangan"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
+
+#~ msgid "Collecting data..."
+#~ msgstr "Mengumpul data..."
diff --git a/applications/luci-app-upnp/po/no/upnp.po b/applications/luci-app-upnp/po/no/upnp.po
index a2910282a..55c821cb0 100644
--- a/applications/luci-app-upnp/po/no/upnp.po
+++ b/applications/luci-app-upnp/po/no/upnp.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -18,163 +18,170 @@ msgstr ""
 "ACL angir hvilke eksterne porter som kan bli viderekoblet, og til hvilke "
 "interne adresser og porter."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Handling"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Aktive UPnP Viderekoblinger"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Tillat videkobling kun til IP adresser som ber om det"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Annonsert modellnummer"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Annonsert serienummer"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Nullstill UPnP Viderekoblinger intervall"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Nullstill UPnP terskel"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Klient adresse"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Klient port"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Samler inn data…"
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Kommentar"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "Enhet UUID"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Nedlinje"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Aktiver NAT-PMP funksjonalitet"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Aktiver UPnP funksjonalitet"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Aktiver tilleggs logging"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Aktiver sikker modus"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Ekstern port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Eksterne porter"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Interne adresser"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Interne porter"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP ACL'er"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "MiniUPnP Innstillinger"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Informasjons intervall"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Presentasjon URL"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Setter ekstra debugging informasjon i systemloggen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Rapporter systemets oppetid istedenfor daemon oppetid"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Start UPnP og NAT-PMP tjenesten"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Det finnes ingen aktive viderekoblinger"
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -182,27 +189,32 @@ msgstr ""
 "UPnP gjør at klientene i det lokale nettverket automatisk kan konfigurere "
 "ruteren."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP leie fil"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Opplinje"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Verdi i KByte/sek, kun for informasjon"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Samler inn data…"
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Fjern Viderekobling"
 
diff --git a/applications/luci-app-upnp/po/pl/upnp.po b/applications/luci-app-upnp/po/pl/upnp.po
index c396f115c..aeedc173a 100644
--- a/applications/luci-app-upnp/po/pl/upnp.po
+++ b/applications/luci-app-upnp/po/pl/upnp.po
@@ -13,7 +13,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -21,190 +21,202 @@ msgstr ""
 "Listy kontroli dostępu (ang. ACL) określają jakie porty mogą być "
 "przekierowane do jakich wewnętrznych adresów i portów"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Akcja"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Aktywne przekierowania UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Rozgłaszanie jako urządzenie IGDv1 zamiast jako IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Zezwól na dodawanie przekazywań tylko do odpytujących adresów IP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Rozgłaszany numer modelu"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Rozgłaszany numer seryjny"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Interwał czyszczenia reguł"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Próg czyszczenia reguł"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Adres klienta"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Port klienta"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Trwa zbieranie danych..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Komentarz"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Usuń"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Opis"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID urządzenia"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "Włącz tryb IGDv1"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Włącz funkcjonalność NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Włącz funkcjonalność UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Włącz rozszerzone raportowanie"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Włącz tryb bezpieczny"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Port zewnętrzny"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Porty zewnętrzne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Ustawienia główne"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Host"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Adresy wewnętrzne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Porty wewnętrzne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "Listy kontroli dostępu MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Ustawienia MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Interwał powiadamiania"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL prezentacji"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protokół"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Dodaje dodatkowe informacje debugowania do loga systemowego"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Zgłaszaj czas pracy systemu zamiast czas pracy usługi"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Uruchom usługi UPnP i NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Nie ma aktywnych przekierowań."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPnP umożliwia klientom w sieci lokalnej automatyczne konfigurowanie routera."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Plik dzierżawy UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Wartość w KB/s, tylko informacyjna"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Trwa zbieranie danych..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Usuń przekierowanie"
 
diff --git a/applications/luci-app-upnp/po/pt-br/upnp.po b/applications/luci-app-upnp/po/pt-br/upnp.po
index d5e5f1aa5..b8afdfa3a 100644
--- a/applications/luci-app-upnp/po/pt-br/upnp.po
+++ b/applications/luci-app-upnp/po/pt-br/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,192 +22,204 @@ msgstr ""
 "ACLs especificam quais portas externas podem ser redirecionadas para quais "
 "endereços e portas internos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Ação"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Redirecionamentos UPnP Ativos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Anuncie-se como um dispositivo IGDv1 ao invés de um IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 "Permite adicionar encaminhamento apenas para o endereço IP requisitante"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Número do modelo anunciado"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Número de série anunciado"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Intervalo de limpeza das regras"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Limiar de limpeza das regras"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Endereço do cliente"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Porta do Cliente"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Coletando dados..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Comentário"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Apagar"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Descrição"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID do Dispositivo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Velocidade de recebimento do enlace (downlink)"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "Habilitar o modo IGDv1"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Habilite a função NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Habilite a função UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Habilite registros adicionais"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Habilite modo seguro"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Porta Externa"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Portas Externas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Host"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Endereços internos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Portas internas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "ACLs do MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Configurações do MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Intervalo de notificação"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL de Apresentação"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Envie informações extra de depuração ao registro do sistema"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Informe o tempo de vida do sistema ao invés do tempo do processo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Dispare os serviços de UPnP e NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Não existe redirecionamentos ativos."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 "<abbr title=\"Universal Plug and Play, Plugue e Use Universal\">UPnP</abbr>"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPnP permite os clientes da rede local configurem automaticamente o roteador."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Arquivo de concessão do UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Plug & Play Universal"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Velocidade de envio do enlace (uplink)"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valores em KByte/s, apenas informativas"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Coletando dados..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Apague o Redirecionamento"
 
diff --git a/applications/luci-app-upnp/po/pt/upnp.po b/applications/luci-app-upnp/po/pt/upnp.po
index 518d87a92..d8a5fa0b0 100644
--- a/applications/luci-app-upnp/po/pt/upnp.po
+++ b/applications/luci-app-upnp/po/pt/upnp.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -22,163 +22,171 @@ msgstr ""
 "Os ACL especificam quais as portas externas que podem ser redirecionadas "
 "para que endereços internos e portas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Ação"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Redirecionamentos ativos da UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Definições Avançadas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Anuncie como aparelho IGDv1 em vez de IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
-msgstr "Permitir a adição de encaminhamentos apenas para solicitar endereços IP"
+msgstr ""
+"Permitir a adição de encaminhamentos apenas para solicitar endereços IP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Número modelo anunciado"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Número de série anunciado"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Limpar intervalo de regras"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Limpar limiar de regras"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Endereço do Cliente"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Porta do Cliente"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "A recolher dados..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Comentário"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Apagar"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Descrição"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID do aparelho"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "Ativar o modo IGDv1"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Ativar a funcionalidade NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Ativar a funcionalidade UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Ativar log adicional"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Ativar o modo seguro"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Porta Externa"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Portas externas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Host"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Endereços internos"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Portas internas"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "ACLs MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Definições MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Intervalo de Notificação"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL de apresentação"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Põe informações de depuração extras no log do sistema"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Relata uptime do sistema ao invés da do daemon"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Iniciar serviço UPnP e NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Não há redirecionamentos ativos."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,27 +194,32 @@ msgstr ""
 "UPnP permite que os clientes da rede local configurem o router "
 "automaticamente."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Ficheiro de concessão UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Plug & Play Universal"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valor em KByte/s, apenas informativo"
 
+#~ msgid "Collecting data..."
+#~ msgstr "A recolher dados..."
+
 #~ msgid ""
 #~ "UPNP allows clients in the local network to automatically configure the "
 #~ "router."
diff --git a/applications/luci-app-upnp/po/ro/upnp.po b/applications/luci-app-upnp/po/ro/upnp.po
index db42a75d3..d9bad0ad3 100644
--- a/applications/luci-app-upnp/po/ro/upnp.po
+++ b/applications/luci-app-upnp/po/ro/upnp.po
@@ -13,7 +13,7 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10.1\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -21,190 +21,202 @@ msgstr ""
 "ACL-urile specifica porturile externe care pot fi redirectate si spre ce "
 "adrese si porturi interne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Actiune"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Redirecturi active UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Setări avansate"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Permite adaugarea forward-urilor doar catre adresele ip solicitante"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Numar de model anuntat"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Numar serial anuntat"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Intervalul de curatare reguli"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Limita de curatare reguli"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Adresa client"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Port client"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Colectare date..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Comentariu"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Descriere"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID al dispozitivului"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Activeaza functionalitatea NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Activeaza functionalitatea UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Activeaza log-area aditionala"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Activeaza modul securizat"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Port extern"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Porturi externe"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Setări principale"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Adrese interne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Porturi interne"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "Liste de acces mini UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Setari mini UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Interval de notificare"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Adresa de prezentare"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Pune informatii utile suplimentare in log-ul de sistem"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Raporteaza timpul de functionare de sistem in loc de serviciu"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Porneste UPnP si serviciul NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Nu exista redirecturi active."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPNP permite clientulor din reteaua locala sa configureze automat routerul."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Fisierul de conexiuni UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Valorea in KOcteti/s , doar informational"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Colectare date..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Sterge redirect"
 
diff --git a/applications/luci-app-upnp/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po
index a99441343..a140142ec 100644
--- a/applications/luci-app-upnp/po/ru/upnp.po
+++ b/applications/luci-app-upnp/po/ru/upnp.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -24,163 +24,170 @@ msgstr ""
 "Список доступа задает внешние порты для перенаправления на внутренние адреса "
 "и порты."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Активные UPnP-переадресации"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Объявить как IGDv1 устройство вместо IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Разрешить перенаправление только для запрашивающих IP-адресов."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Объявить номер модели"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Объявить серийный номер"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Интервал очистки правил"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Порог очистки правил"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Адрес клиента"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Порт клиента"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Сбор данных..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Комментарий"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Удалить"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Описание"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID устройства"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Внутреннее соединение"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "IGDv1 режим"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Включить NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Включить UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Дополнительное журналирование"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Защищённый режим"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Внешний порт"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Внешние порты"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Хост"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Внутренние адреса"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Внутренние порты"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "Список доступа MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Настройки MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Интервал уведомления"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Порт"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Задать URL-адрес"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Добавлять дополнительную отладочную информацию в системный журнал."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Сообщать время работы системы вместо службы"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Запустить службы<br />UPnP и NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Активные переадресации отсутствуют."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -188,23 +195,28 @@ msgstr ""
 "UPnP позволяет клиентам в локальной сети автоматически настраивать "
 "маршрутизатор."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Файл аренды UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Внешнее соединение"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Значение в КБ/с, только для информации."
+
+#~ msgid "Collecting data..."
+#~ msgstr "Сбор данных..."
diff --git a/applications/luci-app-upnp/po/sk/upnp.po b/applications/luci-app-upnp/po/sk/upnp.po
index 368dd31bf..a4a261f8c 100644
--- a/applications/luci-app-upnp/po/sk/upnp.po
+++ b/applications/luci-app-upnp/po/sk/upnp.po
@@ -12,191 +12,203 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Akcia"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Zbieram dáta..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Popis"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
+
+#~ msgid "Collecting data..."
+#~ msgstr "Zbieram dáta..."
diff --git a/applications/luci-app-upnp/po/sv/upnp.po b/applications/luci-app-upnp/po/sv/upnp.po
index 3bb20be2d..1d5bc2d07 100644
--- a/applications/luci-app-upnp/po/sv/upnp.po
+++ b/applications/luci-app-upnp/po/sv/upnp.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9.1-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -20,163 +20,170 @@ msgstr ""
 "ACL:er anger vilka externa portar som ska omdirigeras till vilka interna "
 "adresser och portar"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Åtgärd"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Aktivera UPnP-omdirigeringar"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Aviserat modellnummer"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Aviserat serienummer"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Klient-adress"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Klient-port"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Samlar in data..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Kommentera"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Radera"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Beskrivning"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "Enhetens UUID"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Nerlänk"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Aktivera NAT-PMP-funktionalitet"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Aktivera UPnP-funktionalitet"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Aktivera ytterligare loggning"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Aktivera säkert läge"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Extern port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Externa portar"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Generella inställningar"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Värd"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Interna adresser"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Interna portar"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "ACL:er för MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Inställningar för MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Intervall för avisering"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Presentationens URL"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Lägger extra felsökningsinformation till system-loggen"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Rapportera systemet iställer för demonens upptid"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Starta UPnP och NAT-PMP-tjänsten"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Det finns inga aktiva omdirigeringar."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -184,26 +191,31 @@ msgstr ""
 "UPnP tillåter klienter i det lokala nätverket att automatiskt ställa in "
 "routern."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Hyr-fil för UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universiell Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Okänd"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Upplänk"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Värde i KByte/s, endast informell"
 
+#~ msgid "Collecting data..."
+#~ msgstr "Samlar in data..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "Ta bort omdirigering"
diff --git a/applications/luci-app-upnp/po/templates/upnp.pot b/applications/luci-app-upnp/po/templates/upnp.pot
index f428af21d..b7b1ce19b 100644
--- a/applications/luci-app-upnp/po/templates/upnp.pot
+++ b/applications/luci-app-upnp/po/templates/upnp.pot
@@ -1,191 +1,200 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr ""
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
diff --git a/applications/luci-app-upnp/po/tr/upnp.po b/applications/luci-app-upnp/po/tr/upnp.po
index 991672540..2a1b9e7bc 100644
--- a/applications/luci-app-upnp/po/tr/upnp.po
+++ b/applications/luci-app-upnp/po/tr/upnp.po
@@ -12,191 +12,203 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Eylem"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Veri alınıyor..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
+
+#~ msgid "Collecting data..."
+#~ msgstr "Veri alınıyor..."
diff --git a/applications/luci-app-upnp/po/uk/upnp.po b/applications/luci-app-upnp/po/uk/upnp.po
index 95dab8c49..e893264dd 100644
--- a/applications/luci-app-upnp/po/uk/upnp.po
+++ b/applications/luci-app-upnp/po/uk/upnp.po
@@ -13,7 +13,7 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -21,164 +21,171 @@ msgstr ""
 "Список контролю доступу визначає, які зовнішні порти можуть бути "
 "переспрямовані на які внутрішні адреси й порти"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Дія"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Активні переспрямування UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Додаткові параметри"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Оголошувати як пристрій IGDv1 замість IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 "Дозволити додавання переспрямування тільки для IP-адрес, що надсилають запити"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Оголошуваний номер моделі"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Оголошуваний серійний номер"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Інтервал очищення правил"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Поріг очищення правил"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "Адреса клієнта"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "Порт клієнта"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Збирання даних..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Примітка"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Видалити"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Опис"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID пристрою"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Низхідне з'єднання"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "Увімкнути режим IGDv1"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Увімкнути функцію NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Увімкнути функцію UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Увімкнути додаткове журналювання"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Увімкнути захищений режим"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Зовнішній порт"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Зовнішні порти"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Загальні параметри"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "Вузол"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Внутрішні адреси"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Внутрішні порти"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "Список контролю доступу MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Настройки MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Інтервал сповіщення"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Порт"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "URL презентації"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Включати додаткові відомості для налагодження до системного журналу"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Повідомляти час безвідмовної роботи системи, а не сервісу"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Запускати служби UPnP та NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Немає активних переспрямувань."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -186,23 +193,28 @@ msgstr ""
 "UPnP надає клієнтам у локальній мережі змогу автоматично настроювати "
 "маршрутизатор."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Файл оренд UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Висхідне з'єднання"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "Значення (КБ/с), тільки для інформації"
+
+#~ msgid "Collecting data..."
+#~ msgstr "Збирання даних..."
diff --git a/applications/luci-app-upnp/po/vi/upnp.po b/applications/luci-app-upnp/po/vi/upnp.po
index 53614f395..d0c65ded6 100644
--- a/applications/luci-app-upnp/po/vi/upnp.po
+++ b/applications/luci-app-upnp/po/vi/upnp.po
@@ -16,195 +16,207 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Hành động"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Đang lấy dữ liệu..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Bình luận"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "Mô tả"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Downlink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Kích hoạt chế độ an toàn"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Giao thức"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr ""
 
+#~ msgid "Collecting data..."
+#~ msgstr "Đang lấy dữ liệu..."
+
 #~ msgid ""
 #~ "UPNP allows clients in the local network to automatically configure the "
 #~ "router."
diff --git a/applications/luci-app-upnp/po/zh-cn/upnp.po b/applications/luci-app-upnp/po/zh-cn/upnp.po
index 6730c1b30..922854842 100644
--- a/applications/luci-app-upnp/po/zh-cn/upnp.po
+++ b/applications/luci-app-upnp/po/zh-cn/upnp.po
@@ -17,195 +17,207 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr "ACL 指定哪些外部端口可以被重定向至哪些内部地址及端口"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "动作"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "活动的 UPnP 重定向"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "广播为 IGDv1 设备，而不是 IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "允许只向请求的 IP 地址添加转发"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "通告的型号"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "通告的序列号"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "定时清除规则"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "清除规则阈值"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "客户端地址"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "客户端端口"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "正在收集数据…"
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "备注"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "删除"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "描述"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "设备 UUID"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "下行速率"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "启用 IGDv1 模式"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "启用 NAT-PMP 功能"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "启用 UPnP 功能"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "启用额外的日志"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "启用安全模式"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "外部端口"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "外部端口"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "基本设置"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "主机"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "内部地址"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "内部端口"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "MiniUPnP ACL"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "MiniUPnP 设置"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "通知的时间间隔"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "端口"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "服务网址"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "协议"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "将额外的调试信息打印至系统日志中"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "用系统运行时间代替进程运行时间"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "启动 UPnP 与 NAT-PMP 服务"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "没有活动的重定向。"
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr "UPnP 允许局域网内客户端自动设置路由器上的端口转发。"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP 租约文件"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "通用即插即用（UPnP）"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "未知"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "上行速率"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "值为 KByte/s，仅供参考"
 
+#~ msgid "Collecting data..."
+#~ msgstr "正在收集数据…"
+
 #~ msgid "Delete Redirect"
 #~ msgstr "删除转发规则"
 
diff --git a/applications/luci-app-upnp/po/zh-tw/upnp.po b/applications/luci-app-upnp/po/zh-tw/upnp.po
index 7090d70f5..aadf5ccdd 100644
--- a/applications/luci-app-upnp/po/zh-tw/upnp.po
+++ b/applications/luci-app-upnp/po/zh-tw/upnp.po
@@ -15,195 +15,207 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr "ACL存取控制清單, 就是指定某些外部埠可以從導到內部位址和埠號"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "行動"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "啓用UPnP從導"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "進階設定"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "只允許請求的IP位址新增從導機制"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "已宣告模組號碼"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "已宣告序號"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "清除規則間隔"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "清除規則門檻"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:82
 msgid "Client Address"
 msgstr "用戶端位址"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
 msgid "Client Port"
 msgstr "用戶端埠號"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "收集資料中..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "評論"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
 msgid "Description"
 msgstr "說明"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "設備UUID獨立識別碼"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "下載"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr ""
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "啓用蘋果NAT-PMP傳輸埠對應通訊協定功能"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "啓用UPnP通用序列埠功能"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "啓用額外記錄"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "啓用安全模式"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "外部埠號"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "外部埠號範圍"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
 msgid "Host"
 msgstr "主機"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "內部位址"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "內部埠號"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "小型UPnP存取控制清單"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "小型UPnP存取控制清單設定"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "提醒間隔"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "埠號"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "介紹URL連結"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "協議"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "把額外的除錯資訊放入系統log計錄中"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "報表系統取代常駐更新時間"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "啓用UPnP跟NAT-PMP服務"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "目前無作用中的從導"
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr "開放本地用戶端自動設定路由器UPNP機制"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "UPnP 租賃文件"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "通用隨插即用（UPnP）"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "未知"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "上行速率"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
 msgid "Value in KByte/s, informational only"
 msgstr "值為 KByte/s，僅供參考"
 
+#~ msgid "Collecting data..."
+#~ msgstr "收集資料中..."
+
 #~ msgid "Delete Redirect"
 #~ msgstr "刪除從導"