treewide: Sync translations

Sync translations.

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

156 files changed, 11113 insertions, 8888 deletions

diff --git a/applications/luci-app-attendedsysupgrade/po/ar/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ar/attendedsysupgrade.po
index 56fe7b1d16..57ffecffc8 100644
--- a/applications/luci-app-attendedsysupgrade/po/ar/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ar/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -33,20 +33,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -54,67 +58,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "التكوين"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "تحميل"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "نظام الملفات"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -122,27 +134,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -156,23 +168,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -180,7 +192,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -188,23 +200,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -216,11 +228,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -228,61 +240,73 @@ msgstr ""
 msgid "Server"
 msgstr "الخادم"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po
index a30ebcc223..f98daa9d4b 100644
--- a/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/bg/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -32,20 +32,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Отмени"
 
@@ -53,67 +57,75 @@ msgstr "Отмени"
 msgid "Client"
 msgstr "Клиент"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Затвори"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Файлова система"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,61 +239,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Версия"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/bn_BD/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/bn_BD/attendedsysupgrade.po
index 40a8348209..f760aa01b6 100644
--- a/applications/luci-app-attendedsysupgrade/po/bn_BD/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/bn_BD/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -32,20 +32,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "বাতিল করুন"
 
@@ -53,67 +57,75 @@ msgstr "বাতিল করুন"
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "কনফিগারেশন"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,61 +239,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "সংস্করণ"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/ca/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ca/attendedsysupgrade.po
index 0069379aef..b82af40a20 100644
--- a/applications/luci-app-attendedsysupgrade/po/ca/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ca/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Actualització Assistida"
@@ -32,20 +32,24 @@ msgstr "Actualització Assistida"
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -53,67 +57,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Tanca"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,61 +239,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/cs/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/cs/attendedsysupgrade.po
index d8471ddd32..03f09f1e6b 100644
--- a/applications/luci-app-attendedsysupgrade/po/cs/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/cs/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Pokročilý mód"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Interaktivně provedený přechod na novější verzi systému"
@@ -32,20 +32,24 @@ msgstr "Interaktivně provedený přechod na novější verzi systému"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Konfigurace interaktivního přechodu na novější verzi systému."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Název zařízení / Profilu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Datum sestavení"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Sestavování firmwaru..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -53,68 +57,76 @@ msgstr "Zrušit"
 msgid "Client"
 msgstr "Klient"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Zavřít"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "Nepodařilo se připojit k API na \"%s\". Prosím zkuste to znovu později."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Aktuálně spuštěná verze: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Staženo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Stáhnout obraz firmwaru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Stahování archivu ImageBuilderu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Stahování firmwaru ze serveru do prohlížeče"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Probíhá stahování..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Během sestavování obrazu firmwaru došlo k chybě"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Připojení k upgradovacímu serveru selhalo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Během stahování firmwaru došlo k chybě. Prosím zkuste to znovu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Název souboru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generování obrazu firmwaru"
 
@@ -122,27 +134,27 @@ msgstr "Generování obrazu firmwaru"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Udělit přístup UCI k LuCI aplikaci interaktivního upgradu systému"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Instalovat obraz firmwaru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Probíhá instalace. Neodpojujte zařízení od napájení!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Probíhá instalace..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Uchovat nastavení a současnou konfiguraci"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "K dispozici nová verze firmwaru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Upgrade není k dispozici"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Přehled"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Balíčky"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Prosím zašlete záznám o chybě"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Postup: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Zařazeno do fronty..."
 
@@ -182,7 +194,7 @@ msgstr "Zařazeno do fronty..."
 msgid "Rebuilders"
 msgstr "Sestavitelé"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Sestavení"
 
@@ -190,23 +202,23 @@ msgstr "Sestavení"
 msgid "Received build request"
 msgstr "Přijatá žádost o sestavení"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Žádost o data:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Zaslat žádost o obraz firmwaru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Pozice žádosti ve frontě sestavení %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Vyhledat upgrade firmwaru"
 
@@ -218,11 +230,11 @@ msgstr "Vyhledat nové aktualizace systému při otevření karty"
 msgid "Search on opening"
 msgstr "Vyhledat při otevření"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Hledání dostupné aktualizace systému %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Hledání..."
 
@@ -230,27 +242,35 @@ msgstr "Hledání..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Odpověď serveru: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Nastavení ImageBuilderu"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Zobrazit pokročilé možnosti, jako je úprava seznamu balíčků"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Obraz firmwaru úspěšně vytvořen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Cíl"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,40 +278,47 @@ msgstr ""
 "Služba interaktivního systémového upgradu umožňuje snadné upgradování "
 "základních i vlastních obrazů firmware."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Zařízení běží na nejnovější verzi firmwaru %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Toho se dosahuje sestavením nového firmwaru na vyžádání pomocí online služby."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Probíhá nahrávání firmwaru z prohlížeče do zařízení"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Probíhá nahrávání..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Ověření výběru balíčků"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Verze"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Chybný kontrolní součet"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[instalováno] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Ověření výběru balíčků"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Přijat požadavek k sestavení"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/da/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/da/attendedsysupgrade.po
index 0aa967d9b3..96d0364c19 100644
--- a/applications/luci-app-attendedsysupgrade/po/da/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/da/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Avanceret tilstand"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Deltaget i Sysupgrade"
@@ -32,20 +32,24 @@ msgstr "Deltaget i Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Deltaget i en opgradering af systemet Konfiguration."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Board Name / Profile"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Bygningsdato"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Building Firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Annuller"
 
@@ -53,67 +57,75 @@ msgstr "Annuller"
 msgid "Client"
 msgstr "Klient"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Luk"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Kunne ikke nå API på \"%s\". Prøv venligst igen senere."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Kører i øjeblikket: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Download"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Download firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Download af ImageBuilder-arkiv"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Downloader firmware fra server til browser"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Downloader..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Fejl ved bygning af firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Fejl ved tilslutning til opgraderingsserveren"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Fejl under download af firmware. Prøv venligst igen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Filnavn"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generering af firmware-image"
 
@@ -121,27 +133,27 @@ msgstr "Generering af firmware-image"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Giv UCI adgang til LuCI-appen attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Installer firmware-image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Installerer sysupgraden. Sluk ikke for enheden!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installerer..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Bevar indstillingerne og den aktuelle konfiguration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Ny firmwareopgradering tilgængelig"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Ingen opgradering tilgængelig"
 
@@ -157,23 +169,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Oversigt"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pakker"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Rapportér venligst fejlmeddelelsen og anmod"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progress: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "I kø..."
 
@@ -181,7 +193,7 @@ msgstr "I kø..."
 msgid "Rebuilders"
 msgstr "Ombyggere"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Ombygninger"
 
@@ -189,23 +201,23 @@ msgstr "Ombygninger"
 msgid "Received build request"
 msgstr "Modtaget byggeanmodning"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Anmod om data:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Anmod firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Anmodning i byggekø position %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Søg efter firmwareopgradering"
 
@@ -217,11 +229,11 @@ msgstr "Søg efter nye sysupgrades, når du åbner fanen"
 msgid "Search on opening"
 msgstr "Søg ved åbning"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Søger efter en tilgængelig sysupgrade af %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Søger..."
 
@@ -229,27 +241,35 @@ msgstr "Søger..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Svar fra serveren: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Opsætning af ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Vis avancerede indstillinger som f.eks. ændring af pakkeliste"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Det lykkedes at oprette firmware-image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Mål"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -257,40 +277,47 @@ msgstr ""
 "Med den assisterede sysupgrade-tjeneste kan du nemt opgradere vanilla- og "
 "brugerdefinerede firmwareimages."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Enheden kører den seneste firmwareversion %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Dette gøres ved at bygge en ny firmware on demand via en online service."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Uploader firmware fra browser til enhed"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Uploader..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validering af pakkevalg"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Forkert kontrolsum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installeret] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validering af pakkevalg"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Modtaget byggeanmodning"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/de/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/de/attendedsysupgrade.po
index e8111b2203..2382e89ab9 100644
--- a/applications/luci-app-attendedsysupgrade/po/de/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/de/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Erweiterter Modus"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Begleitetes System-Upgrade"
@@ -32,20 +32,24 @@ msgstr "Begleitetes System-Upgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Einstellungen für Begleitetes System-Upgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Board Name / Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Build-Datum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Firmware wird erstellt.."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -53,69 +57,77 @@ msgstr "Abbrechen"
 msgid "Client"
 msgstr "Client"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Schließen"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "Die API unter \"%s\" konnte nicht erreicht werden. Bitte versuchen Sie es "
 "später noch einmal."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Derzeit ausgeführt: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Herunterladen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Firmware-Image herunterladen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "ImageBuilder-Archiv wird heruntergeladen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Firmware vom Server zum Browser herunterladen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Wird heruntergeladen..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Fehler beim Erstellen des Firmware-Images"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Fehler beim Verbinden mit dem Upgrade-Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Fehler beim Firmware-Download. Bitte erneut versuchen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Dateiname"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Firmware-Image wird erzeugt"
 
@@ -123,27 +135,27 @@ msgstr "Firmware-Image wird erzeugt"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "LuCI-App für begleitetes System-Upgrade UCI-Zugriff gewähren"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Firmware-Image installieren"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Installiere System-Upgrade. Gerät nicht ausschalten!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installation..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Einstellungen beibehalten und die aktuelle Konfiguration sichern"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Neues Firmware-Upgrade verfügbar"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Kein Upgrade verfügbar"
 
@@ -160,23 +172,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Übersicht"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pakete"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Bitte Fehlermeldung melden und Anforderung"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Fortschritt: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "In Warteschlange..."
 
@@ -184,7 +196,7 @@ msgstr "In Warteschlange..."
 msgid "Rebuilders"
 msgstr "Rekonstrukteure"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Rekonstruktionen"
 
@@ -192,23 +204,23 @@ msgstr "Rekonstruktionen"
 msgid "Received build request"
 msgstr "Build-Anfrage erhalten"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Daten anfordern:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Firmware-Image anfordern"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Anforderung in Build-Warteschlangenposition %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Nach Firmware-Upgrade suchen"
 
@@ -220,11 +232,11 @@ msgstr "Suche beim Öffnen des Tabs nach neuen System-Upgrades"
 msgid "Search on opening"
 msgstr "Suche beim Öffnen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Suche nach einem verfügbaren Sysupgrade von %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Suche..."
 
@@ -232,27 +244,35 @@ msgstr "Suche..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Serverantwort: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "ImageBuilder einrichten"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Erweiterte Optionen anzeigen, z.B. Paketlistenmodifizierung"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Firmware-Image erfolgreich erstellt"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Zielplatform"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -260,40 +280,47 @@ msgstr ""
 "Begleitetes Sysupgrade erlaubt es, Upgrades für Vanilla- und Custom-"
 "Installationen einzuspielen."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Auf dem Gerät läuft die neueste Firmware-Version %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Dafür wird auf Anfrage eine neue Firmware bei einem Online-Service gebaut."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Firmware vom Browser zum Gerät laden"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Hochladen..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Paketauswahl bestätigen"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Falsche Prüfsumme"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installiert] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Paketauswahl bestätigen"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Build-Anfrage erhalten"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/el/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/el/attendedsysupgrade.po
index 6dd75b400c..4104eb1cfe 100644
--- a/applications/luci-app-attendedsysupgrade/po/el/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/el/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Υποβοήθηση Sysupgrade"
@@ -32,20 +32,24 @@ msgstr "Υποβοήθηση Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -53,67 +57,75 @@ msgstr "Ακύρωση"
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Λήψη"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,61 +239,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Στόχος"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/en/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/en/attendedsysupgrade.po
index 0b463322b0..fc0545b339 100644
--- a/applications/luci-app-attendedsysupgrade/po/en/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/en/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Advanced Mode"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Attended Sysupgrade"
@@ -32,20 +32,24 @@ msgstr "Attended Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Attendedsysupgrade Configuration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Board Name / Profile"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Build Date"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Building Firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -53,67 +57,75 @@ msgstr "Cancel"
 msgid "Client"
 msgstr "Client"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Close"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configuration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Could not reach API at \"%s\". Please try again later."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Currently running: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Download"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Download firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Downloading ImageBuilder archive"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Downloading firmware from server to browser"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Error building the firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Error connecting to upgrade server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Error during download of firmware. Please try again"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Filename"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generating firmware image"
 
@@ -121,28 +133,28 @@ msgstr "Generating firmware image"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Grant UCI access to LuCI app attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Install firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Installing the sysupgrade. Do not disconnect power from the device!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installing..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 #, fuzzy
 msgid "Keep settings and retain the current configuration"
 msgstr "Keep settings and retain the current configuration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "New firmware upgrade available"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "No upgrade available"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Overview"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Packages"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Please report the error message and request"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profile"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progress: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Queued..."
 
@@ -182,7 +194,7 @@ msgstr "Queued..."
 msgid "Rebuilders"
 msgstr "Rebuilders"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Rebuilds"
 
@@ -190,23 +202,23 @@ msgstr "Rebuilds"
 msgid "Received build request"
 msgstr "Received build request"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Request Data:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Request firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Request in build queue position %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Search for firmware upgrade"
 
@@ -218,11 +230,11 @@ msgstr "Search for new sysupgrades on opening the tab"
 msgid "Search on opening"
 msgstr "Search on opening"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Searching for an available sysupgrade of %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Searching..."
 
@@ -230,27 +242,35 @@ msgstr "Searching..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Server response: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Setting Up ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Show advanced options like package list modification"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Successfully created firmware image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Target"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,40 +278,47 @@ msgstr ""
 "The attended sysupgrade service allows you to easily upgrade vanilla and "
 "custom firmware images."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "The device is running the latest firmware version %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "This is done by building a new firmware image on demand via an online "
 "service."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Uploading firmware from browser to device"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Uploading..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validate package selection"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Wrong checksum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installed] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validate package selection"
+
 #~ msgid "attended sysupgrade via rpcd and luci"
 #~ msgstr "attended system upgrade via rpcd and luci"
diff --git a/applications/luci-app-attendedsysupgrade/po/es/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/es/attendedsysupgrade.po
index ab639d569f..983a65535a 100644
--- a/applications/luci-app-attendedsysupgrade/po/es/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/es/attendedsysupgrade.po
@@ -26,7 +26,7 @@ msgid "Advanced Mode"
 msgstr "Modo avanzado"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Actualización asistida"
@@ -35,20 +35,24 @@ msgstr "Actualización asistida"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Configuración de actualización asistida."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Nombre de Placa / Perfil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Fecha de compilación"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Compilando firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -56,69 +60,77 @@ msgstr "Cancelar"
 msgid "Client"
 msgstr "Cliente"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Cerrar"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configuración"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "No se pudo contactar la API en \"%s\". Por favor, inténtelo de nuevo más "
 "tarde."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Actualmente en ejecución: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Descargar"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Descargar imagen de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Descargando archivo de ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Descargando firmware del servidor al navegador"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Error al compilar la imagen de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Error al conectarse al servidor de actualizaciones"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Error durante la descarga del firmware. Inténtalo de nuevo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "sistema de archivos"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generando imagen de firmware"
 
@@ -126,27 +138,27 @@ msgstr "Generando imagen de firmware"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Otorgar acceso UCI a la aplicación LuCI actualización asistida"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Instalar imagen de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Instalando el archivo sysupgrade. ¡No apague el dispositivo!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Instalando..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Mantener los ajustes y conservar la configuración actual"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Nueva actualización de firmware disponible"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "No hay actualización disponible"
 
@@ -162,23 +174,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Descripción general"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Paquetes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Por favor informe el mensaje de error y solicite"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Perfil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progreso: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Agregado a cola..."
 
@@ -186,7 +198,7 @@ msgstr "Agregado a cola..."
 msgid "Rebuilders"
 msgstr "Recompiladores"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Recompilaciones"
 
@@ -194,23 +206,23 @@ msgstr "Recompilaciones"
 msgid "Received build request"
 msgstr "Solicitud de compilación recibida"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Datos de la solicitud:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Solicitar imagen de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Solicitud en la posición %s de la cola de compilación"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Buscar actualización de firmware"
 
@@ -222,11 +234,11 @@ msgstr "Busque nuevas actualizaciones del sistema al abrir la pestaña"
 msgid "Search on opening"
 msgstr "Buscar al abrir"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Buscando una actualización del sistema disponible de %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -234,28 +246,36 @@ msgstr "Buscando..."
 msgid "Server"
 msgstr "Servidor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Respuesta del servidor: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Configurar ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 "Mostrar opciones avanzadas como la modificación de la lista de paquetes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Imagen de firmware creada con éxito"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Objetivo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -263,41 +283,48 @@ msgstr ""
 "El servicio de actualización asistida permite actualizar fácilmente las "
 "imágenes de firmware personalizadas y/o limpias."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "El dispositivo ejecuta la última versión de firmware %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Esto se hace creando un nuevo firmware bajo demanda a través de un servicio "
 "en línea."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Cargando firmware desde el navegador al dispositivo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Cargando..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validar selección de paquete"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versión"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Suma de comprobación incorrecta"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "%s [instalado]"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validar selección de paquete"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Solicitud de compilación recibida"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/fa/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/fa/attendedsysupgrade.po
index d2e71d4bef..97988899fd 100644
--- a/applications/luci-app-attendedsysupgrade/po/fa/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/fa/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "حالت پیشرفته"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "در Sysupgrade ثبت شد"
@@ -32,20 +32,24 @@ msgstr "در Sysupgrade ثبت شد"
 msgid "Attendedsysupgrade Configuration."
 msgstr "پیکربندی sysupgrade ثبت شد."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "نام /پروفایل بورد"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "تاریخ ساخت"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "ساختن ثابت‌افزار…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "لغو"
 
@@ -53,67 +57,75 @@ msgstr "لغو"
 msgid "Client"
 msgstr "کارخواه"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "بستن"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "پیکربندی"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "دسترسی به API در \"%s\" ممکن نیست. لطفا بعدا دوباره امتحان کنید."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "در حال اجرا : %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "بارگیری"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "دانلود تصویر سیستم عامل"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "در حال دانلود بایگانی ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "بار گرفتن ثابت‌افزار از کارساز به مرورگر"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "در حال دانلود..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "خطا در ساخت تصویر سیستم عامل"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "خطای وصل شدن به کارساز ارتقا"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "خطا در بارگیری ثابت‌افزار. لطفاً دوباره تلاش کنید"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "نام ورونده"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "سامانه‌پرونده"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "در حال ساخت ایمیج سیستم عامل"
 
@@ -121,27 +133,27 @@ msgstr "در حال ساخت ایمیج سیستم عامل"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "به UCI اجازه دسترسی به برنامه LuCI اعطا کنید تا در حال ارتقاء باشد"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "نصب تصویر سیستم عامل"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "نصب کردن sysupgrade. برق افزاره را قطع نکنید!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "در حال نصب..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "تنظیمات را نگه دارید و پیکربندی فعلی را حفظ کنید"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "ارتقاء سیستم عامل جدید در دسترس است"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "هیچ ارتقایی موجود نیست"
 
@@ -157,23 +169,23 @@ msgstr ""
 msgid "Overview"
 msgstr "نمای کلی"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "بسته ها"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "لطفا پیام خطا را گزارش دهید و درخواست کنید"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "مشخصات"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "پیشرفت: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "در صف..."
 
@@ -181,7 +193,7 @@ msgstr "در صف..."
 msgid "Rebuilders"
 msgstr "بازسازی کنندگان"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "بازسازی ها"
 
@@ -189,23 +201,23 @@ msgstr "بازسازی ها"
 msgid "Received build request"
 msgstr "درخواست ساخت دریافت شد"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "درخواست داده ها:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "درخواست تصویر سیستم عامل"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "درخواست ایجاد در موقعیت صف ساخت %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "جستجو برای ارتقاء سیستم عامل"
 
@@ -217,11 +229,11 @@ msgstr "با باز کردن برگه، سیستم ارتقای جدید را ج
 msgid "Search on opening"
 msgstr "جستجو در باز کردن"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "جستجو برای ارتقاء سیستم موجود %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "درحال جستجو..."
 
@@ -229,27 +241,35 @@ msgstr "درحال جستجو..."
 msgid "Server"
 msgstr "کارساز"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "پاسخ سرور: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "راه اندازی ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "نمایش گزینه های پیشرفته مانند اصلاح لیست بسته ها"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "تصویر سیستم عامل با موفقیت ایجاد شد"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "هدف"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -257,41 +277,48 @@ msgstr ""
 "این سرویس با حضور در سیستم ارتقا اجازه می دهد تا به راحتی وانیل و تصاویر "
 "سیستم عامل سفارشی ارتقا دهید."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "دستگاه جدیدترین نسخه سیستم عامل را اجرا می کند %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "این کار با ایجاد یک سیستم عامل جدید در صورت تقاضا از طریق یک سرویس اینترنتی "
 "انجام می شود."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "بار گذاشتن ثابت‌افزار از مرورگر به افزاره"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "در حال آپلود..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "انتخاب بسته را تایید کنید"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "نسخه"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "اشتباه در checksum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "نصب شده %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "انتخاب بسته را تایید کنید"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% درخواست ساخت پکیج دریافت شد"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/fi/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/fi/attendedsysupgrade.po
index 35e5e83174..75bccf9803 100644
--- a/applications/luci-app-attendedsysupgrade/po/fi/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/fi/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Edistynyt tila"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Järjestelmän valvottu päivitys"
@@ -32,20 +32,24 @@ msgstr "Järjestelmän valvottu päivitys"
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Koostamispäivä"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Koostetaan laiteohjelmistoa..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -53,67 +57,75 @@ msgstr "Peruuta"
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Sulje"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Kokoonpano"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Nyt käynnissä: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Lataus"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Lataa laiteohjelmiston levykuva"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Ladataan laiteohjelmistoa palvelimelta selaimeen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Ladataan..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Tiedostojärjestelmä"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Asenna laiteohjelmiston levykuva"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Asennetaan järjestelmäpäivitystä. Älä sammuta laitetta!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Asennetaan..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Säilytä asetukset ja nykyinen kokoonpano"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Uusi laiteohjelmistopäivitys saatavilla"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Ei päivityksiä saatavilla"
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Yleiskatsaus"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Paketit"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Ilmoita virheviesti ja pyyntö"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profiili"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Edistyminen: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Asetettu jonoon..."
 
@@ -179,7 +191,7 @@ msgstr "Asetettu jonoon..."
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Pyynnön data:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Pyydä laiteohjelmiston levykuva"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Etsi laiteohjelmiston päivitystä"
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Etsitään..."
 
@@ -227,62 +239,74 @@ msgstr "Etsitään..."
 msgid "Server"
 msgstr "Palvelin"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Palvelimen vastaus: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Lähetetään laiteohjelmisto selaimelta laitteelle"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Lähetetään..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versio"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Väärä tarkistussumma"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[asennettu] %s"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/fr/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/fr/attendedsysupgrade.po
index dcf34c8636..1d67e77e7d 100644
--- a/applications/luci-app-attendedsysupgrade/po/fr/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/fr/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Mode avancé"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Mise à niveau Système"
@@ -32,20 +32,24 @@ msgstr "Mise à niveau Système"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Configuration Mise à niveau du système."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Nom de la Carte / Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Date de construction"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Construction du micrologiciel..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -53,67 +57,75 @@ msgstr "Annuler"
 msgid "Client"
 msgstr "Client"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Fermer"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configuration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Ne peut pas joindre l’API à \"%s\". Veuillez retenter plus tard."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "En cours d'exécution : %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Télécharger"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Téléchargement de l'image du micrologiciel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Téléchargement de l'archive ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Téléchargement du micro logiciel du serveur au navigateur"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Erreur de construction de l'image du micrologiciel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Erreur en connectant le serveur de mise à jour"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Erreur durant le téléchargement du logiciel. Merci d'essayer à nouveau"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Système de fichiers"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Génération d'une image de micrologiciel"
 
@@ -121,27 +133,27 @@ msgstr "Génération d'une image de micrologiciel"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Autoriser l’accès UCI à l’application LuCI de mise à jour système"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Installation de l'image du micrologiciel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Installation du sysupgrade. Ne pas débrancher l'appareil !"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installation..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Garder les paramètres et conserver la configuration actuelle"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Nouvelle mise à jour du micrologiciel disponible"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Pas de mise à jour disponible"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Paquets"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Veuillez signaler le message d'erreur et demander"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progression : %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "En file d'attente..."
 
@@ -182,7 +194,7 @@ msgstr "En file d'attente..."
 msgid "Rebuilders"
 msgstr "Reconstructeurs"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Reconstructions"
 
@@ -190,23 +202,23 @@ msgstr "Reconstructions"
 msgid "Received build request"
 msgstr "Demande de construction reçue"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Demande de données :"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Demander l'image du micrologiciel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Demande de construction dans la file d'attente position %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Recherche de mise à jour du micrologiciel"
 
@@ -218,11 +230,11 @@ msgstr "Recherche de nouvelles sysupgrades à l'ouverture de l'onglet"
 msgid "Search on opening"
 msgstr "Recherche à l'ouverture"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Recherche d'un sysupgrade disponible de %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Recherche..."
 
@@ -230,28 +242,36 @@ msgstr "Recherche..."
 msgid "Server"
 msgstr "Serveur"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Réponse du serveur : %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Configuration d'ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 "Afficher les options avancées comme la modification de la liste des paquets"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "L'image du micrologiciel a été créée avec succès"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Cible"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -259,41 +279,48 @@ msgstr ""
 "Le service sysupgrade assisté permet de mettre facilement à niveau les "
 "images de firmware vanilla et personnalisées."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "L’appareil exécute la dernière version du micrologiciel %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Cela se fait en construisant un nouveau micrologiciel à la demande via un "
 "service en ligne."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Télécharger le micrologiciel du navigateur à l'appareil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Téléchargement..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Valider la sélection des packages"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Somme de contrôle incorrecte"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installé] %"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Valider la sélection des packages"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Demande de construction reçue"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/ga/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ga/attendedsysupgrade.po
index 7dba877dbe..89bdaa5d24 100644
--- a/applications/luci-app-attendedsysupgrade/po/ga/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ga/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr "Mód Casta"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "D'fhreastail sé ar Sysupgrade"
@@ -33,20 +33,24 @@ msgstr "D'fhreastail sé ar Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Attendedsupgrade Cumraíocht."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Ainm an Bhoird / Próifíl"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Dáta Tógála"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Firmware Tógála..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Cealaigh"
 
@@ -54,68 +58,76 @@ msgstr "Cealaigh"
 msgid "Client"
 msgstr "Cliant"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Dún"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Cumraíocht"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "Níorbh fhéidir an API a bhaint amach ag \"%s\". Bain triail eile as ar ball."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Ag rith faoi láthair: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Íoslódáil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Íoslódáil an firmware íomhá"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Íoslódáil cartlann ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Íoslódáil an firmware ó fhreastalaí go dtí an bhrabhsálaí"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Ag íosluchtú..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Earráid ag tógáil íomhá an firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Earráid agus an freastalaí á uasghrádú"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Earráid le linn a íoslódáil an firmware. Bain triail eile as"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Ainm comhaid"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Córas comhaid"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Íomhá firmware a ghiniúint"
 
@@ -123,27 +135,27 @@ msgstr "Íomhá firmware a ghiniúint"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Deonaigh rochtain do UCI ar aip LuCI arsuasghrádú"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Suiteáil íomhá firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Suiteáil an sysupgrade. Ná unpower gléas!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Suiteáil..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Coinnigh socruithe agus coinnigh an chumraíocht reatha"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Uasghrádú firmware nua ar fáil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Níl aon uasghrádú ar fáil"
 
@@ -160,23 +172,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Forbhreathnú"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pacáistí"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Tuairiscigh an teachtaireacht earráide agus an t-iarratas"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Próifíl"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Dul chun cinn: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Ciúáilte..."
 
@@ -184,7 +196,7 @@ msgstr "Ciúáilte..."
 msgid "Rebuilders"
 msgstr "Aththógálaithe"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Atógann"
 
@@ -192,23 +204,23 @@ msgstr "Atógann"
 msgid "Received build request"
 msgstr "Fuarthas iarratas tógála"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Sonraí Iarratas:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Iarr íomhá firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Iarratas i suíomh scuaine tógála %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Cuardaigh le haghaidh uasghrádú firmware"
 
@@ -220,11 +232,11 @@ msgstr "Déan cuardach do sysugrades nua nuair a osclaítear an cluaisín"
 msgid "Search on opening"
 msgstr "Cuardaigh ar oscailt"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Ag cuardach do shíshuasghrádú de %s - %s atá ar fáil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Ag cuardach..."
 
@@ -232,27 +244,35 @@ msgstr "Ag cuardach..."
 msgid "Server"
 msgstr "Freastalaí"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Freagra freastalaí: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Suiteáil ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Taispeáin ardroghanna cosúil le modhnú liostaí pacáiste"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Cruthaíodh íomhá firmware go rathúil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Sprioc"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -260,36 +280,43 @@ msgstr ""
 "Ligeann an tseirbhís sysupgrade ar fhreastail sé ar íomhánna fanaile agus "
 "firmware saincheaptha a uasghrádú go héasca."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Ritheann an gléas an leagan firmware is déanaí %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Déantar é seo trí fhirmware nua a thógáil ar éileamh trí sheirbhís ar líne."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Íoslódáil an firmware ó bhrabhsálaí go gléas"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Á uaslódáil..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Bailíochtaigh roghnú pacáiste"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Leagan"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Seiceam mícheart"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[suiteáilte] %s"
+
+#~ msgid "Validate package selection"
+#~ msgstr "Bailíochtaigh roghnú pacáiste"
diff --git a/applications/luci-app-attendedsysupgrade/po/he/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/he/attendedsysupgrade.po
index e7a536b74c..ab7c4a6f3c 100644
--- a/applications/luci-app-attendedsysupgrade/po/he/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/he/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -33,20 +33,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -54,67 +58,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -122,27 +134,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -156,23 +168,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -180,7 +192,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -188,23 +200,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -216,11 +228,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -228,61 +240,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/hi/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/hi/attendedsysupgrade.po
index f291dc535a..62a3f55806 100644
--- a/applications/luci-app-attendedsysupgrade/po/hi/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/hi/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -32,20 +32,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "रद्द करें"
 
@@ -53,67 +57,75 @@ msgstr "रद्द करें"
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "फाइल सिस्टम"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,61 +239,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/hu/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/hu/attendedsysupgrade.po
index 8c948a3924..1af36b4022 100644
--- a/applications/luci-app-attendedsysupgrade/po/hu/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/hu/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Haladó mód"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Felügyelt rendszerfrissítés"
@@ -32,20 +32,24 @@ msgstr "Felügyelt rendszerfrissítés"
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Építés dátuma"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -53,67 +57,75 @@ msgstr "Mégse"
 msgid "Client"
 msgstr "Ügyfél"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Bezár"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Beállítás"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Letöltés"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Firmware letöltése a böngészőbe"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Hiba történt a letöltés során. Kérem, próbálja újra"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Rendszerfrissítés telepítése folyamatban. Ne kapcsolja ki az eszközt!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Beállítások jelenlegi állapotának megtartása"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Nincs elérhető frissítés"
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Áttekintés"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,27 +239,35 @@ msgstr ""
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Haladó beállítások (pl. csomaglista szerkesztése) megjelenítése"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Célcím"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -255,36 +275,40 @@ msgstr ""
 "A felügyelt rendszerfrissítés segítségével könnyen frissíthet alap, illetve "
 "saját készítésű firmware-ket is."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Firmware feltöltése az eszközre"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Verzió"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Hibás ellenőrzőösszeg"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
 
diff --git a/applications/luci-app-attendedsysupgrade/po/it/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/it/attendedsysupgrade.po
index c30c7938d9..c1bec56bc4 100644
--- a/applications/luci-app-attendedsysupgrade/po/it/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/it/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Modalità avanzata"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Sysupgrade assistito"
@@ -32,20 +32,24 @@ msgstr "Sysupgrade assistito"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Configurazione sysupgrade assistita."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Nome piattaforma / Profilo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Data build"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Compilazione del firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -53,67 +57,75 @@ msgstr "Annulla"
 msgid "Client"
 msgstr "Client"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Chiudi"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Impossibile raggiungere l'API su \"%s\". Riprova più tardi."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Operazione in corso: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Scarica"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Scarica l'immagine del firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Scaricamento archivio ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Scaricamento del firmware dal server al browser"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Scaricamento..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Errore compilando l'immagine del firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Errore di connessione al server di aggiornamento"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Errore durante il download del firmware. Riprova"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Nome file"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generazione immagine del firmware"
 
@@ -121,27 +133,27 @@ msgstr "Generazione immagine del firmware"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Concedi l'accesso a UCI all'app LuCI attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Installa immagine del firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Installazione di sysupgrade. Non spegnere il dispositivo!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installazione..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Mantieni le impostazioni e conserva la configurazione attuale"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Nuovo aggiornamento del firmware disponibile"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Nessun aggiornamento disponibile"
 
@@ -157,23 +169,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Riepilogo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Si prega di segnalare il messaggio di errore e la richiesta"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profilo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Avanzamento: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "In coda..."
 
@@ -181,7 +193,7 @@ msgstr "In coda..."
 msgid "Rebuilders"
 msgstr "Ricompilatori"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Ricompilazioni"
 
@@ -189,23 +201,23 @@ msgstr "Ricompilazioni"
 msgid "Received build request"
 msgstr "Richiesta di compilazione ricevuta"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Dati della richiesta:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Richiesta immagine firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Richiesta nella posizione %s della coda di compilazione"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Cerca aggiornamenti del firmware"
 
@@ -217,11 +229,11 @@ msgstr "Cerca nuovi sysupgrade all'apertura della scheda"
 msgid "Search on opening"
 msgstr "Cerca all'apertura"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Ricerca di un sysupgrade disponibile per %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
@@ -229,28 +241,36 @@ msgstr "Ricerca in corso..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Risposta del server: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Configura ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 "Mostra opzioni avanzate come la modifica dell'elenco dei pacchetti software"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Immagine del firmware creata correttamente"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Destinazione"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,41 +278,48 @@ msgstr ""
 "Il servizio sysupgrade assistito consente di aggiornare facilmente le "
 "immagini firmware originali e personalizzate."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Il dispositivo ha già la versione firmware più recente %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Ciò viene fatto compilando un nuovo firmware su richiesta tramite un "
 "servizio online."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Caricamento del firmware dal browser al dispositivo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Invio..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Convalida selezione pacchetto"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versione"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Checksum errato"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installati] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Convalida selezione pacchetto"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Ricevuta richiesta build"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/ja/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ja/attendedsysupgrade.po
index dfca1477cb..5978bb565f 100644
--- a/applications/luci-app-attendedsysupgrade/po/ja/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ja/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -32,20 +32,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -53,67 +57,75 @@ msgstr "キャンセル"
 msgid "Client"
 msgstr "クライアント"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "閉じる"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "設定"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "ダウンロード"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "ダウンロード中..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "インストール中..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "現在の設定を残す"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr "概要"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "パッケージ"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "ファームウェアの更新を検索"
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "検索中..."
 
@@ -227,62 +239,74 @@ msgstr "検索中..."
 msgid "Server"
 msgstr "サーバー"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "サーバーの応答: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "ファームウェアイメージの作成に成功"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "ターゲット"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "バージョン"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
 
diff --git a/applications/luci-app-attendedsysupgrade/po/ko/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ko/attendedsysupgrade.po
index 64dc4d79e0..c31ba43712 100644
--- a/applications/luci-app-attendedsysupgrade/po/ko/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ko/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "고급 모드"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "유인 업그레이드"
@@ -32,20 +32,24 @@ msgstr "유인 업그레이드"
 msgid "Attendedsysupgrade Configuration."
 msgstr "유인 업그레이드(Attended Sysupgrade) 설정입니다."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "보드 이름 / 프로파일"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "빌드 일자"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "펌웨어 빌드 중..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "취소"
 
@@ -53,67 +57,75 @@ msgstr "취소"
 msgid "Client"
 msgstr "클라이언트"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "닫기"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "설정"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "\"%s\"의 API에 도달할 수 없습니다. 나중에 다시 시도해주세요."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "현재 실행 중인 펌웨어: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "펌웨어 이미지 다운로드"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "서버에서 브라우저로 펌웨어 다운로드 중"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "다운로드 중..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "펌웨어 이미지 빌드 실패"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "업그레이드 서버 연결 실패"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "펌웨어 다운로드 실패. 나중에 다시 시도해주세요."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "파일명"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "파일 시스템"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "luci-app-attendedsysupgrade에 UCI 접근 권한 허용"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "펌웨어 이미지 설치"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Sysupgrade 이미지를 설치합니다. 기기의 전원을 끄지 마세요!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "설치 중..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "현재 설정을 유지"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "새로운 펌웨어 업그레이드를 사용할 수 있습니다"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "새로운 업그레이드가 없습니다"
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr "개요"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "패키지"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "에러 메시지와 요청을 보고해주세요"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "프로파일"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "큐에 추가됨..."
 
@@ -179,7 +191,7 @@ msgstr "큐에 추가됨..."
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "요청 데이터:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "펌웨어 이미지 요청"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "펌웨어 업그레이드 검색"
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "%s - %s 로부터 사용 가능한 Sysupgrade를 검색하는 중입니다..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "검색 중..."
 
@@ -227,27 +239,35 @@ msgstr "검색 중..."
 msgid "Server"
 msgstr "서버"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "서버 응답: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "패키지 목록 수정 등 고급 옵션을 표시합니다."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "펌웨어 이미지 생성 성공"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "대상"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -255,36 +275,40 @@ msgstr ""
 "유인 업그레이드 서비스는 순정 또는 커스텀 펌웨어 이미지로 쉽게 업그레이드할 "
 "수 있게 해줍니다."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "최신 펌웨어 버전 실행 중: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "브라우저에서 기기로 펌웨어 업로드 중"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "업로드 중..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "버전"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "체크섬이 일치하지 않음"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[설치됨] %s"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/lt/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/lt/attendedsysupgrade.po
index a280cbd925..3bfadaafa8 100644
--- a/applications/luci-app-attendedsysupgrade/po/lt/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/lt/attendedsysupgrade.po
@@ -26,7 +26,7 @@ msgid "Advanced Mode"
 msgstr "Pažangi veiksena"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Prisistatoma „Sysupgrade“"
@@ -35,20 +35,24 @@ msgstr "Prisistatoma „Sysupgrade“"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Prisistatoma „Sysupgrade“ konfigūracija."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Plokštės pavadinimas/profilis"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Sukūrimo data"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Statoma programinė įranga..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -56,68 +60,76 @@ msgstr "Atšaukti"
 msgid "Client"
 msgstr "Klientas"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Uždaryti"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfigūravimas"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "Negalėjome pasiekti „API“ \"%s\". Prašome pamėginti dar kartą vėlesniu laiku."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Dabar veikia: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Atsisiųsti programinės įrangos laikmeną"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Atsisiunčiama „ImageBuilder“ archyvą"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Atsisiunčiama programinė įranga iš serverio į naršyklę"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Atsisiunčiama..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Klaida statant programinės įrangos laikmeną"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Klaida jungiantis į atnaujinimo serverį"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Klaida atsisiunčiant programine įrangą. Prašome pamėginti dar kartą"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Failo pavadinimas"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Failų sistema"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Kuriame programinės įrangos laikmena"
 
@@ -125,27 +137,27 @@ msgstr "Kuriame programinės įrangos laikmena"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Suteikti „UCI“ prieigą – „LuCI app attendedsysupgrade“"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Įdiegti programinės įrangos laikmeną"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Įdiegiama „sysupgrade“. Neišjunkite įrenginio!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Įdiegiama..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Išlaikyti nustatymus ir dabartinį konfigūravimą"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Naujas programinės įrangos atnaujinimas pasiekiamas"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Atnaujinimo nerasta"
 
@@ -161,23 +173,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Apžiūra"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Paketai"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Prašome pranešti apie klaidos pranešimą"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profilis"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Pažanga: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Eilėje..."
 
@@ -185,7 +197,7 @@ msgstr "Eilėje..."
 msgid "Rebuilders"
 msgstr "„Atstatytojai“"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "„Atstatymai“"
 
@@ -193,23 +205,23 @@ msgstr "„Atstatymai“"
 msgid "Received build request"
 msgstr "Gauti „statymo“ prašymai"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Prašymo data:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Prašyti programinės įrangos laikmeną"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Prašymo „statymo“ eilėje vieta – %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "„SHA-256“"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Ieškoti programinės įrangos atnaujinimo"
 
@@ -221,11 +233,11 @@ msgstr "Ieškoti dėl naujo „sysupgrades“ atidarant skirtuką"
 msgid "Search on opening"
 msgstr "Ieškoti atidarant"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Ieškojama dėl pasiekiamo „sysupgrade“ – %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Ieškoma..."
 
@@ -233,27 +245,35 @@ msgstr "Ieškoma..."
 msgid "Server"
 msgstr "Serveris"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Serverio atsakas: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Nustatyti „ImageBuilder“"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Rodyti pažangias parinktys kaip paketų modifikacijų sąrašą"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Sėkmingai sukurta programinės įrangos laikmena"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Taikinys"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -261,37 +281,44 @@ msgstr ""
 "Prisistatoma „sysupgrade“ tarnybą leidžią lengvai atnaujinti „vanilinį“ ir "
 "atskiras programinių įrangų laikmenas."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Įrenginys veikia ant naujausios programinės įrangos versijos – %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Tai yra daroma „statant/kuriant“ naują programinės įrangos laikmeną, "
 "telkiantis (t.y. per) internetinėmis paslaugomis."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Įkeliama programinė įranga iš naršyklės į įrenginį"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Įkeliama..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Patikrinti paketų pasirinkimą"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versija"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Neatitinkamas „checksum“"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[įdiegta] %s"
+
+#~ msgid "Validate package selection"
+#~ msgstr "Patikrinti paketų pasirinkimą"
diff --git a/applications/luci-app-attendedsysupgrade/po/mr/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/mr/attendedsysupgrade.po
index 03a597fec1..964b694545 100644
--- a/applications/luci-app-attendedsysupgrade/po/mr/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/mr/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "उपस्थित Sysupgrade"
@@ -32,20 +32,24 @@ msgstr "उपस्थित Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -53,67 +57,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,62 +239,74 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
 
diff --git a/applications/luci-app-attendedsysupgrade/po/ms/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ms/attendedsysupgrade.po
index a4cb81f6c6..5f05282055 100644
--- a/applications/luci-app-attendedsysupgrade/po/ms/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ms/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -32,20 +32,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -53,67 +57,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Tutup"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Muat turun"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,61 +239,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Sasaran"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/nb_NO/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/nb_NO/attendedsysupgrade.po
index a873c8aa26..d98bbe1ea0 100644
--- a/applications/luci-app-attendedsysupgrade/po/nb_NO/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/nb_NO/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Bivånet systemoppgradering"
@@ -32,20 +32,24 @@ msgstr "Bivånet systemoppgradering"
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -53,67 +57,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Lukk"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -121,27 +133,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -155,23 +167,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -179,7 +191,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -187,23 +199,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -215,11 +227,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -227,62 +239,74 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versjon"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
 
diff --git a/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po
index d7521d893e..7f175c74fb 100644
--- a/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/nl/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Geavanceerde modus"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Bijgewoond Sysupgrade"
@@ -32,20 +32,24 @@ msgstr "Bijgewoond Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Attendedsysupgrade-configuratie."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Bestuursnaam / Profiel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Bouwdatum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Firmware bouwen..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -53,67 +57,75 @@ msgstr "Annuleren"
 msgid "Client"
 msgstr "Cliënt"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Sluiten"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Kan API niet bereiken op \"%s\". Probeer het later opnieuw."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Momenteel actief: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Download"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Firmware-image downloaden"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "ImageBuilder-archief downloaden"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Firmware downloaden van server naar browser"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Downloaden..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Fout bij het maken van de firmware-image"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Fout bij het verbinden met de upgradeserver"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Fout tijdens downloaden van firmware. Probeer het opnieuw"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Bestandssysteem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Genereren firmware image"
 
@@ -121,27 +133,27 @@ msgstr "Genereren firmware image"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Verleen UCI toegang tot LuCI app bijgewoondsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Firmware-image installeren"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "De sysupgrade installeren. Schakel het apparaat niet uit!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installeren..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Instellingen behouden en de huidige configuratie behouden"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Nieuwe firmware-upgrade beschikbaar"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Geen upgrade beschikbaar"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Overzicht"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pakketten"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Meld de foutmelding en vraag"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profiel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Vooruitgang: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Wachtrij..."
 
@@ -182,7 +194,7 @@ msgstr "Wachtrij..."
 msgid "Rebuilders"
 msgstr "Herbouwers"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Herbouwt"
 
@@ -190,23 +202,23 @@ msgstr "Herbouwt"
 msgid "Received build request"
 msgstr "Verzoek 'build' ontvangen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Gegevens opvragen:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Firmware-image aanvragen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Verzoek in bouwwachtrij positie %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Zoeken naar firmware-upgrade"
 
@@ -218,11 +230,11 @@ msgstr "Zoek naar nieuwe sysupgrades bij het openen van het tabblad"
 msgid "Search on opening"
 msgstr "Zoeken bij opening"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Zoeken naar een beschikbare sysupgrade van %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Zoeken..."
 
@@ -230,27 +242,35 @@ msgstr "Zoeken..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Server antwoord: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Instellen ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Toon geavanceerde opties zoals wijziging van de pakketlijst"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Firmware-image met succes gemaakt"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Doel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,41 +278,48 @@ msgstr ""
 "De bijgewoonde sysupgrade-service maakt het mogelijk om eenvoudig vanille- "
 "en aangepaste firmware-images te upgraden."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Het apparaat voert de nieuwste firmwareversie %s - %s uit"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Dit gebeurt door op aanvraag een nieuwe firmware te bouwen via een online "
 "dienst."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Firmware uploaden van browser naar apparaat"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Uploaden..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Pakketselectie valideren"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versie"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Verkeerde controlesom"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[geïnstalleerd] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Pakketselectie valideren"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% gereserveerd verzoek"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/pl/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/pl/attendedsysupgrade.po
index e880a9138f..3de6c878e5 100644
--- a/applications/luci-app-attendedsysupgrade/po/pl/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/pl/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr "Tryb zaawansowany"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Aktualizacja interaktywna"
@@ -33,20 +33,24 @@ msgstr "Aktualizacja interaktywna"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Konfiguracja Attendedsysupgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Nazwa płyty / Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Data wydania"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Kompilowanie oprogramowania układowego..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -54,67 +58,75 @@ msgstr "Anuluj"
 msgid "Client"
 msgstr "Klient"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Zamknij"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Nie można połączyć z API \"%s\". Spróbuj później."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Aktualnie uruchomione: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Pobierz"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Pobierz obraz oprogramowania układowego"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Pobieranie archiwum ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Pobieranie oprogramowania układowego z serwera do przeglądarki"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Pobieranie..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Błąd podczas tworzenia obrazu oprogramowania układowego"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Błąd połączenia z serwerem aktualizacji"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Błąd pobierania oprogramowania układowego. Spróbuj ponownie"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "System plików"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generowanie obrazu oprogramowania układowego"
 
@@ -122,27 +134,27 @@ msgstr "Generowanie obrazu oprogramowania układowego"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Przyznaj luci-app-attendedsysupgrade dostęp do UCI"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Zainstaluj obraz oprogramowania układowego"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Instalacja sysupgrade. Nie odłączaj zasilania!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Instalowanie..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Zachowaj ustawienia i bieżącą konfigurację"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Dostępna jest aktualizacja oprogramowania układowego"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Brak dostępnej aktualizacji"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Przegląd"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pakiety"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Prześlij zgłoszenie błędu wraz z komunikatem o błędzie"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Postęp: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "W kolejce..."
 
@@ -182,7 +194,7 @@ msgstr "W kolejce..."
 msgid "Rebuilders"
 msgstr "Rekompilatory"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Rekompilacje"
 
@@ -190,23 +202,23 @@ msgstr "Rekompilacje"
 msgid "Received build request"
 msgstr "Otrzymano żądanie kompilacji"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Żądanie danych:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Kompiluj żądany obraz"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Pozycja żądania w kolejce do kompilacji %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Sprawdź dostępność aktualizacji"
 
@@ -218,11 +230,11 @@ msgstr "Wyszukaj aktualizacje przy otwieraniu karty"
 msgid "Search on opening"
 msgstr "Szukaj po otwarciu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Wyszukiwanie dostępnej wersji sysupgrade %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
@@ -230,27 +242,35 @@ msgstr "Wyszukiwanie..."
 msgid "Server"
 msgstr "Serwer"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Odpowiedź serwera: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Konfiguracja ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Pokaż zaawansowane opcje, takie jak modyfikacja listy pakietów"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Pomyślnie utworzony obraz oprogramowania układowego"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Cel"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,42 +278,49 @@ msgstr ""
 "Usługa sysupgrade umożliwia łatwą aktualizację oryginalnych i "
 "niestandardowych obrazów oprogramowania układowego."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 "Urządzenie korzysta z najnowszej wersji oprogramowania układowego %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Nowe oprogramowanie układowe tworzone jest na żądanie za pośrednictwem "
 "usługi online."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Transfer oprogramowania układowego z przeglądarki do urządzenia"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Przesyłanie..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Zatwierdzanie wyboru pakietów"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Wersja"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Błędna suma kontrolna"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[zainstalowano] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Zatwierdzanie wyboru pakietów"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Otrzymano żądanie kompilacji"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/pt/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/pt/attendedsysupgrade.po
index 7df5163f68..e45e016aee 100644
--- a/applications/luci-app-attendedsysupgrade/po/pt/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/pt/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Modo avançado"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Sysupgrade assistido"
@@ -32,20 +32,24 @@ msgstr "Sysupgrade assistido"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Configuração do attendedsysupgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Nome da placa / perfil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Data da compilação"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Construindo o firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -53,67 +57,75 @@ msgstr "Cancelar"
 msgid "Client"
 msgstr "Cliente"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Fechar"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configuração"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Não foi possível alcançar a API em \"%s\". Tente novamente mais tarde."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Atualmente em execução: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Descarregar"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Baixar a imagem de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "A descarregar o ficheiro do ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Descarregar firmware do servidor para o navegador"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Baixando..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Houve um erro ao construir a imagem do firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Erro ao conectar o servidor de atualização"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Erro durante a descarrega do firmware. Por favor, tente de novo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Sistema de ficheiros"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "A gerar a imagem de firmware"
 
@@ -121,27 +133,27 @@ msgstr "A gerar a imagem de firmware"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Conceder UCI acesso à app attendedsysupgrade do LuCI"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Instalar a imagem de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "A instalar o sysupgrade. Não desligue o aparelho!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "A instalar..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Manter as definições e manter a configuração atual"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Uma nova atualização do firmware está disponível"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Não há atualização disponível"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Visão Geral"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pacotes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Por favor, relate a mensagem do erro e a solicitação"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Perfil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progresso: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Enfileirado..."
 
@@ -182,7 +194,7 @@ msgstr "Enfileirado..."
 msgid "Rebuilders"
 msgstr "Reconstrutores"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Reconstruções"
 
@@ -190,23 +202,23 @@ msgstr "Reconstruções"
 msgid "Received build request"
 msgstr "Solicitação de compilação recebida"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Solicitar dados:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Pedir a imagem de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Solicitação na posição %d de fila de construção"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Procurar pela atualização do firmware"
 
@@ -218,11 +230,11 @@ msgstr "Procurar novos sysupgrades ao abrir a guia"
 msgid "Search on opening"
 msgstr "Pesquisar na abertura"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "A procurar por um sysupgrade disponível de %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Procurando..."
 
@@ -230,27 +242,35 @@ msgstr "Procurando..."
 msgid "Server"
 msgstr "Servidor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Resposta do servidor: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Configurar o ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Mostrar opções avançadas como modificação da lista de pacotes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "A imagem do firmware foi criada com sucesso"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Destino"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,41 +278,48 @@ msgstr ""
 "O serviço de sysupgrade atendido permite atualizar facilmente imagens de "
 "firmware padrão e personalizados."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "O aparelho executa a versão mais recente da firmware %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Isto é feito através da construção de um novo firmware sob demanda através "
 "de um serviço online."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "A enviar o firmware do navegador ao aparelho"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "A enviar..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validar a seleção de pacotes"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versão"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Checksum errado"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[instalado] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validar a seleção de pacotes"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% do pedido da compilação foi recebido"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/pt_BR/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/pt_BR/attendedsysupgrade.po
index 5c324cb26b..49b6e54c29 100644
--- a/applications/luci-app-attendedsysupgrade/po/pt_BR/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/pt_BR/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Modo avançado"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Sysupgrade Assistido"
@@ -32,20 +32,24 @@ msgstr "Sysupgrade Assistido"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Configuração do attendedsysupgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Nome da placa / perfil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Data da Build"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Construindo o firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -53,67 +57,75 @@ msgstr "Cancelar"
 msgid "Client"
 msgstr "Cliente"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Fechar"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configuração"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Não foi possível alcançar a API em \"%s\". tente novamente mais tarde."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Atualmente em execução: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Baixar"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Baixar a imagem de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Baixando o arquivo ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Baixando firmware do servidor para o navegador"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Baixando..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Houve um erro ao construir a imagem do firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Erro ao conectar o servidor de atualização"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Erro no download do firmware. Por favor, tente novamente"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Arquivo de sistema"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Gerando a imagem de firmware"
 
@@ -121,27 +133,27 @@ msgstr "Gerando a imagem de firmware"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Garantir acesso UCI para app attendedsysupgrade do LuCI"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Instalar a imagem do firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Instalando o sysupgrade. Não desligue o dispositivo!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Instalando..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Mantenha as configurações e preserve a configuração atual"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Uma nova atualização do firmware está disponível"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Nenhum upgrade disponível"
 
@@ -157,23 +169,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Visão geral"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pacotes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Por favor, relate a mensagem de erro e a solicitação"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Perfil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progresso: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Na fila..."
 
@@ -181,7 +193,7 @@ msgstr "Na fila..."
 msgid "Rebuilders"
 msgstr "Reconstrutores"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Reconstruções"
 
@@ -189,23 +201,23 @@ msgstr "Reconstruções"
 msgid "Received build request"
 msgstr "Solicitação de compilação recebida"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Solicitar dados:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Solicitar a imagem do firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Pedido posicionado na fila de compilação %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Procurar pela atualização do firmware"
 
@@ -217,11 +229,11 @@ msgstr "Pesquisar por novos sysupgrades ao abrir a aba"
 msgid "Search on opening"
 msgstr "Pesquisar ao abrir"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Procurando pela disponibilidade de um sysupgrade em %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Procurando..."
 
@@ -229,27 +241,35 @@ msgstr "Procurando..."
 msgid "Server"
 msgstr "Servidor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Resposta do servidor: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Configurar o ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Mostrar opções avançadas como modificações da lista de pacotes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "A imagem do firmware foi criada com sucesso"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Destino"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -257,41 +277,48 @@ msgstr ""
 "O serviço autônomo sysupgrade permite facilmente realizar o upgrade de "
 "imagens de firmware vanilla e personalizadas."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "O dispositivo possui a versão mas recente do firmware %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Isto é feito criando um novo firmware sob demanda por meio de um serviço "
 "online."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Fazendo o upload do firmware do navegador para o dispositivo"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Enviando..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validar a seleção dos pacotes"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versão"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Checksum incorreto"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[instalado] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validar a seleção dos pacotes"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% do pedido da compilação foi recebido"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/ro/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ro/attendedsysupgrade.po
index f16dbc7b93..532c91a7cc 100644
--- a/applications/luci-app-attendedsysupgrade/po/ro/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ro/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr "Modul avansat"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "a participat Sysupgrade"
@@ -33,20 +33,24 @@ msgstr "a participat Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "A participat la configurațiaysupgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Numele Plăcii / Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Data construirii"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Se crează firmware-ul..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Anulare"
 
@@ -54,69 +58,77 @@ msgstr "Anulare"
 msgid "Client"
 msgstr "Client"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Închideți"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Configurație"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "Nu s-a putut accesa API la \"%s\". Vă rugăm să încercați din nou mai târziu."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "În prezent rulează: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Descarcă"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Descărcați imaginea firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Descărcarea arhivei ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Descărcarea firmware-ului de pe server pe browser"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Descărcare..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Eroare la crearea imaginii firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Eroare de conectare la serverul de actualizare"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 "Eroare în timpul descărcării firmware-ului. Vă rugăm să încercați din nou"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Numele fișierului"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Sistem de fișiere"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generarea imaginii firmware"
 
@@ -124,27 +136,27 @@ msgstr "Generarea imaginii firmware"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Acordarea accesului UCI la aplicația LuCI attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Instalați imaginea firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Instalarea sysupgrade. Nu deconectați dispozitivul!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Se instalează..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Păstrați setările și păstrați configurația curentă"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Este disponibil un nou upgrade de firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Niciun upgrade disponibil"
 
@@ -161,23 +173,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Prezentare generală"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Pachete"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Vă rugăm să raportați mesajul de eroare și să solicitați"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Progres: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "În așteptare..."
 
@@ -185,7 +197,7 @@ msgstr "În așteptare..."
 msgid "Rebuilders"
 msgstr "Reconstructorii"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Reconstrucții"
 
@@ -193,23 +205,23 @@ msgstr "Reconstrucții"
 msgid "Received build request"
 msgstr "Cerere de construcție primită"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Solicitați date:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Solicitați imaginea firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Cerere aflată în coada de așteptare în poziția %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Căutați actualizări firmware"
 
@@ -221,11 +233,11 @@ msgstr "Căutați noi sysupgrades la deschiderea filei"
 msgid "Search on opening"
 msgstr "Căutare la deschidere"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Căutarea unui sysupgrade disponibil de %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Căutare..."
 
@@ -233,27 +245,35 @@ msgstr "Căutare..."
 msgid "Server"
 msgstr "Serverul"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Răspunsul serverului: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Configurare ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Afișați opțiunile avansate, cum ar fi modificarea listei de pachete"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Imaginea firmware a fost creată cu succes"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Țintă"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -261,41 +281,48 @@ msgstr ""
 "Serviciul sysupgrade permite actualizarea cu ușurință a imaginilor de "
 "firmware vanilie și personalizate."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Dispozitivul rulează cea mai recentă versiune de firmware %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Acest lucru se face prin construirea unui nou firmware la cerere prin "
 "intermediul unui serviciu online."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Încărcarea firmware-ului din browser pe dispozitiv"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Se încarcă..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validarea selecției pachetului"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versiune"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Suma de control greșită"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installed] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validarea selecției pachetului"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Solicitare de construire primită"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/ru/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/ru/attendedsysupgrade.po
index fcde440f68..9bc72c9104 100644
--- a/applications/luci-app-attendedsysupgrade/po/ru/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/ru/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr "Расширенный режим"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Обновление Системы"
@@ -33,20 +33,24 @@ msgstr "Обновление Системы"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Конфигурация обновления системы."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Имя платформы / Профиль"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Дата сборки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Сборка прошивки..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -54,67 +58,75 @@ msgstr "Отмена"
 msgid "Client"
 msgstr "Клиент"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Закрыть"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "API сервера \"%s\" недоступен. Пожалуйста, попробуйте позднее."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Сейчас работает: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Скачать"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Скачать образ прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Загрузка архива ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Скачивание прошивки с сервера через браузер"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Скачивание..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Ошибка сборки образа прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Ошибка соединения с сервером обновления"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Ошибка при скачивании прошивки. Пожалуйста, попробуйте ещё раз"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Имя файла"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Файловая система"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Создание образа прошивки"
 
@@ -122,27 +134,27 @@ msgstr "Создание образа прошивки"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Предоставить UCI доступ к приложению LuCI attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Установить образ прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Установка обновления системы. Не выключайте устройство!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Установка..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Сохранить настройки и оставить текущую конфигурацию"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Новое обновление прошивки доступно"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Нет доступных обновлений"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Обзор"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Пакеты"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Пожалуйста, сообщите текст ошибки и запроса"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Профиль"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Ход выполнения: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "В очереди..."
 
@@ -182,7 +194,7 @@ msgstr "В очереди..."
 msgid "Rebuilders"
 msgstr "Реконструкторы"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Перестраивает"
 
@@ -190,23 +202,23 @@ msgstr "Перестраивает"
 msgid "Received build request"
 msgstr "Получен запрос на сборку"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Данные запроса:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Запросить образ прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Запрос в очереди сборки, позиция %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Поиск обновлений прошивки"
 
@@ -218,11 +230,11 @@ msgstr "Искать новые системные обновления при �
 msgid "Search on opening"
 msgstr "Искать при открытии"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Поиск доступной версии sysupgrade %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Поиск..."
 
@@ -230,27 +242,35 @@ msgstr "Поиск..."
 msgid "Server"
 msgstr "Сервер"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Ответ сервера: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Настройка ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Показать расширенные параметры, такие как модификация списка пакетов"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Образ прошивки создан успешно"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Приоритет"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,40 +278,47 @@ msgstr ""
 "Данная служба позволяет легко обновлять ванильные и пользовательские образы "
 "прошивки."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "На устройстве установлена последняя версия прошивки %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Это делается путём создания новой прошивки по требованию через онлайн-сервис."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Загрузка прошивки из браузера на устройство"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Загрузка..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Проверка выбора пакета"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Версия"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Неверная контрольная сумма"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[установлено] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Проверка выбора пакета"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Получен запрос на сборку"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/sk/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/sk/attendedsysupgrade.po
index d742222564..a81fdb92b7 100644
--- a/applications/luci-app-attendedsysupgrade/po/sk/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/sk/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Pokročilý režim"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -33,20 +33,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr "Konfigurácia Attendedsysupgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Názov zariadenia / Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Dátum zostavenia"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Zostavovanie firmvéru..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -54,67 +58,75 @@ msgstr "Zrušiť"
 msgid "Client"
 msgstr "Klient"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Zavrieť"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfigurácia"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Nepodarilo sa získať prístup k API na \"%s\". Skúste neskôr prosím."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Aktuálne spustené: %s – %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Stiahnuť obraz firmvéru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Sťahovanie archívu ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Sťahovanie firmvéru zo servera do prehliadača"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Sťahuje sa..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Chyba pri vytváraní obrazu firmvéru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Chyba pri pripájaní k aktualizačnému serveru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Chyba počas sťahovania firmvéru. Prosím skúste to znova"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Súborový systém"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Generovanie obrazu firmvéru"
 
@@ -122,27 +134,27 @@ msgstr "Generovanie obrazu firmvéru"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Udeliť prístup UCI k LuCI aplikácii attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Inštalovať obraz firmvéru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Inštalácia sysupgrade. Neodpájajte zariadenie!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Inštaluje sa..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Ponechať nastavenia a nestratiť aktuálnu konfiguráciu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "K dispozícii je nová aktualizácia firmvéru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Nie je k dispozícii žiadna aktualizácia"
 
@@ -159,24 +171,24 @@ msgstr ""
 msgid "Overview"
 msgstr "Prehľad"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Balíky"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 #, fuzzy
 msgid "Please report the error message and request"
 msgstr "Nahláste prosím chybovú správu a požiadavku"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Priebeh: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Vo fronte..."
 
@@ -184,7 +196,7 @@ msgstr "Vo fronte..."
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -192,23 +204,23 @@ msgstr ""
 msgid "Received build request"
 msgstr "Prijatá žiadosť o zostavenie"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Žiadané dáta:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Vyžiadať obraz firmvéru"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Žiadosť vo fronte zostavenia na pozícii %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Vyhľadať aktualizáciu firmvéru"
 
@@ -220,11 +232,11 @@ msgstr "Vyhľadávanie nových aktualizácií systému pri otvorení karty"
 msgid "Search on opening"
 msgstr "Vyhľadať pri otvorení"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Hľadanie dostupnej aktualizácie systému %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Hľadanie..."
 
@@ -232,27 +244,35 @@ msgstr "Hľadanie..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Odpoveď servera: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Nastavenie ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Zobraziť pokročilé možnosti, ako je úprava zoznamu balíkov"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Obraz firmvéru úspešne vytvorený"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Cieľ"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -260,37 +280,44 @@ msgstr ""
 "Služba Attended sysupgrade umožňuje jednoduchú aktualizáciu základných a "
 "vlastných obrazov firmvéru."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Zariadenie beží na najnovšej verzii firmvéru %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "To sa dosiahne zostavením nového firmvéru na požiadanie prostredníctvom "
 "online služby."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Nahrávanie firmvéru z prehliadača do zariadenia"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Nahráva sa..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Overovanie výberu balíkov"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Verzia"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Chybný kontrolný súčet"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[nainštalované] %s"
+
+#~ msgid "Validate package selection"
+#~ msgstr "Overovanie výberu balíkov"
diff --git a/applications/luci-app-attendedsysupgrade/po/sv/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/sv/attendedsysupgrade.po
index 7a35c963ae..448eb142a5 100644
--- a/applications/luci-app-attendedsysupgrade/po/sv/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/sv/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Avancerat läge"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Systemövervakad uppgradering"
@@ -32,20 +32,24 @@ msgstr "Systemövervakad uppgradering"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Konfiguration för systemövervakad uppgradering."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Byggnationsdatum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Bygger mjukvara..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -53,67 +57,75 @@ msgstr "Avbryt"
 msgid "Client"
 msgstr "Klient"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Stäng"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Kunde inte nå API vid \"%s\". Vänligen försök igen senare."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Kör för närvarande: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Ladda ner"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Ladda ner mjukvaruavbildning"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Laddar ner ImageBuilder-arkiv"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Laddar ner mjukvaran från servern till webbläsaren"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Laddar ner..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Fel vid byggandet av mjukvaruavbildningen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Fel uppstod vid anslutning till uppgraderingsservern"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Fel vid nerladdning av mjukvaran. Försök igen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Filnamn"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Genererar mjukvaruavbildning"
 
@@ -121,28 +133,28 @@ msgstr "Genererar mjukvaruavbildning"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Ge UCI tillgång till LuCI-appen attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Installera mjukvaruavbildningen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 "Installerar uppgraderingen av systemet. Koppla inte ur strömmen från enheten!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Installerar..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Behåll nuvarande inställningar och konfiguration"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Ny mjukvaruuppgradering tillgänglig"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Ingen uppgradering tillgänglig"
 
@@ -158,23 +170,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Överblick"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Paket"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Vänligen rapportera felmeddelandet och förfrågningen"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Köad..."
 
@@ -182,7 +194,7 @@ msgstr "Köad..."
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -190,23 +202,23 @@ msgstr ""
 msgid "Received build request"
 msgstr "Tog emot byggförfrågan"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Förfrågningsdata:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Begär mjukvaruavbildning"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Förfrågan i byggköposition %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Sök efter mjukvaruuppgradering"
 
@@ -218,11 +230,11 @@ msgstr "Sök efter nya systemuppgraderingar vid öppnande av fliken"
 msgid "Search on opening"
 msgstr "Sök efter öppning"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Söker efter tillgänglig systemuppgradering av %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Söker..."
 
@@ -230,27 +242,35 @@ msgstr "Söker..."
 msgid "Server"
 msgstr "Server"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Svar från servern: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Konfigurerar ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Visa avancerade alternativ, t.ex. modifiering av paketlistan"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Skapandet av mjukvaruavbildningen lyckades"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Mål"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -258,41 +278,48 @@ msgstr ""
 "Tjänsten systemövervakad uppgradering tillåter enkel uppgradering av ej "
 "anpassade och anpassade mjukvaruavbildningar."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Enheten kör den senaste mjukvaruversionen %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Det här görs genom att bygga en ny mjukvaruavbildning efter begäran via en "
 "onlinetjänst."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Laddar upp mjukvaruavbildningen från webbläsaren till enheten"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Validera val av paket"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Fel kontrollsumma"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[installerat] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Validera val av paket"
+
 #~ msgid "File"
 #~ msgstr "Fil"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/templates/attendedsysupgrade.pot b/applications/luci-app-attendedsysupgrade/po/templates/attendedsysupgrade.pot
index 832f936fc5..d0b1aa201e 100644
--- a/applications/luci-app-attendedsysupgrade/po/templates/attendedsysupgrade.pot
+++ b/applications/luci-app-attendedsysupgrade/po/templates/attendedsysupgrade.pot
@@ -14,7 +14,7 @@ msgid "Advanced Mode"
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr ""
@@ -23,20 +23,24 @@ msgstr ""
 msgid "Attendedsysupgrade Configuration."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr ""
 
@@ -44,67 +48,75 @@ msgstr ""
 msgid "Client"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr ""
 
@@ -112,27 +124,27 @@ msgstr ""
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr ""
 
@@ -146,23 +158,23 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr ""
 
@@ -170,7 +182,7 @@ msgstr ""
 msgid "Rebuilders"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr ""
 
@@ -178,23 +190,23 @@ msgstr ""
 msgid "Received build request"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr ""
 
@@ -206,11 +218,11 @@ msgstr ""
 msgid "Search on opening"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr ""
 
@@ -218,61 +230,73 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr ""
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr ""
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
+msgid "Validating package selection"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr ""
diff --git a/applications/luci-app-attendedsysupgrade/po/tr/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/tr/attendedsysupgrade.po
index b78a150a0b..3783ffb76b 100644
--- a/applications/luci-app-attendedsysupgrade/po/tr/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/tr/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Gelişmiş Mod"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Katılımlı Sysupgrade"
@@ -32,20 +32,24 @@ msgstr "Katılımlı Sysupgrade"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Attendedsysupgrade Yapılandırması."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Pano İsmi / Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Sürüm tarihi"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Firmware oluşturuluyor..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "İptal"
 
@@ -53,68 +57,76 @@ msgstr "İptal"
 msgid "Client"
 msgstr "İstemci"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Kapat"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "\"%s\" konumunda API'ye ulaşılamadı. Lütfen daha sonra tekrar deneyiniz."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Şu anda çalışıyor: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "İndir"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Firmware imajını indir"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "ImageBuilder arşivi indiriliyor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Firmware sunucudan tarayıcıya indiriliyor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "İndiriliyor..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Firmware imajı oluşturulurken hata oluştu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Yükseltme sunucusuna bağlanırken hata oluştu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Firmware indirilmesi sırasında hata oldu. Lütfen tekrar deneyin"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Dosya Adı"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Dosya sistemi"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Ürün yazılımı dosyası oluşturuluyor"
 
@@ -122,27 +134,27 @@ msgstr "Ürün yazılımı dosyası oluşturuluyor"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "LuCI attendedsysupgrade uygulamasına UCI erişimi verin"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Firmware imajını yükle"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Sysupgrade yükleniyor. Cihazın gücünü kesmeyin!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Yükleniyor..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Ayarları ve mevcut yapılandırmayı koruyun"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Yeni yükseltme mevcut"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Yeni yükseltme mevcut değil"
 
@@ -159,23 +171,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Genel bakış"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Paketler"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Lütfen hata mesajını ve isteği bildirin"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Profil"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "İlerleme: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Kuyrukta..."
 
@@ -183,7 +195,7 @@ msgstr "Kuyrukta..."
 msgid "Rebuilders"
 msgstr "Yeniden Oluşturucular"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Yeniden oluşturmalar"
 
@@ -191,23 +203,23 @@ msgstr "Yeniden oluşturmalar"
 msgid "Received build request"
 msgstr "Oluşturma isteği alındı"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "İstenilen Veri:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Firmware imajını iste"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "%s oluşturma kuyruğu konumunda istek"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Yazılım yükseltmesi için arayın"
 
@@ -219,11 +231,11 @@ msgstr "Sekmeyi açarken yeni sysupgrade'leri arayın"
 msgid "Search on opening"
 msgstr "Açılışta ara"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "%s - %s arasında kullanılabilir bir sysupgrade aranıyor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Aranıyor..."
 
@@ -231,27 +243,35 @@ msgstr "Aranıyor..."
 msgid "Server"
 msgstr "Sunucu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Sunucu cevabı: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "ImageBuilder'ı Ayarlama"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Paket listesi değişikliği gibi gelişmiş seçenekleri göster"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Firmware imajı başarıyla oluşturuldu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Hedef"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -259,41 +279,48 @@ msgstr ""
 "Katılımlı sysupgrade hizmeti, resmi ve özel yapım firmware imajlarını "
 "kolayca yükseltmenize olanak tanır."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Cihaz en son donanım yazılımı sürümünü %s - %s çalıştırıyor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Bu, talep üzerine çevrimiçi bir hizmet aracılığıyla yeni bir firmware "
 "oluşturularak yapılır."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Firmware tarayıcıdan cihaza yükleniyor"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Karşıya yükleniyor..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Paket seçimini doğrula"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Versiyon"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Hatalı checksum"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[kurulu] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Paket seçimini doğrula"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Alınan derleme isteği"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/uk/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/uk/attendedsysupgrade.po
index 501b5d052c..7d68c718b2 100644
--- a/applications/luci-app-attendedsysupgrade/po/uk/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/uk/attendedsysupgrade.po
@@ -24,7 +24,7 @@ msgid "Advanced Mode"
 msgstr "Розширений режим"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Сервісне оновлення системи"
@@ -33,20 +33,24 @@ msgstr "Сервісне оновлення системи"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Конфігурація Attendedsysupgrade."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Назва платформи / Профіль"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Дата збірки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Створення прошивки..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Скасувати"
 
@@ -54,68 +58,76 @@ msgstr "Скасувати"
 msgid "Client"
 msgstr "Клієнт"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Закрити"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr ""
 "Не вдалося отримати доступ до API на \"%s\". Будь-ласка спробуйте пізніше."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "В даний час працює: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Скачати"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Завантажити образ прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Завантаження архіву ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Завантаження прошивки з сервера в браузер"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Завантаження..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Помилка створення образу прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Помилка підключення до сервера оновлення"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Помилка під час завантаження прошивки. Будь ласка, спробуйте ще раз"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Ім'я файлу"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Файлова система"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Створення образу прошивки"
 
@@ -123,27 +135,27 @@ msgstr "Створення образу прошивки"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Надати UCI доступ до LuCI app Attedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Встановити образ прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Встановлення оновлення системи. Не вимикайте пристрій!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Встановлення..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Зберегти налаштування та поточну конфігурацію"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Доступне оновлення прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Немає доступних оновлень"
 
@@ -159,23 +171,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Огляд"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Пакунки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Будь ласка, повідомте текст помилки та запиту"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Профіль"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Прогрес: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "У черзі..."
 
@@ -183,7 +195,7 @@ msgstr "У черзі..."
 msgid "Rebuilders"
 msgstr "Відбудовники"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Відбудовники"
 
@@ -191,23 +203,23 @@ msgstr "Відбудовники"
 msgid "Received build request"
 msgstr "Отримано запит на збірку"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Дані запиту:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Запит образу прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Запит в черзі на збірку, позиція %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Пошук оновлення прошивки"
 
@@ -219,11 +231,11 @@ msgstr "Пошук нових оновлень системи при відкр�
 msgid "Search on opening"
 msgstr "Пошук при відкритті"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Пошук доступного оновлення системи %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Пошук..."
 
@@ -231,27 +243,35 @@ msgstr "Пошук..."
 msgid "Server"
 msgstr "Сервер"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Відповідь сервера: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Налаштування ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Показати розширені опції, такі як зміна списку пакетів"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Успішно створений образ прошивки"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Ціль"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -259,41 +279,48 @@ msgstr ""
 "Сервіс attended sysupgrade дозволяє легко оновлювати ванільні та "
 "користувацькі образи прошивки."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "На пристрої встановлена остання версія прошивки %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Це відбувається шляхом створення нової прошивки за запитом через онлайн-"
 "сервіс."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Завантаження прошивки з браузера на пристрій"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Завантаження..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Підтвердити вибір пакета"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Версія"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Неправильна контрольна сума"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[встановлено] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Підтвердити вибір пакета"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Отримано запит на збірку"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/vi/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/vi/attendedsysupgrade.po
index ffae0b887b..a69aeb4ca7 100644
--- a/applications/luci-app-attendedsysupgrade/po/vi/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/vi/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "Chế độ nâng cao"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "Nâng cấp Sysupgrade được theo dõi"
@@ -32,20 +32,24 @@ msgstr "Nâng cấp Sysupgrade được theo dõi"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Cấu hình nâng cấp hệ thống có hướng dẫn."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "Tên bo mạch / Hồ sơ"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "Ngày xây dựng"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "Đang xây dựng Firmware..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "Hủy lệnh"
 
@@ -53,67 +57,75 @@ msgstr "Hủy lệnh"
 msgid "Client"
 msgstr "Máy Khách"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "Đóng"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "Không thể kết nối tới API tại \"%s\". Vui lòng thử lại sau."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "Đang chạy: %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "Tải xuống"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "Tải xuống hình ảnh firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "Đang tải xuống tệp tin nén ImageBuilder"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "Đang tải xuống firmware từ máy chủ về trình duyệt"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "Đang tải xuống..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "Lỗi khi tạo hình ảnh firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "Lỗi kết nối tới máy chủ nâng cấp"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "Lỗi trong quá trình tải xuống firmware. Vui lòng thử lại"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "Tên tệp tin"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "Hệ thống tập tin"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "Đang tạo hình ảnh firmware"
 
@@ -121,27 +133,27 @@ msgstr "Đang tạo hình ảnh firmware"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "Cấp quyền truy cập UCI cho ứng dụng LuCI attendedsysupgrade"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "Cài đặt hình ảnh firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "Đang cài đặt sysupgrade. Xin đừng tắt nguồn!"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "Đang cài đặt..."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "Giữ nguyên cài đặt và giữ nguyên cấu hình hiện tại"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "Có bản nâng cấp firmware mới"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "Không có bản nâng cấp"
 
@@ -157,23 +169,23 @@ msgstr ""
 msgid "Overview"
 msgstr "Tổng quan"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "Gói"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "Xin báo cáo thông báo lỗi và yêu cầu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "Hồ sơ"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "Tiến trình: %s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "Đang đợi..."
 
@@ -181,7 +193,7 @@ msgstr "Đang đợi..."
 msgid "Rebuilders"
 msgstr "Người xây dựng"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "Xây dựng lại"
 
@@ -189,23 +201,23 @@ msgstr "Xây dựng lại"
 msgid "Received build request"
 msgstr "Đã nhận yêu cầu xây dựng"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "Dữ liệu yêu cầu:"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "Yêu cầu hình ảnh firmware"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "Yêu cầu ở vị trí hàng đợi xây dựng %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "Tìm kiếm bản nâng cấp firmware"
 
@@ -217,11 +229,11 @@ msgstr "Tìm kiếm sysupgrade mới khi mở tab"
 msgid "Search on opening"
 msgstr "Tìm kiếm khi mở"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "Đang tìm kiếm sysupgrade có sẵn của %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "Đang tìm kiếm..."
 
@@ -229,27 +241,35 @@ msgstr "Đang tìm kiếm..."
 msgid "Server"
 msgstr "Máy Chủ"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "Phản hồi từ máy chủ: %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "Cài đặt ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "Hiển thị các tùy chọn nâng cao như sửa đổi danh sách gói"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "Tạo hình ảnh firmware thành công"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "Mục tiêu"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
@@ -257,40 +277,47 @@ msgstr ""
 "Dịch vụ nâng cấp hệ thống attended cho phép nâng cấp dễ dàng các hình ảnh "
 "firmware gốc và tùy chỉnh."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "Thiết bị chạy phiên bản firmware mới nhất %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr ""
 "Việc này được thực hiện bằng cách xây dựng một firmware mới theo yêu cầu qua "
 "một dịch vụ trực tuyến."
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "Đang tải lên firmware từ trình duyệt lên thiết bị"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "Đang tải lên..."
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "Xác thực lựa chọn gói"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "Phiên bản"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "Checksum sai"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[đã cài đặt] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "Xác thực lựa chọn gói"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% Nhận được yêu cầu xây dựng"
diff --git a/applications/luci-app-attendedsysupgrade/po/zh_Hans/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/zh_Hans/attendedsysupgrade.po
index d56b49dd82..047cf28cee 100644
--- a/applications/luci-app-attendedsysupgrade/po/zh_Hans/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/zh_Hans/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "高级模式"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "值守式系统更新"
@@ -32,20 +32,24 @@ msgstr "值守式系统更新"
 msgid "Attendedsysupgrade Configuration."
 msgstr "值守式系统更新配置。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "主板名称/配置"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "构建日期"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "构建固件中…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "取消"
 
@@ -53,67 +57,75 @@ msgstr "取消"
 msgid "Client"
 msgstr "客户端"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "关闭"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "配置"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "无法访问位于 “%s” 的 API，请稍后再试。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "当前版本：%s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "下载"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "下载固件镜像"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "下载 ImageBuilder 存档中"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "正从服务器下载固件到浏览器"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "下载中…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "构建固件镜像时出错"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "连接至升级服务器时出错"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "固件下载出错，请重试"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "文件名"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "正在生成固件的映像文件"
 
@@ -121,27 +133,27 @@ msgstr "正在生成固件的映像文件"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "授予访问 LuCI 应用 attendedsysupgrade 的权限"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "安装固件镜像"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "正在更新系统，请勿切断电源！"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "安装中…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "保留当前配置"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "有新固件版本可供更新"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "无升级可用"
 
@@ -156,23 +168,23 @@ msgstr ""
 msgid "Overview"
 msgstr "概览"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "软件包"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "请报告错误信息和请求"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "配置文件"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "进度：%s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "队列中…"
 
@@ -180,7 +192,7 @@ msgstr "队列中…"
 msgid "Rebuilders"
 msgstr "重建程序"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "重建"
 
@@ -188,23 +200,23 @@ msgstr "重建"
 msgid "Received build request"
 msgstr "收到构建请求"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "请求数据："
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "请求固件镜像"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "构建队列位置 %s 中的请求"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "搜索固件更新"
 
@@ -216,11 +228,11 @@ msgstr "打开此标签页时搜索新的系统更新"
 msgid "Search on opening"
 msgstr "打开时进行搜索"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "正在搜索 %s - %s 的可用系统更新"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "搜索中…"
 
@@ -228,65 +240,80 @@ msgstr "搜索中…"
 msgid "Server"
 msgstr "服务器"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "服务器响应：%s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "设置 ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "显示高级选项，如软件包列表更改"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "已成功创建固件镜像"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "目标"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr "值守式系统升级服务可让您轻松升级原版和自定义固件镜像。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "此设备正运行最新的固件版本 %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr "这是通过按需构建新固件的在线服务来实现的。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "正将固件从浏览器上传到设备"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "上传中…"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "验证所选的包"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "版本"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "错误的校验和"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[已安装] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "验证所选的包"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% 已收到构建请求"
 
diff --git a/applications/luci-app-attendedsysupgrade/po/zh_Hant/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/zh_Hant/attendedsysupgrade.po
index 2c6f709257..6c19fc7cda 100644
--- a/applications/luci-app-attendedsysupgrade/po/zh_Hant/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/zh_Hant/attendedsysupgrade.po
@@ -23,7 +23,7 @@ msgid "Advanced Mode"
 msgstr "進階模式"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:11
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:602
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:610
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
 msgid "Attended Sysupgrade"
 msgstr "參與式系統升級"
@@ -32,20 +32,24 @@ msgstr "參與式系統升級"
 msgid "Attendedsysupgrade Configuration."
 msgstr "Attendedsysupgrade 設定。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:511
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
 msgid "Board Name / Profile"
 msgstr "主機板名稱/設定檔"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:116
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:124
 msgid "Build Date"
 msgstr "建置日期"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:193
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:201
 msgid "Building Firmware..."
 msgstr "組建韌體中…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:156
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:526
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+msgid "Calculating package hash"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:164
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:534
 msgid "Cancel"
 msgstr "取消"
 
@@ -53,67 +57,75 @@ msgstr "取消"
 msgid "Client"
 msgstr "用戶端"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:237
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:374
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:429
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:563
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:245
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:382
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:437
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:571
 msgid "Close"
 msgstr "關閉"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:70
+msgid "Completed generating firmware image"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:24
 msgid "Configuration"
 msgstr "組態"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:423
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:431
 msgid "Could not reach API at \"%s\". Please try again later."
 msgstr "無法存取位於 「%s」 的 API。請稍後再試。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:519
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:617
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:527
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:625
 msgid "Currently running: %s - %s"
 msgstr "目前執行中：%s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:289
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:297
 msgid "Download"
 msgstr "下載"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:127
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:135
 msgid "Download firmware image"
 msgstr "下載韌體映像檔"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:74
 msgid "Downloading ImageBuilder archive"
 msgstr "正在下載 ImageBuilder archive"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:335
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:343
 msgid "Downloading firmware from server to browser"
 msgstr "正從伺服器下載韌體到瀏覽器"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:331
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:339
 msgid "Downloading..."
 msgstr "下載中…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:241
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:249
 msgid "Error building the firmware image"
 msgstr "產生韌體映像檔時發生錯誤"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:419
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:427
 msgid "Error connecting to upgrade server"
 msgstr "連接升級伺服器發生錯誤"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:372
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:380
 msgid "Error during download of firmware. Please try again"
 msgstr "韌體下載發生錯誤。請再試一次"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:118
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:71
+msgid "Failed to generate firmware image"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:126
 msgid "Filename"
 msgstr "檔案名稱"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:128
 msgid "Filesystem"
 msgstr "檔案系統"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:67
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:68
 msgid "Generating firmware image"
 msgstr "正在產生韌體映像檔"
 
@@ -121,27 +133,27 @@ msgstr "正在產生韌體映像檔"
 msgid "Grant UCI access to LuCI app attendedsysupgrade"
 msgstr "授予 LuCI 應用 attendedsysupgrade UCI 存取權限"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:166
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:174
 msgid "Install firmware image"
 msgstr "安裝韌體映像檔"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:381
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:389
 msgid "Installing the sysupgrade. Do not unpower device!"
 msgstr "正在安裝 sysupgrade。不要切斷裝置電源！"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:385
 msgid "Installing..."
 msgstr "安裝中…"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:152
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:160
 msgid "Keep settings and retain the current configuration"
 msgstr "保留目前設定"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:516
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:524
 msgid "New firmware upgrade available"
 msgstr "有韌體升級可用"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:554
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:562
 msgid "No upgrade available"
 msgstr "無升級可用"
 
@@ -157,23 +169,23 @@ msgstr ""
 msgid "Overview"
 msgstr "概覽"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:512
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:520
 msgid "Packages"
 msgstr "套件"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:219
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:227
 msgid "Please report the error message and request"
 msgstr "請報告錯誤資訊和請求"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:120
 msgid "Profile"
 msgstr "設定檔"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:197
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:205
 msgid "Progress: %s%% %s"
 msgstr "進度：%s%% %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:183
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:191
 msgid "Queued..."
 msgstr "已加入隊列..."
 
@@ -181,7 +193,7 @@ msgstr "已加入隊列..."
 msgid "Rebuilders"
 msgstr "重建者"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:130
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:138
 msgid "Rebuilds"
 msgstr "重建"
 
@@ -189,23 +201,23 @@ msgstr "重建"
 msgid "Received build request"
 msgstr "已接收建構要求"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:221
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:229
 msgid "Request Data:"
 msgstr "請求資料："
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:548
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:556
 msgid "Request firmware image"
 msgstr "請求韌體映像檔"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:187
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:195
 msgid "Request in build queue position %s"
 msgstr "建置佇列位置 %s 中的請求"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:106
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
 msgid "SHA256"
 msgstr "SHA-256"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:628
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:636
 msgid "Search for firmware upgrade"
 msgstr "搜尋韌體升級"
 
@@ -217,11 +229,11 @@ msgstr "開啟標籤頁時搜尋新的系統升級"
 msgid "Search on opening"
 msgstr "開啟時進行搜尋"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:410
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:418
 msgid "Searching for an available sysupgrade of %s - %s"
 msgstr "正在搜尋 %s - %s 的可用系統升級"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:406
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:414
 msgid "Searching..."
 msgstr "搜尋中…"
 
@@ -229,65 +241,80 @@ msgstr "搜尋中…"
 msgid "Server"
 msgstr "伺服器"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:215
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:223
 msgid "Server response: %s"
 msgstr "伺服器回應：%s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:75
 msgid "Setting Up ImageBuilder"
 msgstr "設定 ImageBuilder"
 
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:64
+msgid "Setting up ImageBuilder"
+msgstr ""
+
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js:51
 msgid "Show advanced options like package list modification"
 msgstr "顯示進階選項，例如軟體包清單修改"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:171
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:69
+msgid "Signing images"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:179
 msgid "Successfully created firmware image"
 msgstr "成功建立韌體映像檔"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:114
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:122
 msgid "Target"
 msgstr "目標"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:606
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:614
 msgid ""
 "The attended sysupgrade service allows to easily upgrade vanilla and custom "
 "firmware images."
 msgstr "attended 系統升級服務允許輕鬆升級原始和第三方韌體映像。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:557
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:565
 msgid "The device runs the latest firmware version %s - %s"
 msgstr "此裝置執行最新的韌體版本 %s - %s"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:612
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:620
 msgid ""
 "This is done by building a new firmware on demand via an online service."
 msgstr "這是透過線上服務依需求建置新的韌體來實現的。"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:357
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:365
 msgid "Uploading firmware from browser to device"
 msgstr "正將韌體從瀏覽器上傳到裝置"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:353
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:361
 msgid "Uploading..."
 msgstr "上載中…"
 
 #: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:66
-msgid "Validate package selection"
-msgstr "驗證包選擇"
+msgid "Validating package selection"
+msgstr ""
+
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:65
+msgid "Validating revision"
+msgstr ""
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:104
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:112
 msgid "Version"
 msgstr "版本"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:369
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:377
 msgid "Wrong checksum"
 msgstr "錯誤的總和檢查碼"
 
-#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:496
+#: applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js:504
 msgid "[installed] %s"
 msgstr "[已安裝] %s"
 
+#~ msgid "Validate package selection"
+#~ msgstr "驗證包選擇"
+
 #~ msgid "10% Received build request"
 #~ msgstr "10% 已收到組建請求"
 
diff --git a/applications/luci-app-firewall/po/ar/firewall.po b/applications/luci-app-firewall/po/ar/firewall.po
index df1cbf7a03..596a311e1e 100644
--- a/applications/luci-app-firewall/po/ar/firewall.po
+++ b/applications/luci-app-firewall/po/ar/firewall.po
@@ -34,16 +34,16 @@ msgstr ""
 "%{src?%{dest?Forwarded:Incoming}:Outgoing} %{ipv6?%{ipv4?<var>IPv4</var> and "
 "<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protocol "
 "%{proto#%{next?, }%{item.types?<var class=\"cbi-tooltip-container\">%{item."
-"name}<span class=\"cbi-tooltip\">ICMP with types %{item.types#%{next?, "
-"}<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, mark "
+"name}<span class=\"cbi-tooltip\">ICMP with types %{item.types#%{next?, }"
+"<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, mark "
 "<var%{mark.inv? data-tooltip=\"Match fwmarks except %{mark.num}%{mark.mask? "
 "with mask %{mark.mask}}.\":%{mark.mask? data-tooltip=\"Mask fwmark value "
-"with %{mark.mask} before compare.\"}}>%{mark.val}</var>}%{dscp?, DSCP %{"
-"dscp.inv?<var data-tooltip=\"Match DSCP classifications except %{dscp."
-"num?:%{dscp.name}}\">%{dscp.val}</var>:<var>%{dscp.val}</var>}}%{helper?, "
-"helper %{helper.inv?<var data-tooltip=\"Match any helper except "
-"&quot;%{helper.name}&quot;\">%{helper.val}</var>:<var data-tooltip=\"%{helper"
-".name}\">%{helper.val}</var>}}"
+"with %{mark.mask} before compare.\"}}>%{mark.val}</var>}%{dscp?, DSCP %{dscp."
+"inv?<var data-tooltip=\"Match DSCP classifications except %{dscp.num?:%{dscp."
+"name}}\">%{dscp.val}</var>:<var>%{dscp.val}</var>}}%{helper?, helper "
+"%{helper.inv?<var data-tooltip=\"Match any helper except &quot;%{helper.name}"
+"&quot;\">%{helper.val}</var>:<var data-tooltip=\"%{helper.name}\">%{helper."
+"val}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:463
 msgid "-- add IP --"
@@ -150,7 +150,7 @@ msgstr "قبول - تعطيل إعادة كتابة العنوان"
 msgid "Action"
 msgstr "إجراء"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -160,7 +160,7 @@ msgstr ""
 "سبيل المثال <code> -p tcp --dport 443 </code> لمطابقة حركة مرور HTTPS "
 "الصادرة فقط."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -183,19 +183,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "إعدادات متقدمة"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "السماح بحركة المرور \"الغير الصالحة\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "السماح بإعادة التوجيه من <em> مناطق المصدر </em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "السماح بإعادة التوجيه إلى <em> مناطق الوجهة </em>:"
 
@@ -228,11 +228,11 @@ msgstr "قم بتطبيق فئة أو قيمة DSCP المحددة على الا
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "قم بتعيين مساعد تتبع الاتصال المحدد لحركة المرور المتطابقة."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "تعيين المساعد التلقائي"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr "قم بتعيين مساعدي conntrack تلقائيًا بناءً على بروتوكول المرور والبوابة"
@@ -242,11 +242,11 @@ msgstr "قم بتعيين مساعدي conntrack تلقائيًا بناءً ع�
 msgid "Comment"
 msgstr "تعليق"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "إعدادات Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "مساعدين كونتراك"
 
@@ -262,15 +262,15 @@ msgstr "يكمل"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "الأجهزة المغطاة"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "الشبكات المغطاة"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "الشبكات الفرعية المغطاة"
 
@@ -318,7 +318,7 @@ msgstr "منطقة الوجهة"
 msgid "Device name"
 msgstr "اسم الجهاز"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -345,18 +345,18 @@ msgstr "تفعيل NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "تفعيل الحماية من الفيضانات SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "قم بتمكين تسجيل الدخول إلى هذه المنطقة"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -378,7 +378,7 @@ msgstr "توقع: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "ميزة تجريبية. غير متوافق تمامًا مع QoS / SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "يختار صراحة مساعدي تتبع الاتصال المسموح به لحركة مرور المنطقة"
 
@@ -396,15 +396,15 @@ msgstr "منفذ خارجي"
 msgid "Extra arguments"
 msgstr "حجج اضافية"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "وسيطات الوجهة الإضافية"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "حجج iptables الإضافية"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "حجج مصدر إضافي"
 
@@ -444,6 +444,10 @@ msgstr "جدار الحماية - إعدادات المنطقة"
 msgid "Firewall configuration migration"
 msgstr "ترحيل تكوين جدار الحماية"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "إلى الأمام"
@@ -473,9 +477,9 @@ msgid ""
 msgstr ""
 "ابتداءً من %{src}%{ src_device?, <var>interface</var> %{src_device}%{src_ip?، "
 "IP %{ src_ip#%{ next?,<var%{item.inv? data-tooltip=\"Match IP addresses "
-"except %{item.val}.\"}> }%{ item.ival}}}</var> %{ src_port?, port %{ "
-"src_port#%{ next?,<var%{item.inv? data-tooltip=\"Match ports except %{item."
-"val}.\"}> }%{ item.ival}}}</var>"
+"except %{item.val}.\"}> }%{ item.ival}}}</var> %{ src_port?, port "
+"%{ src_port#%{ next?,<var%{item.inv? data-tooltip=\"Match ports except "
+"%{item.val}.\"}> }%{ item.ival}}}</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
 msgid ""
@@ -490,12 +494,12 @@ msgid ""
 msgstr ""
 "من %{src}%{src_device?, interface <var>%{src_device}</var>}%{src_ip?, IP "
 "%{src_ip#%{next?, }<var%{item.inv? data-tooltip=\"Match IP addresses except "
-"%{item.val}.\"}>%{item.ival}</var>}}%{src_port?, port %{src_port#%{next?, "
-"}<var%{item.inv? data-tooltip=\"Match ports except %{item.val}.\"}>%{item."
+"%{item.val}.\"}>%{item.ival}</var>}}%{src_port?, port %{src_port#%{next?, }"
+"<var%{item.inv? data-tooltip=\"Match ports except %{item.val}.\"}>%{item."
 "ival}</var>}}%{src_mac?, MAC %{src_mac#%{next?, }<var%{item.inv? data-"
 "tooltip=\"Match MACs except %{item.val}%{item.hint.name? a.k.a. %{item.hint."
-"name}}.\":%{item.hint.name? data-tooltip=\"%{item.hint.name}\"}}>%{item."
-"ival}</var>}}"
+"name}}.\":%{item.hint.name? data-tooltip=\"%{item.hint.name}\"}}>%{item.ival}"
+"</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 msgid ""
@@ -507,19 +511,19 @@ msgid ""
 "%{item.val}%{item.hint.name? a.k.a. %{item.hint.name}}.\":%{item.hint.name? "
 "data-tooltip=\"%{item.hint.name}\"}}>%{item.ival}</var>}}"
 msgstr ""
-"من %{src}%{src_ip?, IP %{src_ip#%{next?, }<var%{item.inv? data-tooltip="
-"\"Match IP addresses except %{item.val}.\"}>%{item.ival}</var>}}%{src_port?, "
-"port %{src_port#%{next?, }<var%{item.inv? data-tooltip=\"Match ports except "
-"%{item.val}.\"}>%{item.ival}</var>}}%{src_mac?, MAC %{src_mac#%{next?, "
-"}<var%{item.inv? data-tooltip=\"Match MACs except %{item.val}%{"
-"item.hint.name? a.k.a. %{item.hint.name}}.\":%{item.hint.name? data-tooltip="
-"\"%{item.hint.name}\"}}>%{item.ival}</var>}}"
+"من %{src}%{src_ip?, IP %{src_ip#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Match IP addresses except %{item.val}.\"}>%{item.ival}</"
+"var>}}%{src_port?, port %{src_port#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Match ports except %{item.val}.\"}>%{item.ival}</var>}}%{src_mac?, "
+"MAC %{src_mac#%{next?, }<var%{item.inv? data-tooltip=\"Match MACs except "
+"%{item.val}%{item.hint.name? a.k.a. %{item.hint.name}}.\":%{item.hint.name? "
+"data-tooltip=\"%{item.hint.name}\"}}>%{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:160
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "الاعدادات العامة"
@@ -528,7 +532,11 @@ msgstr "الاعدادات العامة"
 msgid "Grant access to firewall configuration"
 msgstr "منح الوصول إلى تكوين جدار الحماية"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "تفريغ تدفق الأجهزة"
 
@@ -556,14 +564,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 و IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "IPv4 فقط"
 
@@ -571,14 +579,14 @@ msgstr "IPv4 فقط"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "IPv6 فقط"
 
@@ -609,7 +617,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "إدخال"
 
@@ -625,7 +633,7 @@ msgstr "منفذ داخلي"
 msgid "Internal zone"
 msgstr "المنطقة الداخلية"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -645,7 +653,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "حد الطلقات"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "تقييد رسائل السجل"
 
@@ -663,8 +671,8 @@ msgstr ""
 "مطابقة محدودة ل <var>٪ {limit.num} </var> حزم لكل <var>٪ {limit.unit} </"
 "var>٪ {limit.burst؟ انفجار <var>٪ {limit.burst} </var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "تمكين التنكر المحدود"
 
@@ -680,11 +688,11 @@ msgstr "IP مصدر الاسترجاع"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - إعادة الكتابة تلقائيًا إلى عنوان IP للواجهة الصادرة"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "لقط MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "تنكر"
 
@@ -805,7 +813,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "اسم"
 
@@ -813,6 +821,10 @@ msgstr "اسم"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "تطابق حركة المرور الواردة الموجهة إلى عنوان IP المحدد فقط."
@@ -843,7 +855,7 @@ msgid "Outbound zone"
 msgstr "المنطقة الصادرة"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "انتاج"
 
@@ -865,7 +877,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "يمرر الحجج الإضافية إلى iptables. استخدم بعناية!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -924,22 +936,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "يتطلب دعم NAT للأجهزة."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "قصر التنكر على الشبكات الفرعية للوجهة المحددة"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "قصر التنكر على الشبكات الفرعية للمصدر المحدد"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "تقييد لمعالجة الأسرة"
 
@@ -985,10 +997,10 @@ msgstr ""
 "القناع]. إذا تم تحديد قناع ، فسيتم تعديل وحدات البت المحددة في القناع فقط."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "برنامج التفريغ القائم على التوجيه / NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "تفريغ تدفق البرنامج"
 
@@ -1075,8 +1087,8 @@ msgstr ""
 "يقوم جدار الحماية بإنشاء مناطق عبر واجهات الشبكة للتحكم في تدفق حركة مرور "
 "الشبكة."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1093,7 +1105,7 @@ msgstr ""
 "التقدم من الشبكة المحلية إلى الشبكة المحلية إذنًا بإعادة التوجيه من الشبكة "
 "المحلية إلى الشبكة المحلية أيضًا."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1140,9 +1152,9 @@ msgid ""
 msgstr ""
 "إلى%{dest}%{ dest_device?, <var>interface</var> %{dest_device}}%{ dest_ip?، "
 "IP %{ dest_ip#%{ next?,<var%{item.inv? data-tooltip=\"Match IP addresses "
-"except %{item.val}.\"}> }%{ item.ival}}}</var> %{ dest_port?, port %{ "
-"dest_port#%{ next?,<var%{item.inv? data-tooltip=\"Match ports except %{item."
-"val}.\"}> }%{ item.ival}}}</var>"
+"except %{item.val}.\"}> }%{ item.ival}}}</var> %{ dest_port?, port "
+"%{ dest_port#%{ next?,<var%{item.inv? data-tooltip=\"Match ports except "
+"%{item.val}.\"}> }%{ item.ival}}}</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:55
 msgid ""
@@ -1218,7 +1230,7 @@ msgstr "قاعدة بدون اسم"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "منطقة بدون اسم"
 
@@ -1250,7 +1262,7 @@ msgstr "استخدم عنوان IP الداخلي"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1258,7 +1270,7 @@ msgstr ""
 "استخدم هذا الخيار لتصنيف حركة مرور المنطقة عن طريق أجهزة الشبكة الأولية غير "
 "<em> uci </em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1296,11 +1308,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "المنطقة=> تَوجِيه"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "المناطق"
 
@@ -1312,7 +1324,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "قبول"
 
@@ -1401,7 +1413,7 @@ msgstr "لا تتبع"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "إبعاد"
 
@@ -1470,7 +1482,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "رفض"
 
@@ -1513,9 +1525,9 @@ msgstr ""
 msgid "this device"
 msgstr "هذا الجهاز"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "هذه المنطقة الجديدة"
 
@@ -1536,6 +1548,9 @@ msgstr ""
 msgid "valid firewall mark"
 msgstr "علامة جدار حماية صالحة"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "برنامج التفريغ القائم على التوجيه / NAT"
+
 #~ msgid ""
 #~ "Forwarded IPv4%{proto?, protocol %{proto#%{next?, }<var>%{item.name}</"
 #~ "var>}}%{mark?, mark <var%{mark.inv? data-tooltip=\"Match fwmarks except "
diff --git a/applications/luci-app-firewall/po/bg/firewall.po b/applications/luci-app-firewall/po/bg/firewall.po
index 0168ae9dac..5adc7ec283 100644
--- a/applications/luci-app-firewall/po/bg/firewall.po
+++ b/applications/luci-app-firewall/po/bg/firewall.po
@@ -136,14 +136,14 @@ msgstr ""
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -162,19 +162,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Разширени настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Разрешаване на \"невалиден\" трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Разрешаване на препращане от <em> изходящи зони </em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Разрешаване на препращане към <em> дестинационни зони </em>:"
 
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -218,11 +218,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Настройки на Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Помощници на Conntrack"
 
@@ -238,15 +238,15 @@ msgstr "Продължи"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Обхванати устройства"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Обхванати мрежи"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Обхванати подмрежи"
 
@@ -291,7 +291,7 @@ msgstr "Дестинейшън зона"
 msgid "Device name"
 msgstr "Име на устройството"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -315,18 +315,18 @@ msgstr "Разрешаване на NAT loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Активиране на SYN-flood защита"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Разрешаване на журнал в тази зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -348,7 +348,7 @@ msgstr "Очакване: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Експериментална функция. Не е напълно съвместима с QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -366,15 +366,15 @@ msgstr "Външен порт"
 msgid "Extra arguments"
 msgstr "Допълнителни аргументи"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Допълнителни аргументи за дестинацията"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Допълнителни аргументи на iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Допълнителни аргументи за източника"
 
@@ -414,6 +414,10 @@ msgstr "Защитна стена - Настройки на зона"
 msgid "Firewall configuration migration"
 msgstr "Миграция на конфигурацията на защитната стена"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Напред"
@@ -469,7 +473,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Общи настройки"
@@ -478,7 +482,11 @@ msgstr "Общи настройки"
 msgid "Grant access to firewall configuration"
 msgstr "Предоставяне на достъп до конфигурацията на защитната стена"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Хардуерно разтоварване на потока"
 
@@ -506,14 +514,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 и IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Само IPv4"
 
@@ -521,14 +529,14 @@ msgstr "Само IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Само IPv6"
 
@@ -559,7 +567,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Вход"
 
@@ -575,7 +583,7 @@ msgstr "Вътрешен порт"
 msgid "Internal zone"
 msgstr "Вътрешна зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -595,7 +603,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "Бърст лимит"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Ограничаване на съобщенията в журнала"
 
@@ -611,8 +619,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -628,11 +636,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -744,7 +752,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Име"
 
@@ -752,6 +760,10 @@ msgstr "Име"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -780,7 +792,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -802,7 +814,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -853,22 +865,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -912,10 +924,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -997,8 +1009,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1008,7 +1020,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1121,7 +1133,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1150,13 +1162,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1192,11 +1204,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1208,7 +1220,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1297,7 +1309,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1366,7 +1378,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1409,9 +1421,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/bn_BD/firewall.po b/applications/luci-app-firewall/po/bn_BD/firewall.po
index bd54864b5a..666daca1f7 100644
--- a/applications/luci-app-firewall/po/bn_BD/firewall.po
+++ b/applications/luci-app-firewall/po/bn_BD/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "উন্নত সেটিংস"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -301,18 +301,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -352,15 +352,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -400,6 +400,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -455,7 +459,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "সাধারণ সেটিংস"
@@ -464,7 +468,11 @@ msgstr "সাধারণ সেটিংস"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -492,14 +500,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -507,14 +515,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -545,7 +553,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -561,7 +569,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -581,7 +589,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -597,8 +605,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -614,11 +622,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -730,7 +738,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -738,6 +746,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -766,7 +778,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -788,7 +800,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -839,22 +851,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -898,10 +910,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -983,8 +995,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -994,7 +1006,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1107,7 +1119,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1136,13 +1148,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1178,11 +1190,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1194,7 +1206,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1283,7 +1295,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1352,7 +1364,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1395,9 +1407,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index d01188ecb1..fb1b593a92 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -124,14 +124,14 @@ msgstr ""
 msgid "Action"
 msgstr "Acció"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -150,19 +150,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Configuració avançada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permet el reenviament als <em>zones de destí</em>:"
 
@@ -192,11 +192,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -206,11 +206,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -226,15 +226,15 @@ msgstr "Continua"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Xarxes cobertes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -283,7 +283,7 @@ msgstr "Zona de destí"
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -307,18 +307,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr "Habilita protecció contra la inundació SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Habilita el registre d'aquesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -340,7 +340,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -358,15 +358,15 @@ msgstr "Port extern"
 msgid "Extra arguments"
 msgstr "Paràmetres extres"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -406,6 +406,10 @@ msgstr "Tallafocs - Ajusts de zona"
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Reenvia"
@@ -461,7 +465,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Paràmetres generals"
@@ -470,7 +474,11 @@ msgstr "Paràmetres generals"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -498,14 +506,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 i IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Només IPv4"
 
@@ -513,14 +521,14 @@ msgstr "Només IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Només IPv6"
 
@@ -551,7 +559,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Entrada"
 
@@ -567,7 +575,7 @@ msgstr "Port intern"
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -587,7 +595,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limita els missatges de registre"
 
@@ -603,8 +611,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -620,11 +628,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Fixació MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Mascarada"
 
@@ -738,7 +746,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nom"
 
@@ -746,6 +754,10 @@ msgstr "Nom"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
@@ -776,7 +788,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Sortida"
 
@@ -798,7 +810,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -851,22 +863,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringeix la mascarada a les subxarxes de destí donades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Restringeix a la família d'adreces"
 
@@ -910,10 +922,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -997,8 +1009,8 @@ msgstr ""
 "El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
 "flux de tràfic de xarxa."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1014,7 +1026,7 @@ msgstr ""
 "regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
 "de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -1137,7 +1149,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1166,13 +1178,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1208,11 +1220,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenviaments"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zones"
 
@@ -1224,7 +1236,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "accepta"
 
@@ -1313,7 +1325,7 @@ msgstr "no rastregis"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "descarta"
 
@@ -1382,7 +1394,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "rebutja"
 
@@ -1425,9 +1437,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index 1f1db78633..022774fd0a 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -146,7 +146,7 @@ msgstr "ACCEPT - Zakázat přepis adresy"
 msgid "Action"
 msgstr "Akce"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -155,7 +155,7 @@ msgstr ""
 "Další surové argumenty <em>iptables</em> ke klasifikaci provozu do cílové "
 "zóny, např. <code>-p tcp --dport 443</code> pro pouze odchozí provoz HTTPS."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -176,19 +176,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Pokročilá nastavení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Povolit \"neplatný\" provoz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
 
@@ -218,11 +218,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -232,11 +232,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Nastavení pro Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -252,15 +252,15 @@ msgstr "Pokračovat"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Pokrytá zařízení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Pokryté sítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Pokryté podsítě"
 
@@ -308,7 +308,7 @@ msgstr "Cílová zóna"
 msgid "Device name"
 msgstr "Název zařízení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -332,18 +332,18 @@ msgstr "Povolit NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Povolit ochranu proti SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Povolit logování v této oblasti"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -365,7 +365,7 @@ msgstr "Očekáváno: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Experimentální funkce. Není plně kompatibilní s QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -383,15 +383,15 @@ msgstr "Vnější port"
 msgid "Extra arguments"
 msgstr "Další argumenty volání"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Další argumenty pro cíl"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Další argumenty pro iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Další argumenty pro zdroj"
 
@@ -431,6 +431,10 @@ msgstr "Firewall - Nastavení zón"
 msgid "Firewall configuration migration"
 msgstr "Migrace konfigurace brány firewall"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Přesměrování"
@@ -486,7 +490,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Obecná nastavení"
@@ -495,7 +499,11 @@ msgstr "Obecná nastavení"
 msgid "Grant access to firewall configuration"
 msgstr "Udělit přístup ke konfiguraci brány firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -523,14 +531,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 a IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Pouze IPv4"
 
@@ -538,14 +546,14 @@ msgstr "Pouze IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Pouze IPv6"
 
@@ -576,7 +584,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Vstup"
 
@@ -592,7 +600,7 @@ msgstr "Vnitřní port"
 msgid "Internal zone"
 msgstr "Vnitřní zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -612,7 +620,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Omezit logovací zprávy"
 
@@ -628,8 +636,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -645,11 +653,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Automaticky přepsat na IP adresu odchozího rozhraní"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Maškárádování"
 
@@ -765,7 +773,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Jméno"
 
@@ -773,6 +781,10 @@ msgstr "Jméno"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
@@ -803,7 +815,7 @@ msgid "Outbound zone"
 msgstr "Odchozí zóna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Výstup"
 
@@ -825,7 +837,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Předává další argumenty iptables. Používat opatrně!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -880,22 +892,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Vyžaduje hardwarovou podporu NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Omezit maškarádování na uvedené cílové podsítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Omezit na rodinu adres"
 
@@ -939,10 +951,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -1026,8 +1038,8 @@ msgstr ""
 "Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
 "provozu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1043,7 +1055,7 @@ msgstr ""
 "Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
 "lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1164,7 +1176,7 @@ msgstr "Nepojmenované pravidlo"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Nepojmenovaná zóna"
 
@@ -1193,13 +1205,13 @@ msgstr "Použít vnitřní IP adresu"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1235,11 +1247,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Přesměrování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zóny"
 
@@ -1251,7 +1263,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "přijmout"
 
@@ -1340,7 +1352,7 @@ msgstr "nesledovat"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "zahodit"
 
@@ -1409,7 +1421,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "odmítnout"
 
@@ -1452,9 +1464,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/da/firewall.po b/applications/luci-app-firewall/po/da/firewall.po
index c6532772fd..c52987c21b 100644
--- a/applications/luci-app-firewall/po/da/firewall.po
+++ b/applications/luci-app-firewall/po/da/firewall.po
@@ -152,7 +152,7 @@ msgstr "ACCEPT - Deaktiver adresseomskrivning"
 msgid "Action"
 msgstr "Handling"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -162,7 +162,7 @@ msgstr ""
 "zonedestinationstrafik, f.eks. <code>-p tcp --dport 443</code> for kun at "
 "matche udgående HTTPS-trafik."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -186,19 +186,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Avancerede indstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Tillad \"ugyldig\" trafik"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillad videresendelse fra <em>kildezoner</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Tillad videresendelse til <em>destinationszoner</em>:"
 
@@ -231,11 +231,11 @@ msgstr "Anvend den givne DSCP-klasse eller værdi på etablerede forbindelser."
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "Tildel den angivne forbindelsessporingshjælper til matchet trafik."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automatisk hjælpertildeling"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr "Tildel automatisk conntrack-hjælpere baseret på trafikprotokol og port"
@@ -245,11 +245,11 @@ msgstr "Tildel automatisk conntrack-hjælpere baseret på trafikprotokol og port
 msgid "Comment"
 msgstr "Kommentar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Forbindelsesindstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Forbindelseshjælpere"
 
@@ -265,15 +265,15 @@ msgstr "Fortsæt"
 msgid "Counters"
 msgstr "Tællere"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Dækkede enheder"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Dækkede netværk"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Dækkede subnets"
 
@@ -322,7 +322,7 @@ msgstr "Destination zone"
 msgid "Device name"
 msgstr "Enhedens navn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -349,11 +349,11 @@ msgstr "Aktiver NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Aktiver SYN-flood beskyttelse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Aktiver logning på denne zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -363,7 +363,7 @@ msgstr ""
 "udgående trafik på denne zone. Dette er typisk aktiveret på zonen <em>wan</"
 "em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -387,7 +387,7 @@ msgstr "Forventer: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Eksperimentel funktion. Ikke fuldt kompatibel med QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "Vælger eksplicit tilladte forbindelsessporingshjælpere til zonetrafik"
 
@@ -405,15 +405,15 @@ msgstr "Ekstern port"
 msgid "Extra arguments"
 msgstr "Ekstra argumenter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Ekstra destinationsargumenter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Ekstra iptables-argumenter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Ekstra kildeargumenter"
 
@@ -453,6 +453,10 @@ msgstr "Firewall - Zoneindstillinger"
 msgid "Firewall configuration migration"
 msgstr "Firewall-konfigurationsmigrering"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Videresend"
@@ -535,7 +539,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Generelle indstillinger"
@@ -544,7 +548,11 @@ msgstr "Generelle indstillinger"
 msgid "Grant access to firewall configuration"
 msgstr "Giv adgang til firewall-konfiguration"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Aflæsning af hardwareflow"
 
@@ -572,14 +580,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 og IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Kun IPv4"
 
@@ -587,14 +595,14 @@ msgstr "Kun IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6-maskering"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Kun IPv4"
 
@@ -635,7 +643,7 @@ msgid "Initial Hash Size"
 msgstr "Oprindelig hash-størrelse"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Input"
 
@@ -651,7 +659,7 @@ msgstr "Intern port"
 msgid "Internal zone"
 msgstr "Intern zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Intra zone fremad"
 
@@ -671,7 +679,7 @@ msgstr "Ugyldigt navn"
 msgid "Limit burst"
 msgstr "Grænse brist"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Begræns logmeddelelser"
 
@@ -689,8 +697,8 @@ msgstr ""
 "Begræns matchning til <var>%{limit.num}</var> pakker pr. <var>%{limit.unit}</"
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Begrænset maskering aktiveret"
 
@@ -706,11 +714,11 @@ msgstr "Loopback-kilde-IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASKERING - Omskriv automatisk til udgående grænseflade IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS fastspænding"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Maskering"
 
@@ -833,7 +841,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Navn"
 
@@ -841,6 +849,10 @@ msgstr "Navn"
 msgid "Netmask"
 msgstr "Netmaske"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Match kun indgående trafik rettet mod den angivne IP-adresse."
@@ -871,7 +883,7 @@ msgid "Outbound zone"
 msgstr "Udgående zone"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Output"
 
@@ -898,7 +910,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Sender yderligere argumenter til iptables. Brug med omhu!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -958,22 +970,22 @@ msgstr "Henvis til eksternt sæt"
 msgid "Reflection zones"
 msgstr "Reflekszoner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Kræver hardware NAT-understøttelse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Begræns Maskering til givne destination subnets"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Begræns Maskering til givne kilde subnets"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Begræns til adresse familie"
 
@@ -1019,10 +1031,10 @@ msgstr ""
 "mask]. Hvis der er angivet en maske, ændres kun de bits, der er sat i masken."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Softwarebaseret offloading til routing/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Software flow offloading"
 
@@ -1112,8 +1124,8 @@ msgstr ""
 "Firewallen opretter zoner over dine netværksgrænseflader for at kontrollere "
 "netværkstrafikstrømmen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1130,7 +1142,7 @@ msgstr ""
 "til wan betyder <em>ikke</em> en tilladelse til også at videresende fra wan "
 "til lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1268,7 +1280,7 @@ msgstr "Unavngiven regel"
 msgid "Unnamed set"
 msgstr "Unavngivet sæt"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Unavngiven zone"
 
@@ -1300,7 +1312,7 @@ msgstr "Brug intern IP-adresse"
 msgid "Use ipset"
 msgstr "Brug ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1308,7 +1320,7 @@ msgstr ""
 "Brug denne mulighed til at klassificere zonetrafik efter rå, ikke-<em>uci</"
 "em>-administrerede netværksenheder."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1346,11 +1358,11 @@ msgstr "Din enhed kører ikke firewall4."
 msgid "Your device runs firewall4."
 msgstr "Din enhed kører firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Videresendelser"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zoner"
 
@@ -1364,7 +1376,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "accept"
 
@@ -1453,7 +1465,7 @@ msgstr "spor ikke"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "drop"
 
@@ -1526,7 +1538,7 @@ msgstr "port: Port:"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "afvis"
 
@@ -1569,9 +1581,9 @@ msgstr "src_port: Kildeport"
 msgid "this device"
 msgstr "denne enhed"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "denne nye zone"
 
@@ -1592,6 +1604,9 @@ msgstr "op til 65536 poster."
 msgid "valid firewall mark"
 msgstr "gyldigt firewallmærke"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Softwarebaseret offloading til routing/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 9a42fc2b8a..417fae4e29 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -154,7 +154,7 @@ msgstr "ACCEPT - Umschreiben von IP-Adressen deaktivieren"
 msgid "Action"
 msgstr "Aktion"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -164,7 +164,7 @@ msgstr ""
 "Zonenzielverkehrs, z.B. <code>-p tcp --dport 443</code>, um nur ausgehenden "
 "HTTPS-Verkehr übereinstimmen zu lassen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -188,19 +188,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Erlaube \"ungültigen\" Verkehr"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
 
@@ -236,11 +236,11 @@ msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 "Weise den angegebenen Verbindungs-Tracking-Helfer selektiertem Verkehr zu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automatische Helferzuordnung"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -252,11 +252,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack-Einstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack-Helfer"
 
@@ -272,15 +272,15 @@ msgstr "Fortfahren"
 msgid "Counters"
 msgstr "Zähler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Abgedeckte Geräte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Abgedeckte Netzwerke"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Abgedeckte Subnetze"
 
@@ -329,7 +329,7 @@ msgstr "Ziel-Zone"
 msgid "Device name"
 msgstr "Gerätename"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -356,11 +356,11 @@ msgstr "NAT-Loopback aktivieren"
 msgid "Enable SYN-flood protection"
 msgstr "Schutz vor SYN-flood-Attacken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Protokollierung innerhalb der Zone aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -370,7 +370,7 @@ msgstr ""
 "für den ausgehenden Verkehr in dieser Zone. Dies wird normalerweise für die "
 "Zone <em>wan</em> aktiviert."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -394,7 +394,7 @@ msgstr "Erwarte: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Wählt explizit zulässige Verbindungs-Tracking-Helfer für den Zonenverkehr aus"
@@ -413,15 +413,15 @@ msgstr "Externer Port"
 msgid "Extra arguments"
 msgstr "Zusätzliche Argumente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Zusätzliche Ziel-Argumente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Zusätzliche iptables-Argumente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Zusätzliche Quell-Argumente"
 
@@ -461,6 +461,10 @@ msgstr "Firewall - Zoneneinstellungen"
 msgid "Firewall configuration migration"
 msgstr "Migration der Firewall-Konfiguration"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Weiterleitung"
@@ -544,7 +548,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
@@ -553,7 +557,11 @@ msgstr "Allgemeine Einstellungen"
 msgid "Grant access to firewall configuration"
 msgstr "Zugriff auf die Firewall-Konfiguration gewähren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Hardwarebeschleunigte Flusskontrolle"
 
@@ -581,14 +589,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 und IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "nur IPv4"
 
@@ -596,14 +604,14 @@ msgstr "nur IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6-Masquerading"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "nur IPv6"
 
@@ -645,7 +653,7 @@ msgid "Initial Hash Size"
 msgstr "Initiale Hash Größe"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Eingehend"
 
@@ -661,7 +669,7 @@ msgstr "Interner Port"
 msgid "Internal zone"
 msgstr "Interne Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Intra-Zonen-Forward"
 
@@ -681,7 +689,7 @@ msgstr "Falscher Setname"
 msgid "Limit burst"
 msgstr "Limit-Häufung"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Protokollnachrichten limitieren"
 
@@ -699,8 +707,8 @@ msgstr ""
 "Limitiere Vergleiche auf <var>%{limit.num}</var> Pakete pro <var>%{limit."
 "unit}</var>%{limit.burst? Häufung <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Eingeschränktes Masquerading aktiviert"
 
@@ -718,11 +726,11 @@ msgstr ""
 "MASQUERADE - Automatisch auf IP-Adresse der ausgehenden Schnittstelle "
 "umschreiben"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS Korrektur"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "NAT aktivieren"
 
@@ -849,7 +857,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nome"
 
@@ -857,6 +865,10 @@ msgstr "Nome"
 msgid "Netmask"
 msgstr "Netzmaske"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Selektiert nur Traffic der an die angegebene IP-Adresse gerichtet ist."
@@ -887,7 +899,7 @@ msgid "Outbound zone"
 msgstr "Ausgehende Zone"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Ausgehend"
 
@@ -916,7 +928,7 @@ msgstr ""
 "Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
 "benutzen!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -977,22 +989,22 @@ msgstr "Verweis auf externes Set"
 msgid "Reflection zones"
 msgstr "Reflection-Zonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Erfordert Hardware-NAT-Unterstützung."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Auf Adressfamilie beschränken"
 
@@ -1041,10 +1053,10 @@ msgstr ""
 "korrespondierenden Bits des Markierungswertes verändert."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Softwarebasierte Auslagerung von Routing/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Beschleunigte Flusskontrolle"
 
@@ -1134,8 +1146,8 @@ msgstr ""
 "Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
 "den Netzwerk-Traffic zu trennen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1153,7 +1165,7 @@ msgstr ""
 "<em>nicht</em> zusätzlich die Erlaubnis, auch von WAN nach LAN "
 "weiterzuleiten."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1291,7 +1303,7 @@ msgstr "Unbennante Regel"
 msgid "Unnamed set"
 msgstr "Unbenanntes Set"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Unbenannte Zone"
 
@@ -1323,7 +1335,7 @@ msgstr "Interne IP-Adresse nutzen"
 msgid "Use ipset"
 msgstr "Benutze ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1331,7 +1343,7 @@ msgstr ""
 "Diese Option verwenden, um den Zonenverkehr nach rohen, nicht <em>uci</em>-"
 "verwalteten Netzwerkgeräten zu klassifizieren."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1369,11 +1381,11 @@ msgstr "Firewall4 ist auf Ihrem Gerät nicht aktiviert."
 msgid "Your device runs firewall4."
 msgstr "Firewall4 ist auf Ihrem Gerät aktiviert."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Weiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zonen"
 
@@ -1389,7 +1401,7 @@ msgstr ""
 # ausgehenden Traffic annehmen. 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "zulassen"
 
@@ -1478,7 +1490,7 @@ msgstr "nicht verfolgen"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "verwerfen"
 
@@ -1553,7 +1565,7 @@ msgstr "port: Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "zurückweisen"
 
@@ -1596,9 +1608,9 @@ msgstr "src_port: Quell-Port"
 msgid "this device"
 msgstr "dieses Gerät"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "diese neue Zone"
 
@@ -1619,6 +1631,9 @@ msgstr "bis zu 65536 Einträgen."
 msgid "valid firewall mark"
 msgstr "gültige Firewall-Markierung"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Softwarebasierte Auslagerung von Routing/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 59d4eca7db..29ba0e45b1 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -124,14 +124,14 @@ msgstr ""
 msgid "Action"
 msgstr "Δράση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -150,19 +150,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Ρυθμίσεις για προχωρημένους"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -192,11 +192,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -206,11 +206,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -226,15 +226,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -279,7 +279,7 @@ msgstr "Ζώνη προορισμού"
 msgid "Device name"
 msgstr "Όνομα συσκευής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -304,18 +304,18 @@ msgstr "Ενεργοποιήστε το NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Ενεργοποιήστε την προστασία SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Ενεργοποιήστε τη σύνδεση σε αυτήν τη ζώνη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -337,7 +337,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -355,15 +355,15 @@ msgstr "Εξωτερική θύρα"
 msgid "Extra arguments"
 msgstr "Επιπλέον παράμετροι"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -403,6 +403,10 @@ msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Προώθηση"
@@ -458,7 +462,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Γενικές ρυθμίσεις"
@@ -467,7 +471,11 @@ msgstr "Γενικές ρυθμίσεις"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -495,14 +503,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 και IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Μόνο IPv4"
 
@@ -510,14 +518,14 @@ msgstr "Μόνο IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Μόνο IPv6"
 
@@ -548,7 +556,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Είσοδος"
 
@@ -565,7 +573,7 @@ msgstr "Εξωτερική θύρα"
 msgid "Internal zone"
 msgstr "Εσωτερική ζώνη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -585,7 +593,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Περιορισμός καταγραφών συστήματος"
 
@@ -601,8 +609,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -618,12 +626,12 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 #, fuzzy
 msgid "MSS clamping"
 msgstr "Περιορισμός MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -735,7 +743,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Ονομα"
 
@@ -743,6 +751,10 @@ msgstr "Ονομα"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -771,7 +783,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Έξοδος"
 
@@ -793,7 +805,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -844,22 +856,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -903,10 +915,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -993,8 +1005,8 @@ msgstr ""
 "Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
 "ελέγχει την δικτυακή κίνηση."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1004,7 +1016,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1120,7 +1132,7 @@ msgstr "Κανόνας χωρίς όνομα"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1149,13 +1161,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1191,11 +1203,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Ζώνη ⇒ Διαβιβάσεις"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Ζώνες"
 
@@ -1207,7 +1219,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "αποδοχή"
 
@@ -1296,7 +1308,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "αγνόηση"
 
@@ -1365,7 +1377,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "απόρριψη"
 
@@ -1408,9 +1420,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index a313ba99e5..284e028344 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Advanced Settings"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr "Destination zone"
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -301,18 +301,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr "Enable SYN-flood protection"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -352,15 +352,15 @@ msgstr "External port"
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -400,6 +400,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Forward"
@@ -455,7 +459,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "General Settings"
@@ -464,7 +468,11 @@ msgstr "General Settings"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -492,14 +500,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -507,14 +515,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -545,7 +553,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Input"
 
@@ -561,7 +569,7 @@ msgstr "Internal port"
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -581,7 +589,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -597,8 +605,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -614,11 +622,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Masquerading"
 
@@ -732,7 +740,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Name"
 
@@ -740,6 +748,10 @@ msgstr "Name"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -768,7 +780,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Output"
 
@@ -790,7 +802,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -842,22 +854,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -901,10 +913,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -988,8 +1000,8 @@ msgstr ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -999,7 +1011,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1112,7 +1124,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1141,13 +1153,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1183,11 +1195,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zones"
 
@@ -1199,7 +1211,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "accept"
 
@@ -1288,7 +1300,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "drop"
 
@@ -1357,7 +1369,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "reject"
 
@@ -1400,9 +1412,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 3f3ca3a3f3..5b2ac7b021 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -157,7 +157,7 @@ msgstr "ACEPTAR - Desactivar reescritura de direcciones"
 msgid "Action"
 msgstr "Acción"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -167,7 +167,7 @@ msgstr ""
 "tráfico de destino de la zona, p.e. <code>-p tcp --dport 443</code> para que "
 "solo coincida con el tráfico HTTPS saliente."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -191,19 +191,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Ajustes avanzados"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Permitir tráfico \"inválido\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permitir reenvío desde <em>zonas de origen</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permitir reenvío a <em>zonas de destino</em>:"
 
@@ -238,11 +238,11 @@ msgstr ""
 "Asigne el asistente de seguimiento de conexión especificado al tráfico "
 "coincidente."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Asignación automática de ayuda"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -254,11 +254,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentario"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Configuraciones de Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Ayudantes de Conntrack"
 
@@ -274,15 +274,15 @@ msgstr "Continuar"
 msgid "Counters"
 msgstr "Contadores"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Interfaces cubiertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Redes cubiertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Subredes cubiertas"
 
@@ -331,7 +331,7 @@ msgstr "Zona de destino"
 msgid "Device name"
 msgstr "Nombre del dispositivo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -358,11 +358,11 @@ msgstr "Activar bucle de retorno de NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Activar protección contra inundaciones SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Activar registro en esta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -372,7 +372,7 @@ msgstr ""
 "para el tráfico saliente en esta zona. Esto normalmente está activo en la "
 "zona <em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -396,7 +396,7 @@ msgstr "Esperando: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Característica experimental. No es totalmente compatible con QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Elige explícitamente los ayudantes de seguimiento de conexión permitidos "
@@ -416,15 +416,15 @@ msgstr "Puerto externo"
 msgid "Extra arguments"
 msgstr "Argumentos extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Argumentos de destino adicionales"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Argumentos adicionales de iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Argumentos fuente adicionales"
 
@@ -464,6 +464,10 @@ msgstr "Cortafuegos - Ajustes de Zona"
 msgid "Firewall configuration migration"
 msgstr "Migración de configuración del Cortafuegos"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Reenviar"
@@ -546,7 +550,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Ajustes generales"
@@ -555,7 +559,11 @@ msgstr "Ajustes generales"
 msgid "Grant access to firewall configuration"
 msgstr "Conceder acceso a la configuración del Cortafuegos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Descarga de flujo por hardware"
 
@@ -583,14 +591,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Solo IPv4"
 
@@ -598,14 +606,14 @@ msgstr "Solo IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Enmascarar la IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Solo IPv6"
 
@@ -646,7 +654,7 @@ msgid "Initial Hash Size"
 msgstr "Tamaño de hash inicial"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Entrada"
 
@@ -662,7 +670,7 @@ msgstr "Puerto interno"
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Reenvío dentro de la zona"
 
@@ -682,7 +690,7 @@ msgstr "Nombre del conjunto no válido"
 msgid "Limit burst"
 msgstr "Límite de ráfaga"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limitar registro de mensajes"
 
@@ -700,8 +708,8 @@ msgstr ""
 "Limitar coincidencia a <var>%{limit.num}</var> paquetes por <var>%{limit."
 "unit}</var>%{limit.burst? interrumpir <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Enmascaramiento limitado activado"
 
@@ -718,11 +726,11 @@ msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 "MASQUERADE - Reescribir automáticamente a la IP de la interfaz de salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Sujeción MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Enmascaramiento"
 
@@ -851,7 +859,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nombre"
 
@@ -859,6 +867,10 @@ msgstr "Nombre"
 msgid "Netmask"
 msgstr "Máscara de red"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
@@ -889,7 +901,7 @@ msgid "Outbound zone"
 msgstr "Zona de salida"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Salida"
 
@@ -916,7 +928,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Ingrese argumentos adicionales a iptables. ¡Utilícelo con cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -978,22 +990,22 @@ msgstr "Consulta el Conjunto externo"
 msgid "Reflection zones"
 msgstr "Zonas de reflexión"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Requiere soporte de NAT por hardware."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringir enmascaramiento a las subredes destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringir enmascaramiento a las subredes origen"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Restringir para dirigirse a la familia"
 
@@ -1043,10 +1055,10 @@ msgstr ""
 "bits establecidos en la máscara."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Descarga basada en software para enrutamiento/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Descarga de flujo por software"
 
@@ -1136,8 +1148,8 @@ msgstr ""
 "El cortafuegos crea zonas sobre tus interfaces de red para controlar el "
 "flujo de tráfico de la red."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1154,7 +1166,7 @@ msgstr ""
 "la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la "
 "LAN también."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1292,7 +1304,7 @@ msgstr "Regla sin nombre"
 msgid "Unnamed set"
 msgstr "Conjunto sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zona sin nombre"
 
@@ -1324,7 +1336,7 @@ msgstr "Usar dirección IP interna"
 msgid "Use ipset"
 msgstr "Usar ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1332,7 +1344,7 @@ msgstr ""
 "Use esta opción para clasificar el tráfico de zona por raw, dispositivos de "
 "red no administrados <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1370,11 +1382,11 @@ msgstr "Su dispositivo no ejecuta firewall4."
 msgid "Your device runs firewall4."
 msgstr "Tu dispositivo ejecuta firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenvíos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zonas"
 
@@ -1388,7 +1400,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "aceptar"
 
@@ -1477,7 +1489,7 @@ msgstr "no seguir"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "descartar"
 
@@ -1551,7 +1563,7 @@ msgstr "port: Puerto"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "rechazar"
 
@@ -1594,9 +1606,9 @@ msgstr "src_port: Puerto de origen"
 msgid "this device"
 msgstr "este dispositivo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "esta nueva zona"
 
@@ -1617,6 +1629,9 @@ msgstr "hasta 65536 entradas."
 msgid "valid firewall mark"
 msgstr "marca de cortafuegos válida"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Descarga basada en software para enrutamiento/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/fa/firewall.po b/applications/luci-app-firewall/po/fa/firewall.po
index 59c3158a75..25ebe8ac12 100644
--- a/applications/luci-app-firewall/po/fa/firewall.po
+++ b/applications/luci-app-firewall/po/fa/firewall.po
@@ -150,7 +150,7 @@ msgstr "تایید - بازنویسی آدرس غیر فعال شد"
 msgid "Action"
 msgstr "اجرا"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -160,7 +160,7 @@ msgstr ""
 "عنوان مثال. <code>-p tcp --dport 443</code> فقط برای مطابقت با ترافیک خروجی "
 "HTTPS."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -183,19 +183,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "تنظیمات پیشرفته"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "پذیرش ترافیک \"نامعتبر\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "اجازه به جلو از <em>مناطق منبع</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "اجازه به جلو به<em>مناطق مقصد</em>:"
 
@@ -228,11 +228,11 @@ msgstr "کلاس یا مقدار DSCP داده شده را برای اتصالا
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "کمک ردیابی اتصال مشخص شده را به ترافیک همسان اختصاص دهید."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "واگذاری کمک کننده خودکار"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -243,11 +243,11 @@ msgstr ""
 msgid "Comment"
 msgstr "نظر"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "تنظیمات Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "کمک کنندگان Conntrack"
 
@@ -263,15 +263,15 @@ msgstr "ادامه"
 msgid "Counters"
 msgstr "شمارنده ها"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "دستگاه های تحت پوشش"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "شبکه های تحت پوشش"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "زیرشبکه های تحت پوشش"
 
@@ -320,7 +320,7 @@ msgstr "منطقه مقصد"
 msgid "Device name"
 msgstr "نام دستگاه"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -347,11 +347,11 @@ msgstr "فعال کردن NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "محافظت SYN-flood را فعال کردن"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "فعال کردن ورود به سیستم در این منطقه"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -360,7 +360,7 @@ msgstr ""
 "آدرس شبکه و ترجمه پورت IPv4 (NAT4 یا NAPT4) را برای ترافیک خروجی در این "
 "منطقه فعال کنید. این معمولاً در منطقه <em>wan</em> فعال است."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -384,7 +384,7 @@ msgstr "انتظار: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "ویژگی آزمایشی.به طور کامل با QoS / SQM سازگار نیست."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "به صراحت راهنماهای ردیابی اتصال مجاز را برای ترافیک منطقه انتخاب می کند"
@@ -403,15 +403,15 @@ msgstr "پورت خارجی"
 msgid "Extra arguments"
 msgstr "استدلال های اضافی"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "استدلال های اضافی مقصد"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "استدلال های اضافی iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "استدلال های اضافی منبع"
 
@@ -451,6 +451,10 @@ msgstr "فایروال - تنظیمات منطقه"
 msgid "Firewall configuration migration"
 msgstr "انتقال پیکربندی فایروال"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "پیشروی"
@@ -531,7 +535,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "پیکربندی عمومی"
@@ -540,7 +544,11 @@ msgstr "پیکربندی عمومی"
 msgid "Grant access to firewall configuration"
 msgstr "اجازه دسترسی به پیکربندی فایروال"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "تخلیه جریان سخت افزار"
 
@@ -568,14 +576,14 @@ msgstr "آی پی نسخه ۴"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 و IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "فقط IPv4"
 
@@ -583,14 +591,14 @@ msgstr "فقط IPv4"
 msgid "IPv6"
 msgstr "آی پی نسخه ۶"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 Masquerading"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "فقط IPv6"
 
@@ -631,7 +639,7 @@ msgid "Initial Hash Size"
 msgstr "اندازه هش اولیه"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "ورودی"
 
@@ -647,7 +655,7 @@ msgstr "پورت داخلی"
 msgid "Internal zone"
 msgstr "منطقه داخلی"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "هدایت بین ناحیه‌ای"
 
@@ -667,7 +675,7 @@ msgstr "نام مجموعه نامعتبر است"
 msgid "Limit burst"
 msgstr "ترکیدگی را محدود کنید"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "محدود کردن پیام های گزارش"
 
@@ -685,8 +693,8 @@ msgstr ""
 "محدود کردن تطابق به <var>%{limit.num}</var> بسته ها در هر <var>%{limit.unit}"
 "</var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "مخفی کاری محدود فعال شد"
 
@@ -702,11 +710,11 @@ msgstr "IP منبع Loopback"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "بالماسکه - به طور خودکار در IP رابط خروجی بازنویسی شود"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "بستن MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "ماسکه کردن"
 
@@ -828,7 +836,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "نام"
 
@@ -836,6 +844,10 @@ msgstr "نام"
 msgid "Netmask"
 msgstr "Netmask"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "فقط با ترافیک ورودی هدایت شده در آدرس IP داده شده مطابقت دهید."
@@ -866,7 +878,7 @@ msgid "Outbound zone"
 msgstr "منطقه خروجی"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "خروجی"
 
@@ -892,7 +904,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "آرگومان های اضافی را به iptables ارسال می کند. با احتیاط استفاده کنید!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -950,22 +962,22 @@ msgstr "مراجعه به مجموعه خارجی"
 msgid "Reflection zones"
 msgstr "مناطق بازتابی"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "نیاز به پشتیبانی سخت افزاری NAT دارد."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Masquerading را به زیرشبکه‌های مقصد مشخص محدود کنید"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Masquerading را به زیرشبکه های منبع داده شده محدود کنید"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "محدود کردن به آدرس خانواده"
 
@@ -1013,10 +1025,10 @@ msgstr ""
 "اصلاح می شوند."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "تخیله کردن مبتنی بر نرم افزار برای مسیریابی/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "تخلیه جریان نرم افزار"
 
@@ -1104,8 +1116,8 @@ msgstr ""
 "فایروال مناطقی را روی رابط های شبکه شما ایجاد می کند تا جریان ترافیک شبکه را "
 "کنترل کند."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1121,7 +1133,7 @@ msgstr ""
 "مثال. فوروارد از lan به wan <em>نیست</em> مستلزم اجازه فوروارد از wan به lan "
 "نیز نیست."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1258,7 +1270,7 @@ msgstr "قانون بدون نام"
 msgid "Unnamed set"
 msgstr "مجموعه بی نام"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "منطقه بدون نام"
 
@@ -1290,7 +1302,7 @@ msgstr "از آدرس IP داخلی استفاده کنید"
 msgid "Use ipset"
 msgstr "استفاده از ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1298,7 +1310,7 @@ msgstr ""
 "از این گزینه برای طبقه بندی ترافیک منطقه بر اساس دستگاه های شبکه مدیریت شده "
 "خام و غیر<em>uci</em> استفاده کنید."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1336,11 +1348,11 @@ msgstr "دستگاه شما از فایروال 4 استفاده نمی کند."
 msgid "Your device runs firewall4."
 msgstr "دستگاه شما از فایروال 4 استفاده می کند."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "فوروارد ⇒منطقه"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "مناطق"
 
@@ -1354,7 +1366,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "تایید"
 
@@ -1443,7 +1455,7 @@ msgstr "پیگیری نکنید"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "رها کردن"
 
@@ -1515,7 +1527,7 @@ msgstr "port: پورت"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "رد کردن"
 
@@ -1558,9 +1570,9 @@ msgstr "src_port: پورت مبدا"
 msgid "this device"
 msgstr "این دستگاه"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "این منطقه جدید"
 
@@ -1581,6 +1593,9 @@ msgstr "تا ۶۵۵۳۶ ورودی."
 msgid "valid firewall mark"
 msgstr "علامت فایروال معتبر"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "تخیله کردن مبتنی بر نرم افزار برای مسیریابی/NAT"
+
 #~ msgid ""
 #~ "Forwarded IPv4%{proto?, protocol %{proto#%{next?, }<var>%{item.name}</"
 #~ "var>}}%{mark?, mark <var%{mark.inv? data-tooltip=\"Match fwmarks except "
diff --git a/applications/luci-app-firewall/po/fi/firewall.po b/applications/luci-app-firewall/po/fi/firewall.po
index aa0fca4162..d6ab6bcd6e 100644
--- a/applications/luci-app-firewall/po/fi/firewall.po
+++ b/applications/luci-app-firewall/po/fi/firewall.po
@@ -155,7 +155,7 @@ msgstr "HYVÄKSY - Uudelleenkirjoittamatta osoitetta"
 msgid "Action"
 msgstr "Toiminta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -165,7 +165,7 @@ msgstr ""
 "luokittelemiseksi, esimerkiksi <code>-p tcp --dport 443</code> vastaa vain "
 "lähtevää HTTPS-liikennettä."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -187,19 +187,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Lisäasetukset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Salli \"virheellinen\" liikenne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Salli välitys <em>lähdevyöhykkeeltä</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Salli välitys <em>kohdevyöhykkeelle</em>:"
 
@@ -231,11 +231,11 @@ msgstr "Käytä annettua DSCP-luokkaa tai arvoa muodostetuille yhteyksille."
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "Määritä yhteysseurantaapuri vastaavalle liikenteelle."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automaattinen avustajan määritys"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -246,11 +246,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentti"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack-asetukset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack-auttajat"
 
@@ -266,15 +266,15 @@ msgstr "Jatka"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Katetut laitteet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Katetut verkot"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Katetut aliverkot"
 
@@ -323,7 +323,7 @@ msgstr "Kohdevyöhyke"
 msgid "Device name"
 msgstr "Laitenimi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -350,18 +350,18 @@ msgstr "Ota käyttöön NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Käytä SYN-flood-suojausta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Ota kirjaaminen käyttöön tällä vyöhykkeellä"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -383,7 +383,7 @@ msgstr "Odotettu: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Kokeellinen ominaisuus. Ei täysin yhteensopiva QoS/SQM:n kanssa."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "Valitse käsin sallivat yhteydenseuranta-apurit vyöhykeliikenteelle"
 
@@ -401,15 +401,15 @@ msgstr "Ulkoinen portti"
 msgid "Extra arguments"
 msgstr "Ylimääräiset argumentit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Lisäkohdeargumentit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Iptablesin lisäargumentit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Lisälähdeargumentit"
 
@@ -449,6 +449,10 @@ msgstr "Palomuuri - vyöhykeasetukset"
 msgid "Firewall configuration migration"
 msgstr "Palomuurin määritysten siirto"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Välitä"
@@ -525,7 +529,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Yleiset asetukset"
@@ -534,7 +538,11 @@ msgstr "Yleiset asetukset"
 msgid "Grant access to firewall configuration"
 msgstr "Anna pääsy palomuurin määrityksiin"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Laitteistovirran purku"
 
@@ -562,14 +570,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 ja IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Vain IPv4"
 
@@ -577,14 +585,14 @@ msgstr "Vain IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Vain IPv6"
 
@@ -615,7 +623,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Tuleva"
 
@@ -631,7 +639,7 @@ msgstr "Sisäinen portti"
 msgid "Internal zone"
 msgstr "Sisäinen vyöhyke"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -651,7 +659,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "Rajoita purskeet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Rajoita lokisanomia"
 
@@ -669,8 +677,8 @@ msgstr ""
 "Rajoita vastaavuus <var>%{limit.num}</var> pakettia per <var>%{limit.unit}</"
 "var>%{limit.burst? purske <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Rajoitettu naamiointi käytössä"
 
@@ -687,11 +695,11 @@ msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 "MASQUERADE - Uudelleenkirjoitus automaattisesti lähtevän rajapinnan IP: lle"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS-kiinnitys"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Naamiointi"
 
@@ -813,7 +821,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nimi"
 
@@ -821,6 +829,10 @@ msgstr "Nimi"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Vastaa vain annettuun IP-osoitteeseen suuntautuvaa liikennettä."
@@ -851,7 +863,7 @@ msgid "Outbound zone"
 msgstr "Lähtevä vyöhyke"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Lähtevä"
 
@@ -873,7 +885,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Välittää lisäargumentteja iptablesille. Käytä varoen!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -931,22 +943,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Edellyttää laitteiston NAT-tukea."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Rajoita naamiointi tiettyihin kohdeverkkoihin"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Rajoita naamiointi tiettyihin kohdeverkkoihin"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Rajoita tietyille osoitteille"
 
@@ -995,10 +1007,10 @@ msgstr ""
 "mask]. Jos maski on määritetty, vain maskiin määritettyjä bittiä muokataan."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Ohjelmistopohjainen reititys/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Ohjelmistopohjainen tietovirran nopeutus"
 
@@ -1086,8 +1098,8 @@ msgstr ""
 "Palomuuri luo vyöhykkeitä verkkosovittimista verkkoliikenteen kulun "
 "hallitsemiseksi."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1104,7 +1116,7 @@ msgstr ""
 "<em>yksisuuntainen</em>, esimerkiksi eteenpäin lanista waniin <em> ei</em> "
 "merkitse lupaa myös päästä eteenpäin wanista laniin."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1240,7 +1252,7 @@ msgstr "Nimetön sääntö"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Nimeämätön vyöhyke"
 
@@ -1272,7 +1284,7 @@ msgstr "Käytä sisäistä IP-osoitetta"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1280,7 +1292,7 @@ msgstr ""
 "Tämän vaihtoehdon avulla voit luokitella vyöhykeliikennettä raakana, ei-"
 "<em>uci</em> -hallittujen sovittimien avulla."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1318,11 +1330,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Vyöhyke ⇒ Välitys"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Vyöhykkeet"
 
@@ -1334,7 +1346,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "hyväksy"
 
@@ -1423,7 +1435,7 @@ msgstr "älä seuraa"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "pudota"
 
@@ -1492,7 +1504,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "hylkää"
 
@@ -1535,9 +1547,9 @@ msgstr ""
 msgid "this device"
 msgstr "tämä laite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "tämä uusi vyöhyke"
 
@@ -1558,6 +1570,9 @@ msgstr ""
 msgid "valid firewall mark"
 msgstr "kelvollinen palomuurimerkintä"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Ohjelmistopohjainen reititys/NAT"
+
 #~ msgid ""
 #~ "Forwarded IPv4%{proto?, protocol %{proto#%{next?, }<var>%{item.name}</"
 #~ "var>}}%{mark?, mark <var%{mark.inv? data-tooltip=\"Match fwmarks except "
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index bec05eea0a..c5e44ea716 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -153,7 +153,7 @@ msgstr "ACCEPTER - Désactiver la réécriture d'adresses"
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -163,7 +163,7 @@ msgstr ""
 "destination de la zone, par exemple <code>-p tcp --dport 443</code> pour "
 "correspondre uniquement au trafic HTTPS sortant."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -187,19 +187,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Autoriser le trafic \"invalide\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permettre la transmission des <em>zones source</em> :"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permettre la transmission vers les <em>zones destination</em> :"
 
@@ -235,11 +235,11 @@ msgstr ""
 "Attribue l'assistant de suivi des connexions spécifié au trafic "
 "correspondant."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Affectation automatique des assistants"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -251,11 +251,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Commentaire"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Paramètres Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Assistants Conntrack"
 
@@ -271,15 +271,15 @@ msgstr "Continuer"
 msgid "Counters"
 msgstr "Compteurs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Appareils couverts"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Réseaux couverts"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Sous-réseaux couverts"
 
@@ -328,7 +328,7 @@ msgstr "Zone de destination"
 msgid "Device name"
 msgstr "Nom de l'appareil"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -355,11 +355,11 @@ msgstr "Activer le NAT sur la boucle-locale"
 msgid "Enable SYN-flood protection"
 msgstr "Activer la protection contre le SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Activer les traces (logs) sur cette zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -369,7 +369,7 @@ msgstr ""
 "le trafic sortant de cette zone. Cette option est généralement activée dans "
 "la zone <em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -393,7 +393,7 @@ msgstr "Attendu : %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Fonction expérimentale. Pas entièrement compatible avec QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Choisit explicitement les assistants de suivi de connexion autorisés pour le "
@@ -413,15 +413,15 @@ msgstr "Port externe"
 msgid "Extra arguments"
 msgstr "Arguments supplémentaires"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Arguments de destination supplémentaires"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Arguments supplémentaires iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Arguments sources supplémentaires"
 
@@ -461,6 +461,10 @@ msgstr "Pare-feu - Configuration des zones"
 msgid "Firewall configuration migration"
 msgstr "Migration de la configuration du pare-feu"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Avant"
@@ -542,7 +546,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Réglages généraux"
@@ -551,7 +555,11 @@ msgstr "Réglages généraux"
 msgid "Grant access to firewall configuration"
 msgstr "Octroi l'accès à la configuration du pare-feu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Déchargement de flux matériel"
 
@@ -579,14 +587,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 et IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "IPv4 uniquement"
 
@@ -594,14 +602,14 @@ msgstr "IPv4 uniquement"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Masquage IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "IPv6 uniquement"
 
@@ -642,7 +650,7 @@ msgid "Initial Hash Size"
 msgstr "Taille initiale du hachage"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Entrée"
 
@@ -658,7 +666,7 @@ msgstr "Port interne"
 msgid "Internal zone"
 msgstr "Zone interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -678,7 +686,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "Rafale limite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limiter les messages de journalisation"
 
@@ -696,8 +704,8 @@ msgstr ""
 "Limiter la correspondance à <var>%{limit.num}</var> paquets par <var>%{limit."
 "unit}</var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Autorise un masquage limité"
 
@@ -713,11 +721,11 @@ msgstr "IP source de bouclage"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Réécriture automatique sur l'IP de l'interface sortante"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Contrainte du MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Masquage"
 
@@ -848,7 +856,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nom"
 
@@ -856,6 +864,10 @@ msgstr "Nom"
 msgid "Netmask"
 msgstr "Masque réseau"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -889,7 +901,7 @@ msgid "Outbound zone"
 msgstr "Zone sortante"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Sortie"
 
@@ -918,7 +930,7 @@ msgstr ""
 "Passe des arguments supplémentaires aux tables d'adresses IP. A utiliser "
 "avec précaution !"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -981,17 +993,17 @@ msgstr "Reportez-vous à l'ensemble externe"
 msgid "Reflection zones"
 msgstr "Zones de réflection"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Nécessite un support NAT matériel."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
 "destinataires"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
@@ -1000,7 +1012,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Restreindre à la famille d’adresses"
 
@@ -1049,10 +1061,10 @@ msgstr ""
 "le masque sont modifiés."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Déchargement basé sur logiciel pour le routage/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Déchargement de flux logiciel"
 
@@ -1142,8 +1154,8 @@ msgstr ""
 "Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
 "du trafic réseau."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1160,7 +1172,7 @@ msgstr ""
 "transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
 "de transmission du WAN au LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1298,7 +1310,7 @@ msgstr "Règle sans nom"
 msgid "Unnamed set"
 msgstr "Unnamed set"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zone sans nom"
 
@@ -1330,7 +1342,7 @@ msgstr "Utiliser l'adresse IP interne"
 msgid "Use ipset"
 msgstr "Utiliser ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1338,7 +1350,7 @@ msgstr ""
 "Utilisez cette option pour classer le trafic de zone par périphériques "
 "réseau bruts non <em>uci</em> gérés."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1376,11 +1388,11 @@ msgstr "Votre appareil n'exécute pas firewall4."
 msgid "Your device runs firewall4."
 msgstr "Votre appareil fonctionne avec firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Transferts"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zones"
 
@@ -1394,7 +1406,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "accepter"
 
@@ -1483,7 +1495,7 @@ msgstr "ne pas pister"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "ignorer"
 
@@ -1558,7 +1570,7 @@ msgstr "port : Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "rejeter"
 
@@ -1601,9 +1613,9 @@ msgstr "src_port: Source Port"
 msgid "this device"
 msgstr "cet appareil"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "cette nouvelle zone"
 
@@ -1624,6 +1636,9 @@ msgstr "jusqu'à 65536 entrées."
 msgid "valid firewall mark"
 msgstr "marque de pare-feu valide"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Déchargement basé sur logiciel pour le routage/NAT"
+
 #~ msgid ""
 #~ "Forwarded IPv4%{proto?, protocol %{proto#%{next?, }<var>%{item.name}</"
 #~ "var>}}%{mark?, mark <var%{mark.inv? data-tooltip=\"Match fwmarks except "
diff --git a/applications/luci-app-firewall/po/ga/firewall.po b/applications/luci-app-firewall/po/ga/firewall.po
index fa5bdc1164..3ea68321ca 100644
--- a/applications/luci-app-firewall/po/ga/firewall.po
+++ b/applications/luci-app-firewall/po/ga/firewall.po
@@ -34,12 +34,12 @@ msgstr ""
 "%{src?%{dest?Ar Aghaidh:Isteach}:Amach} %{ipv6?%{ipv4?<var>IPv4</var> agus "
 "<var>IPv6</var>:<var>IPv6</var>} :<var>IPv4</var>}%{proto?, prótacal "
 "%{proto#%{next?, }%{item.types?<var class=\"cbi-tooltip-container\">%{item."
-"name} <span class=\"cbi-tooltip\">ICMP le cineálacha %{item.types#%{next?, "
-"}<var>%{item}</var>}</span>:<var>% {item.name}</var>}}} %{mark?, marcáil "
-"<var %{mark.inv? data-tooltip=\"Meaitseáil fwmarks seachas %{mark.num}%{"
-"mark.mask? le masc %{mark.mask}}.\": %{mark.mask? data-tooltip=\"Masc fwmark "
-"luach le %{mark.mask} roimh chur i gcomparáid.\"}}> %{mark.val}</var>} %{"
-"dscp?, DSCP %{dscp.inv?<var data-tooltip = \"Meaitseáil aicmithe DSCP "
+"name} <span class=\"cbi-tooltip\">ICMP le cineálacha %{item.types#%{next?, }"
+"<var>%{item}</var>}</span>:<var>% {item.name}</var>}}} %{mark?, marcáil <var "
+"%{mark.inv? data-tooltip=\"Meaitseáil fwmarks seachas %{mark.num}%{mark."
+"mask? le masc %{mark.mask}}.\": %{mark.mask? data-tooltip=\"Masc fwmark "
+"luach le %{mark.mask} roimh chur i gcomparáid.\"}}> %{mark.val}</var>} "
+"%{dscp?, DSCP %{dscp.inv?<var data-tooltip = \"Meaitseáil aicmithe DSCP "
 "seachas %{dscp.num?: %{dscp.name}}\"> %{dscp.val}</var>: <var> %{dscp.val}</"
 "var> }} %{ cúntóir?, cúntóir %{helper.inv?<var data-tooltip=\"Meaitseáil "
 "cúntóir ar bith seachas &quot;%{helper.name}&quot;\"> %{helper.val}</var>:"
@@ -65,8 +65,8 @@ msgstr "1024"
 msgid ""
 "<var data-tooltip=\"ACCEPT\">Accept</var> %{src?%{dest?forward:input}:output}"
 msgstr ""
-"<var data-tooltip=\"AGCEPT\">Glac le</var> "
-"%{src?%{dest?forward:input}:output}"
+"<var data-tooltip=\"AGCEPT\">Glac le</var> %{src?%{dest?forward:input}:"
+"output}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
 msgid "<var data-tooltip=\"ACCEPT\">Prevent source rewrite</var>"
@@ -90,7 +90,8 @@ msgstr ""
 msgid ""
 "<var data-tooltip=\"DSCP\">Assign DSCP</var> classification <var>%{set_dscp}"
 "</var>"
-msgstr "<var data-tooltip=\"DSCP\">Sann DSCP</var> rangú <var>%{set_dscp}</var>"
+msgstr ""
+"<var data-tooltip=\"DSCP\">Sann DSCP</var> rangú <var>%{set_dscp}</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
 msgid ""
@@ -118,24 +119,24 @@ msgid ""
 "<var data-tooltip=\"NOTRACK\">Do not track</var> %{src?%{dest?forward:input}:"
 "output}"
 msgstr ""
-"<var data-tooltip=\"NOTRACK\">Ná rianaigh</var> "
-"%{src?%{dest?forward:input}:output}"
+"<var data-tooltip=\"NOTRACK\">Ná rianaigh</var> %{src?%{dest?forward:input}:"
+"output}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:121
 msgid ""
 "<var data-tooltip=\"REJECT\">Reject</var> %{src?%{dest?forward:input}:output}"
 msgstr ""
-"<var data-tooltip=\"REJECT\">Diúltaigh</var> "
-"%{src?%{dest?forward:input}:aschur}"
+"<var data-tooltip=\"REJECT\">Diúltaigh</var> %{src?%{dest?forward:input}:"
+"aschur}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:87
 msgid ""
 "<var data-tooltip=\"SNAT\">Statically rewrite</var> to source %{snat_ip?IP "
 "<var>%{snat_ip}</var>} %{snat_port?port <var>%{snat_port}</var>}"
 msgstr ""
-"<var data-tooltip=\"SNAT\">Athscríobh go statach</var> chuig foinse %{"
-"snat_ip?IP <var> %{snat_ip}</var>} %{snat_port?port <var> %{snat_port}</var "
-">}"
+"<var data-tooltip=\"SNAT\">Athscríobh go statach</var> chuig foinse "
+"%{snat_ip?IP <var> %{snat_ip}</var>} %{snat_port?port <var> %{snat_port}</"
+"var >}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:305
 msgid "A rewrite IP must be specified!"
@@ -153,7 +154,7 @@ msgstr "GLACADH - Díchumasaigh athscríobh seoltaí"
 msgid "Action"
 msgstr "Gníomhaíocht"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -163,14 +164,14 @@ msgstr ""
 "rangú, m.sh. <code> -p tcp --dport 443</code> chun trácht HTTPS amach a "
 "mheaitseáil amháin."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
-"Argóintí breise amh <em>iptables</em> chun trácht foinse crios a rangú, "
-"m.sh. <code> -p tcp --sport 443</code> chun trácht HTTPS isteach a "
-"mheaitseáil amháin."
+"Argóintí breise amh <em>iptables</em> chun trácht foinse crios a rangú, m."
+"sh. <code> -p tcp --sport 443</code> chun trácht HTTPS isteach a mheaitseáil "
+"amháin."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
 msgid "Address family, Internal IP address must match"
@@ -187,19 +188,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Socruithe chun cinn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Ceadaigh trácht “neamhbhailí”"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Ceadaigh ar aghaidh ó <em>criosanna foinse</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Ceadaigh ar aghaidh chuig <em>criosanna</em>:"
 
@@ -232,11 +233,11 @@ msgstr "Cuir an rang nó an luach DSCP a thugtar i bhfeidhm ar naisc bhunaithe."
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "Sann an cúntóir rianaithe nasc sonraithe le trácht comhoiriúnach."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Sannadh cúntóir uathoi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -248,11 +249,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Trácht"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Socruithe Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Cúntóirí Conntrack"
 
@@ -268,15 +269,15 @@ msgstr "Lean ar aghaidh"
 msgid "Counters"
 msgstr "Áiritheoirí"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Feistí clúdaithe"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Líonraí clúdaithe"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Fo-líontaí clúdaithe"
 
@@ -325,7 +326,7 @@ msgstr "Crios ceann scríbe"
 msgid "Device name"
 msgstr "Ainm gléas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -352,11 +353,11 @@ msgstr "Cumasaigh NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Cumasaigh cosaint tuilte Sync"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Cumasaigh logáil ar an gcrios seo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -366,7 +367,7 @@ msgstr ""
 "haghaidh tráchta amach sa chrios seo. Is gnách é seo a chumasú sa chrios "
 "<em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -390,9 +391,10 @@ msgstr "Ag súil le: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Gné turgnamhach. Ní hiomlán comhoiriúnach le QOS/méadar cearnach."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr "Roghnaíonn sé go sainráite cúntóirí rianaithe nasc ceadaithe do thrácht"
+msgstr ""
+"Roghnaíonn sé go sainráite cúntóirí rianaithe nasc ceadaithe do thrácht"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:273
 msgid "External IP address"
@@ -408,15 +410,15 @@ msgstr "Calafort seachtrach"
 msgid "Extra arguments"
 msgstr "Argóintí breise"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Argóintí scríbe breise"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Argóintí breise iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Argóintí foinse breise"
 
@@ -456,6 +458,10 @@ msgstr "Balla dóiteáin - Socruithe Crios"
 msgid "Firewall configuration migration"
 msgstr "Imirce cumraíochta dóiteáin"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Ar aghaidh"
@@ -469,12 +475,12 @@ msgid ""
 "tooltip=\"Mask fwmark value with %{mark.mask} before compare.\"}}>%{mark.val}"
 "</var>}"
 msgstr ""
-"Curtha ar aghaidh %{ipv6?%{ipv4?<var>IPv4</var> agus "
-"<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{ proto? , prótacal "
-"%{proto#%{ar aghaidh?, }<var>%{item.name}</var> }} %{mark?, marc <var %{"
-"mark.inv? data-tooltip=\"Meaitseáil fwmarks seachas %{mark.num}%{mark.mask? "
-"le masc %{mark.mask}}.\": %{mark.mask? data-tooltip=\"Masc luach fwmark le "
-"%{mark.mask} roimh chomparáid a dhéanamh.\"}}> %{mark.val}</var>}"
+"Curtha ar aghaidh %{ipv6?%{ipv4?<var>IPv4</var> agus <var>IPv6</var>:"
+"<var>IPv6</var>}:<var>IPv4</var>}%{ proto? , prótacal %{proto#%{ar "
+"aghaidh?, }<var>%{item.name}</var> }} %{mark?, marc <var %{mark.inv? data-"
+"tooltip=\"Meaitseáil fwmarks seachas %{mark.num}%{mark.mask? le masc %{mark."
+"mask}}.\": %{mark.mask? data-tooltip=\"Masc luach fwmark le %{mark.mask} "
+"roimh chomparáid a dhéanamh.\"}}> %{mark.val}</var>}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:484
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:357
@@ -491,9 +497,9 @@ msgid ""
 msgstr ""
 "Ó %{src}%{src_device?, comhéadan <var>%{src_device}</var>} %{src_ip?, IP "
 "%{src_ip#%{next?, }<var%{item.inv? data-tooltip=\"Meaitseáil seoltaí IP ach "
-"amháin %{item.val}.\"}> %{item.ival}</var> }} %{src_port?, port %{src_port#%{"
-" Next?, }<var% {mír.inv? data-tooltip=\"Meaitseáil poirt seachas %{item.val}."
-"\"}> %{item.ival}</var>}}"
+"amháin %{item.val}.\"}> %{item.ival}</var> }} %{src_port?, port "
+"%{src_port#%{ Next?, }<var% {mír.inv? data-tooltip=\"Meaitseáil poirt "
+"seachas %{item.val}.\"}> %{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
 msgid ""
@@ -508,12 +514,12 @@ msgid ""
 msgstr ""
 "Ó %{src}%{src_device?, comhéadan <var>%{src_device}</var>} %{src_ip?, IP "
 "%{src_ip#%{next?, }<var%{item.inv? data-tooltip=\"Meaitseáil seoltaí IP ach "
-"amháin %{item.val}.\"}> %{item.ival}</var> }} %{src_port?, port %{src_port#%{"
-" Next?, }<var% {mír.inv? data-tooltip=\"Meaitseáil poirt seachas %{item.val}."
-"\"}> %{item.ival}</var> }} %{src_mac?, MAC %{src_mac#%{next?, }<var %{ "
-"mír.inv? data-tooltip=\"Meaitseáil MAC seachas %{item.val}%{item.hint.name? "
-"a.k.a. %{item.hint.name}}.\": %{item.hint.name? data-tooltip=\"%{item.hint."
-"name}\" }}> %{item.ival}</var>}}"
+"amháin %{item.val}.\"}> %{item.ival}</var> }} %{src_port?, port "
+"%{src_port#%{ Next?, }<var% {mír.inv? data-tooltip=\"Meaitseáil poirt "
+"seachas %{item.val}.\"}> %{item.ival}</var> }} %{src_mac?, MAC "
+"%{src_mac#%{next?, }<var %{ mír.inv? data-tooltip=\"Meaitseáil MAC seachas "
+"%{item.val}%{item.hint.name? a.k.a. %{item.hint.name}}.\": %{item.hint.name? "
+"data-tooltip=\"%{item.hint.name}\" }}> %{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 msgid ""
@@ -525,19 +531,20 @@ msgid ""
 "%{item.val}%{item.hint.name? a.k.a. %{item.hint.name}}.\":%{item.hint.name? "
 "data-tooltip=\"%{item.hint.name}\"}}>%{item.ival}</var>}}"
 msgstr ""
-"Ó %{src}%{src_ip?, IP %{src_ip#%{ar aghaidh?, }<var %{item.inv? data-tooltip="
-"\"Meaitseáil seoltaí IP ach amháin %{item.val}.\"}> %{item.ival}</var> }} %{"
-"src_port?, port %{src_port#%{ Next?, }<var% {mír.inv? data-tooltip="
-"\"Meaitseáil poirt seachas %{item.val}.\"}> %{item.ival}</var> }} %{"
-"src_mac?, MAC %{src_mac#%{next?, }<var %{ mír.inv? data-tooltip=\"Meaitseáil "
-"MAC seachas %{item.val}%{item.hint.name? a.k.a. %{item.hint.name}}.\": %{"
-"item.hint.name? data-tooltip=\"%{item.hint.name}\" }}> %{item.ival}</var>}}"
+"Ó %{src}%{src_ip?, IP %{src_ip#%{ar aghaidh?, }<var %{item.inv? data-"
+"tooltip=\"Meaitseáil seoltaí IP ach amháin %{item.val}.\"}> %{item.ival}</"
+"var> }} %{src_port?, port %{src_port#%{ Next?, }<var% {mír.inv? data-"
+"tooltip=\"Meaitseáil poirt seachas %{item.val}.\"}> %{item.ival}</var> }} "
+"%{src_mac?, MAC %{src_mac#%{next?, }<var %{ mír.inv? data-"
+"tooltip=\"Meaitseáil MAC seachas %{item.val}%{item.hint.name? a.k.a. %{item."
+"hint.name}}.\": %{item.hint.name? data-tooltip=\"%{item.hint.name}\" }}> "
+"%{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:160
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Socruithe Ginearálta"
@@ -546,7 +553,11 @@ msgstr "Socruithe Ginearálta"
 msgid "Grant access to firewall configuration"
 msgstr "Rochtain a dheonú ar chumraíocht dóiteáin"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Díluchtú sreafa crua-earraí"
 
@@ -574,14 +585,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 agus IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "IPv4 amháin"
 
@@ -589,14 +600,14 @@ msgstr "IPv4 amháin"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Mascaradh IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "IPv6 amháin"
 
@@ -621,24 +632,24 @@ msgid ""
 "any helper except &quot;%{helper.name}&quot;\">%{helper.val}</var>:<var data-"
 "tooltip=\"%{helper.name}\">%{helper.val}</var>}}"
 msgstr ""
-"Ag teacht isteach %{ipv6?%{ipv4?<var>IPv4</var> agus "
-"<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{ proto? , prótacal "
+"Ag teacht isteach %{ipv6?%{ipv4?<var>IPv4</var> agus <var>IPv6</var>:"
+"<var>IPv6</var>}:<var>IPv4</var>}%{ proto? , prótacal "
 "%{proto#%{next?, }%{item.types?<var class=\"cbi-tooltip-container\">%{item."
-"name}<span class=\"cbi-tooltip\">ICMP le cineálacha % {item.types#%{next?, "
-"}<var>%{item}</var>}</span></var>: <var>%{item.name}</var> }}} %{ marc?, "
+"name}<span class=\"cbi-tooltip\">ICMP le cineálacha % {item.types#%{next?, }"
+"<var>%{item}</var>}</span></var>: <var>%{item.name}</var> }}} %{ marc?, "
 "marcáil <var %{mark.inv? data-tooltip=\"Meaitseáil fwmarks seachas %{mark."
 "num}%{mark.mask? le masc %{mark.mask}}.\": %{mark.mask? data-tooltip=\"Masc "
-"fwmark luach le %{mark.mask} roimh chur i gcomparáid.\"}}> %{mark.val}</var>}"
-" %{helper?, cúntóir %{helper.inv?<var data-tooltip = \"Meaitseáil cúntóir ar "
-"bith ach amháin &quot;%{helper.name}&quot;\"> %{helper.val}</var>:<var data-"
-"tooltip=\"%{helper.name}\"> %{helper.val} </var> }}"
+"fwmark luach le %{mark.mask} roimh chur i gcomparáid.\"}}> %{mark.val}</"
+"var>} %{helper?, cúntóir %{helper.inv?<var data-tooltip = \"Meaitseáil "
+"cúntóir ar bith ach amháin &quot;%{helper.name}&quot;\"> %{helper.val}</var>:"
+"<var data-tooltip=\"%{helper.name}\"> %{helper.val} </var> }}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:179
 msgid "Initial Hash Size"
 msgstr "Méid Hash Tosaigh"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Ionchur"
 
@@ -654,7 +665,7 @@ msgstr "Port inmheánach"
 msgid "Internal zone"
 msgstr "Crios inmheánach"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Intra chrios ar aghaidh"
 
@@ -674,7 +685,7 @@ msgstr "Ainm tacar neamhbhailí"
 msgid "Limit burst"
 msgstr "Pléascadh teorainn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Teachtaireachtaí logála teorainn"
 
@@ -692,8 +703,8 @@ msgstr ""
 "Teorainn a mheaitseáil le <var>%{limit.num}</var> paicéad in aghaidh an "
 "<var>%{limit.unit}</var> %{limit.burst? pléasctha <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Cumasaithe masquerading teoranta"
 
@@ -709,11 +720,11 @@ msgstr "Foinse Loopback IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Athscríobh go huathoibríoch chuig IP comhéadan amach"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Clampáil MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Masquerating"
 
@@ -840,7 +851,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Ainm"
 
@@ -848,6 +859,10 @@ msgstr "Ainm"
 msgid "Netmask"
 msgstr "Líonmasc"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -879,7 +894,7 @@ msgid "Outbound zone"
 msgstr "Crios amach"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Aschur"
 
@@ -906,7 +921,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Cuireann argóintí breise chuig iptables. Úsáid go cúramach!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -966,22 +981,22 @@ msgstr "Féach do Sraith Seachtrach"
 msgid "Reflection zones"
 msgstr "Criosanna machnaimh"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Teastaíonn tacaíocht NAT crua-earraí."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Masquerading a theorannú go fo-líontaí ceann scríbe ar leith"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Masquerading a theorannú le fo-líontaí foinse ar leith"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Cuir srian le dul i ngleic le"
 
@@ -1030,10 +1045,10 @@ msgstr ""
 "leagtha amach sa masc a mhodhnú."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Díluchtú bunaithe ar bhogearraí le haghaidh Routa/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Díluchtú sreafa bogearraí"
 
@@ -1123,8 +1138,8 @@ msgstr ""
 "Cruthaíonn an balla dóiteáin criosanna thar do chomhéadain líonra chun "
 "sreabhadh tráchta líonra a rialú."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1141,7 +1156,7 @@ msgstr ""
 "m.sh. ní <em>ní</em>déanann ar aghaidh ó lan go wan cead a thabhairt ar "
 "aghaidh ó wan go lan freisin."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1187,8 +1202,8 @@ msgid ""
 "<var%{item.inv? data-tooltip=\"Match ports except %{item.val}.\"}>%{item."
 "ival}</var>}}"
 msgstr ""
-"Chuig %{dest}%{dest_device?, comhéadan <var>%{dest_device}</var>} %{"
-"dest_ip?, IP %{dest_ip#%{next?, }<var%{item.inv? data-tooltip=\"Meaitseáil "
+"Chuig %{dest}%{dest_device?, comhéadan <var>%{dest_device}</var>} "
+"%{dest_ip?, IP %{dest_ip#%{next?, }<var%{item.inv? data-tooltip=\"Meaitseáil "
 "seoltaí IP seachas %{item.val}.\"}> %{item.ival}</var> }} %{dest_port?, port "
 "%{dest_port#%{ Next?, }<var% {mír.inv? data-tooltip=\"Meaitseáil poirt "
 "seachas %{item.val}.\"}> %{item.ival}</var>}}"
@@ -1201,8 +1216,8 @@ msgid ""
 "%{dest_port#%{next?, }<var%{item.inv? data-tooltip=\"Match ports except "
 "%{item.val}.\"}>%{item.ival}</var>}}"
 msgstr ""
-"Chuig %{dest}%{dest_device?, trí chomhéadan <var>%{dest_device}</var>} %{"
-"dest_ip?, IP %{dest_ip#%{next?, }<var%{item.inv? data-tooltip=\"Meaitseáil "
+"Chuig %{dest}%{dest_device?, trí chomhéadan <var>%{dest_device}</var>} "
+"%{dest_ip?, IP %{dest_ip#%{next?, }<var%{item.inv? data-tooltip=\"Meaitseáil "
 "seoltaí IP seachas %{item.val}.\"}> %{item.ival}</var> }} %{dest_port?, port "
 "%{dest_port#%{ Next?, }<var% {mír.inv? data-tooltip=\"Meaitseáil poirt "
 "seachas %{item.val}.\"}> %{item.ival}</var>}}"
@@ -1215,9 +1230,9 @@ msgid ""
 "tooltip=\"Match ports except %{item.val}.\"}>%{item.ival}</var>}}"
 msgstr ""
 "Chuig %{dest}%{dest_ip?, IP %{dest_ip#%{ar aghaidh?, }<var %{item.inv? data-"
-"tooltip=\"Meaitseáil seoltaí IP seachas %{item.val}.\"}> %{item.ival}</var> "
-"}} %{dest_port?, port %{dest_port#%{ Next?, }<var% {mír.inv? data-tooltip="
-"\"Meaitseáil poirt seachas %{item.val}.\"}> %{item.ival}</var>}}"
+"tooltip=\"Meaitseáil seoltaí IP seachas %{item.val}.\"}> %{item.ival}</"
+"var> }} %{dest_port?, port %{dest_port#%{ Next?, }<var% {mír.inv? data-"
+"tooltip=\"Meaitseáil poirt seachas %{item.val}.\"}> %{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
 msgid "Tracking helper"
@@ -1279,7 +1294,7 @@ msgstr "Riail gan ainmniú"
 msgid "Unnamed set"
 msgstr "Sraith gan ainmniú"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Crios gan ainm"
 
@@ -1311,7 +1326,7 @@ msgstr "Úsáid seoladh IP inmheánach"
 msgid "Use ipset"
 msgstr "Úsáid ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1319,7 +1334,7 @@ msgstr ""
 "Úsáid an rogha seo chun trácht crios a rangú de réir gairis líonra amha, "
 "nach bhfuil á mbainistiú ag <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1357,11 +1372,11 @@ msgstr "Ní ritheann do ghléas firewall4."
 msgid "Your device runs firewall4."
 msgstr "Ritheann do ghléas firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Crios ⇒ Seoladh"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Criosanna"
 
@@ -1375,7 +1390,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "glacadh le"
 
@@ -1464,7 +1479,7 @@ msgstr "ná rianú"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "titim"
 
@@ -1503,7 +1518,8 @@ msgstr "ip[/cidr]<br />"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:144
 msgid "ip[/cidr]<br />For use with Match datatypes: <code>*_ip</code>."
-msgstr "ip[/cidr]<br />Le húsáid le cineálacha sonraí Match: <code>*_ip</code>."
+msgstr ""
+"ip[/cidr]<br />Le húsáid le cineálacha sonraí Match: <code>*_ip</code>."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:69
 msgid "ipv4"
@@ -1537,7 +1553,7 @@ msgstr "calafort: Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "diúltú"
 
@@ -1580,9 +1596,9 @@ msgstr "src_port: Port Foinse"
 msgid "this device"
 msgstr "an gléas seo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "an crios nua seo"
 
@@ -1602,3 +1618,6 @@ msgstr "suas go dtí 65536 iontráil."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr "marc balla dóiteáin bailí"
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Díluchtú bunaithe ar bhogearraí le haghaidh Routa/NAT"
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index ca414563b5..630afae32c 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -120,14 +120,14 @@ msgstr ""
 msgid "Action"
 msgstr "פעולה"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -146,19 +146,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "הגדרות מתקדמות"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -188,11 +188,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -202,11 +202,11 @@ msgstr ""
 msgid "Comment"
 msgstr "תגובה"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -222,15 +222,15 @@ msgstr "המשך"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -275,7 +275,7 @@ msgstr "אזור היעד"
 msgid "Device name"
 msgstr "שם המכשיר"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -299,18 +299,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -350,15 +350,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -398,6 +398,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -453,7 +457,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -462,7 +466,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -490,14 +498,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -505,14 +513,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -543,7 +551,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -559,7 +567,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -579,7 +587,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -595,8 +603,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -612,11 +620,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -728,7 +736,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -736,6 +744,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -764,7 +776,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -786,7 +798,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -837,22 +849,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -896,10 +908,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -981,8 +993,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -992,7 +1004,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1105,7 +1117,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1134,13 +1146,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1176,11 +1188,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1192,7 +1204,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1281,7 +1293,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1350,7 +1362,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1393,9 +1405,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/hi/firewall.po b/applications/luci-app-firewall/po/hi/firewall.po
index b19a45ff0a..c9b1efc250 100644
--- a/applications/luci-app-firewall/po/hi/firewall.po
+++ b/applications/luci-app-firewall/po/hi/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "उन्नत सेटिंग्स"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -301,18 +301,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -352,15 +352,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -400,6 +400,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "अग्रेषित करना"
@@ -455,7 +459,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -464,7 +468,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -492,14 +500,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -507,14 +515,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -545,7 +553,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -561,7 +569,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -581,7 +589,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -597,8 +605,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -614,11 +622,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -730,7 +738,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -738,6 +746,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -766,7 +778,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -788,7 +800,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -839,22 +851,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -898,10 +910,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -983,8 +995,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -994,7 +1006,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1107,7 +1119,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1136,13 +1148,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1178,11 +1190,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1194,7 +1206,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1283,7 +1295,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1352,7 +1364,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1395,9 +1407,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 19dd819ae8..a9124a8f12 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -31,17 +31,17 @@ msgstr ""
 "\"%{src?%{dest?Továbbított:Bejövő}:Kimenő} %{ipv6?%{ipv4?<var>IPv4</var> és "
 "<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protokoll\\: "
 "%{proto#%{next?, }%{item.types?<var class=\"cbi-tooltip-container\">%{item."
-"name}<span class=\"cbi-tooltip\">ICMP típus\\: %{item.types#%{next?, "
-"}<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, Jelölő\\"
-": <var%{mark.inv? data-tooltip=\"Mindenre illeszkedő tűzfaljelölő, kivéve\\: "
-"%{mark.num}%{mark.mask?, %{mark.mask} maszkkal}\":%{mark.mask? data-tooltip="
-"\"Tűzfaljelölőt illesztés előtt %{mark.mask} értékkel maszkolja\"}}>%{mark."
-"val}</var>}%{dscp?, DSCP\\: %{dscp.inv?<var data-tooltip=\"Mindenre "
-"illeszkedő DSCP, kivéve\\: %{dscp.num?:%{dscp.name}}\">%{dscp."
-"val}</var>:<var>%{dscp.val}</var>}}%{helper?, Segítő\\: %{helper.inv?<var "
-"data-tooltip=\"Mindenre illeszkedő segítő, kivéve\\: &quot;%{helper."
-"name}&quot;\">%{helper.val}</var>:<var data-tooltip=\"%{helper.name}\""
-">%{helper.val}</var>}}\""
+"name}<span class=\"cbi-tooltip\">ICMP típus\\: %{item.types#%{next?, }"
+"<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, "
+"Jelölő\\: <var%{mark.inv? data-tooltip=\"Mindenre illeszkedő tűzfaljelölő, "
+"kivéve\\: %{mark.num}%{mark.mask?, %{mark.mask} maszkkal}\":%{mark.mask? "
+"data-tooltip=\"Tűzfaljelölőt illesztés előtt %{mark.mask} értékkel "
+"maszkolja\"}}>%{mark.val}</var>}%{dscp?, DSCP\\: %{dscp.inv?<var data-"
+"tooltip=\"Mindenre illeszkedő DSCP, kivéve\\: %{dscp.num?:%{dscp."
+"name}}\">%{dscp.val}</var>:<var>%{dscp.val}</var>}}%{helper?, Segítő\\: "
+"%{helper.inv?<var data-tooltip=\"Mindenre illeszkedő segítő, kivéve\\: &quot;"
+"%{helper.name}&quot;\">%{helper.val}</var>:<var data-tooltip=\"%{helper."
+"name}\">%{helper.val}</var>}}\""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:463
 msgid "-- add IP --"
@@ -63,8 +63,8 @@ msgstr "1024"
 msgid ""
 "<var data-tooltip=\"ACCEPT\">Accept</var> %{src?%{dest?forward:input}:output}"
 msgstr ""
-"%{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-tooltip=\"ACCEPT\""
-">Elfogadása</var>"
+"%{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-"
+"tooltip=\"ACCEPT\">Elfogadása</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
 msgid "<var data-tooltip=\"ACCEPT\">Prevent source rewrite</var>"
@@ -76,16 +76,16 @@ msgid ""
 "<var data-tooltip=\"DNAT\">Forward</var> to %{dest}%{dest_ip? IP "
 "<var>%{dest_ip}</var>}%{dest_port? port <var>%{dest_port}</var>}"
 msgstr ""
-"msgstr \"<var data-tooltip=\"DNAT\">Továbbítás</var> "
-"⇒%{dest}%{dest_ip?<var>%{dest_ip}</var> IP-re}%{dest_port?%{dest_ip? és "
-"}<var>%{dest_port}</var> portra}"
+"msgstr \"<var data-tooltip=\"DNAT\">Továbbítás</var> ⇒%{dest}%{dest_ip?"
+"<var>%{dest_ip}</var> IP-re}%{dest_port?%{dest_ip? és }<var>%{dest_port}</"
+"var> portra}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:115
 msgid ""
 "<var data-tooltip=\"DROP\">Drop</var> %{src?%{dest?forward:input}:output}"
 msgstr ""
-"{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-tooltip=\"DROP\""
-">Eldobása</var>"
+"{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-"
+"tooltip=\"DROP\">Eldobása</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:133
 msgid ""
@@ -108,35 +108,36 @@ msgid ""
 "<var data-tooltip=\"MARK\">%{set_mark?Assign:XOR}</var> firewall mark "
 "<var>%{set_mark?:%{set_xmark}}</var>"
 msgstr ""
-"<var data-tooltip=\"MARK\">%{set_mark?Hozzárendelt:XOR}</var> tűzfal jelölő\\"
-": <var>%{set_mark?:%{set_xmark}}</var>"
+"<var data-tooltip=\"MARK\">%{set_mark?Hozzárendelt:XOR}</var> tűzfal "
+"jelölő\\: <var>%{set_mark?:%{set_xmark}}</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:90
 msgid "<var data-tooltip=\"MASQUERADE\">Automatically rewrite</var> source IP"
-msgstr "<var data-tooltip=\"MASQUERADE\">Automatikusan átírva</var> a forrás IP"
+msgstr ""
+"<var data-tooltip=\"MASQUERADE\">Automatikusan átírva</var> a forrás IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:124
 msgid ""
 "<var data-tooltip=\"NOTRACK\">Do not track</var> %{src?%{dest?forward:input}:"
 "output}"
 msgstr ""
-"%{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-tooltip=\"NOTRACK\""
-">kapcsolatkövetés nélkül</var>"
+"%{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-"
+"tooltip=\"NOTRACK\">kapcsolatkövetés nélkül</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:121
 msgid ""
 "<var data-tooltip=\"REJECT\">Reject</var> %{src?%{dest?forward:input}:output}"
 msgstr ""
-"%{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-tooltip=\"REJECT\""
-">Visszautasítása</var>"
+"%{src?%{dest?Továbbítás:Bemenet}:Kimenet} <var data-"
+"tooltip=\"REJECT\">Visszautasítása</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:87
 msgid ""
 "<var data-tooltip=\"SNAT\">Statically rewrite</var> to source %{snat_ip?IP "
 "<var>%{snat_ip}</var>} %{snat_port?port <var>%{snat_port}</var>}"
 msgstr ""
-"<var data-tooltip=\"SNAT\">Statikusan átírva</var>, új forrás%{snat_ip? IP\\:"
-" <var>%{snat_ip}</var>}%{snat_port?%{snat_ip? és }port\\: "
+"<var data-tooltip=\"SNAT\">Statikusan átírva</var>, új forrás%{snat_ip? "
+"IP\\: <var>%{snat_ip}</var>}%{snat_port?%{snat_ip? és }port\\: "
 "<var>%{snat_port}</var>}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:305
@@ -155,7 +156,7 @@ msgstr "ELFOGADÁS – címátírás letiltása"
 msgid "Action"
 msgstr "Művelet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -165,7 +166,7 @@ msgstr ""
 "besorolásához, például <code>-p tcp --dport 443</code> csak a kimenő HTTPS "
 "forgalom illesztéséhez."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -189,19 +190,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "„Érvénytelen” forgalom engedélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Továbbítás engedélyezése a <em>forrászónákból</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Továbbítás engedélyezése ezekbe a <em>célzónákba</em>:"
 
@@ -222,10 +223,10 @@ msgid ""
 "established connections. Format is value[/mask]. If a mask is specified then "
 "those bits set in the mask are zeroed out."
 msgstr ""
-"A megadott érték és a meglévő jelölőérték bitenkénti XOR (<em>kizáró "
-"vagy</em>) műveletének alkalmazása a kiépített kapcsolatokon. A formátum: "
-"érték[/maszk]. Ha egy maszk meg van adva, akkor a maszkban beállított bitek "
-"ki lesznek nullázva."
+"A megadott érték és a meglévő jelölőérték bitenkénti XOR (<em>kizáró vagy</"
+"em>) műveletének alkalmazása a kiépített kapcsolatokon. A formátum: érték[/"
+"maszk]. Ha egy maszk meg van adva, akkor a maszkban beállított bitek ki "
+"lesznek nullázva."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:264
 msgid "Apply the given DSCP class or value to established connections."
@@ -237,11 +238,11 @@ msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 "A megadott kapcsolatkövetés-segítő hozzárendelése az illesztett forgalomhoz."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automatikus segítő hozzárendelés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -253,11 +254,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Kapcsolatkövető beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Kapcsolatkövetés-segítők"
 
@@ -273,15 +274,15 @@ msgstr "Folytatás"
 msgid "Counters"
 msgstr "Számlálók"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Lefedett eszközök"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Lefedett hálózatok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Lefedett alhálózatok"
 
@@ -330,7 +331,7 @@ msgstr "Célzóna"
 msgid "Device name"
 msgstr "Eszköznév"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -356,11 +357,11 @@ msgstr "NAT visszacsatolás engedélyezése"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-elárasztás elleni védelem engedélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Naplózás engedélyezése ezen a zónán"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -370,7 +371,7 @@ msgstr ""
 "kimenő forgalomhoz ebben a zónában. Ez általában a <em>wan</em> zónában van "
 "engedélyezve."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -397,7 +398,7 @@ msgstr ""
 "minőség (Quality of Service)\">QoS</abbr> / <abbr title=\"Intelligens "
 "várakozási sor kezelés (Smart Queue Management)\">SQM</abbr> használatával."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Egyértelműen kiválasztja az engedélyezett kapcsolatkövetés-segítőket a "
@@ -417,15 +418,15 @@ msgstr "Külső port"
 msgid "Extra arguments"
 msgstr "További argumentumok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "További célargumentumok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "További <em>iptables</em> argumentumok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "További forrásargumentumok"
 
@@ -465,6 +466,10 @@ msgstr "Tűzfal – zónabeállítások"
 msgid "Firewall configuration migration"
 msgstr "Tűzfal szabályok áttelepítése"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Továbbítás"
@@ -478,13 +483,12 @@ msgid ""
 "tooltip=\"Mask fwmark value with %{mark.mask} before compare.\"}}>%{mark.val}"
 "</var>}"
 msgstr ""
-"Továbbított %{ipv6?%{ipv4?<var>IPv4</var> és "
-"<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protokoll\\: "
-"%{proto#%{next?, }<var>%{item.name}</var>}}%{mark?, Jelölő\\: <var%{"
-"mark.inv? data-tooltip=\"Mindenre illeszkedő tűzfaljelölő, kivéve\\: %{mark."
-"num}%{mark.mask?, %{mark.mask} maszkkal}\":%{mark.mask? data-tooltip="
-"\"Tűzfaljelölőt illesztés előtt %{mark.mask} értékkel maszkolja\"}}>%{mark."
-"val}</var>}"
+"Továbbított %{ipv6?%{ipv4?<var>IPv4</var> és <var>IPv6</var>:<var>IPv6</"
+"var>}:<var>IPv4</var>}%{proto?, protokoll\\: %{proto#%{next?, }<var>%{item."
+"name}</var>}}%{mark?, Jelölő\\: <var%{mark.inv? data-tooltip=\"Mindenre "
+"illeszkedő tűzfaljelölő, kivéve\\: %{mark.num}%{mark.mask?, %{mark.mask} "
+"maszkkal}\":%{mark.mask? data-tooltip=\"Tűzfaljelölőt illesztés előtt %{mark."
+"mask} értékkel maszkolja\"}}>%{mark.val}</var>}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:484
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:357
@@ -522,8 +526,8 @@ msgstr ""
 "%{src_port#%{next?, }<var%{item.inv? data-tooltip=\"Mindenre illeszkedő "
 "portszám, kivéve\\: %{item.val}\"}>%{item.ival}</var>}}%{src_mac?, MAC\\: "
 "%{src_mac#%{next?, }<var%{item.inv? data-tooltip=\"Mindenre illeszkedő MAC-"
-"cím, kivéve\\: %{item.val}%{item.hint.name? azaz %{item.hint.name}}\":%{"
-"item.hint.name? data-tooltip=\\\"%{item.hint.name}\\\"}}>%{item.ival}</var>}}"
+"cím, kivéve\\: %{item.val}%{item.hint.name? azaz %{item.hint.name}}\":%{item."
+"hint.name? data-tooltip=\\\"%{item.hint.name}\\\"}}>%{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 msgid ""
@@ -536,19 +540,19 @@ msgid ""
 "data-tooltip=\"%{item.hint.name}\"}}>%{item.ival}</var>}}"
 msgstr ""
 "Innen: %{src}%{src_ip?, IP\\: %{src_ip#%{next?, }<var%{item.inv? data-"
-"tooltip=\"Mindenre illeszkedő IP-cím, kivéve\\: %{item.val}\"}>%{item."
-"ival}</var>}}%{src_port?, port\\: %{src_port#%{next?, }<var%{item.inv? data-"
-"tooltip=\"Mindenre illeszkedő portszám, kivéve\\: %{item.val}\"}>%{item."
-"ival}</var>}}%{src_mac?, MAC\\: %{src_mac#%{next?, }<var%{item.inv? data-"
-"tooltip=\"Mindenre illeszkedő MAC-cím, kivéve\\: %{item.val}%{"
-"item.hint.name? azaz %{item.hint.name}}\":%{item.hint.name? data-tooltip=\\\""
-"%{item.hint.name}\\\"}}>%{item.ival}</var>}}"
+"tooltip=\"Mindenre illeszkedő IP-cím, kivéve\\: %{item.val}\"}>%{item.ival}</"
+"var>}}%{src_port?, port\\: %{src_port#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Mindenre illeszkedő portszám, kivéve\\: %{item.val}\"}>%{item.ival}"
+"</var>}}%{src_mac?, MAC\\: %{src_mac#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Mindenre illeszkedő MAC-cím, kivéve\\: %{item.val}%{item.hint."
+"name? azaz %{item.hint.name}}\":%{item.hint.name? data-tooltip=\\\"%{item."
+"hint.name}\\\"}}>%{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:160
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Általános beállítások"
@@ -557,7 +561,11 @@ msgstr "Általános beállítások"
 msgid "Grant access to firewall configuration"
 msgstr "Jogosultság adása a tűzfal beállításához"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Hardveres áramláskiürítés"
 
@@ -585,14 +593,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 és IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Csak IPv4"
 
@@ -600,14 +608,14 @@ msgstr "Csak IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 álcázás"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Csak IPv6"
 
@@ -632,24 +640,24 @@ msgid ""
 "any helper except &quot;%{helper.name}&quot;\">%{helper.val}</var>:<var data-"
 "tooltip=\"%{helper.name}\">%{helper.val}</var>}}"
 msgstr ""
-"Bejövő: %{ipv6?%{ipv4?<var>IPv4</var> és "
-"<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protokoll\\: "
-"%{proto#%{next?, }%{item.types?<var class=\"cbi-tooltip-container\">%{item."
-"name}<span class=\"cbi-tooltip\">ICMP típus\\: %{item.types#%{next?, "
-"}<var>%{item}</var>}</span></var>:<var>%{item.name}</var>}}}%{mark?, Jelölő\\"
-": <var%{mark.inv? data-tooltip=\"Mindenre illeszkedő tűzfaljelölő, kivéve\\: "
-"%{mark.num}%{mark.mask?, %{mark.mask} maszkkal}\":%{mark.mask? data-tooltip="
-"\"Tűzfaljelölőt illesztés előtt %{mark.mask} értékkel maszkolja.\"}}>%{mark."
-"val}</var>}%{helper?, Segítő\\: %{helper.inv?<var data-tooltip=\"Mindenre "
-"illeszkedő segítő, kivéve\\: &quot;%{helper.name}&quot;\">%{helper."
-"val}</var>:<var data-tooltip=\"%{helper.name}\">%{helper.val}</var>}}"
+"Bejövő: %{ipv6?%{ipv4?<var>IPv4</var> és <var>IPv6</var>:<var>IPv6</var>}:"
+"<var>IPv4</var>}%{proto?, protokoll\\: %{proto#%{next?, }%{item.types?<var "
+"class=\"cbi-tooltip-container\">%{item.name}<span class=\"cbi-tooltip\">ICMP "
+"típus\\: %{item.types#%{next?, }<var>%{item}</var>}</span></var>:<var>%{item."
+"name}</var>}}}%{mark?, Jelölő\\: <var%{mark.inv? data-tooltip=\"Mindenre "
+"illeszkedő tűzfaljelölő, kivéve\\: %{mark.num}%{mark.mask?, %{mark.mask} "
+"maszkkal}\":%{mark.mask? data-tooltip=\"Tűzfaljelölőt illesztés előtt %{mark."
+"mask} értékkel maszkolja.\"}}>%{mark.val}</var>}%{helper?, Segítő\\: "
+"%{helper.inv?<var data-tooltip=\"Mindenre illeszkedő segítő, kivéve\\: &quot;"
+"%{helper.name}&quot;\">%{helper.val}</var>:<var data-tooltip=\"%{helper."
+"name}\">%{helper.val}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:179
 msgid "Initial Hash Size"
 msgstr "Kezdeti hash méret"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Bemenet"
 
@@ -665,7 +673,7 @@ msgstr "Belső port"
 msgid "Internal zone"
 msgstr "Belső zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -685,7 +693,7 @@ msgstr "Érvénytelen készlet név"
 msgid "Limit burst"
 msgstr "Löketek korlátozása"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Naplóüzenetek korlátozása"
 
@@ -700,11 +708,11 @@ msgid ""
 "Limit matching to <var>%{limit.num}</var> packets per <var>%{limit.unit}</"
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
-"Korlátozás: <var>%{limit.num}</var> csomag / <var>%{limit.unit}</var>%{"
-"limit.burst?, <var>%{limit.burst}</var> löket}"
+"Korlátozás: <var>%{limit.num}</var> csomag / <var>%{limit.unit}</var>%{limit."
+"burst?, <var>%{limit.burst}</var> löket}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Korlátozott álcázás engedélyezve"
 
@@ -720,11 +728,11 @@ msgstr "Visszacsatolt forrás IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "ÁLCÁZÁS – automatikus átírás a kimenő csatoló IP-jére"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS összefogás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Álcázás"
 
@@ -792,7 +800,8 @@ msgstr "Forgalom illesztése a megadott kapcsolatkövetés-segítő használatá
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:319
 msgid "Matches a specific firewall mark or a range of different marks."
-msgstr "Egy bizonyos tűzfaljelölőt vagy különböző jelölők tartományát illeszti."
+msgstr ""
+"Egy bizonyos tűzfaljelölőt vagy különböző jelölők tartományát illeszti."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
 msgid "Matches forwarded traffic using the specified outbound network device."
@@ -803,8 +812,8 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:264
 msgid "Matches traffic carrying the specified DSCP marking."
 msgstr ""
-"A megadott <abbr title=\\\"Differenciált szolgáltatások kódpontja ("
-"Differentiated Services Code Point)\\\">DSCP</abbr> jelölést használva "
+"A megadott <abbr title=\\\"Differenciált szolgáltatások kódpontja "
+"(Differentiated Services Code Point)\\\">DSCP</abbr> jelölést használva "
 "illeszti a forgalmat."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:112
@@ -852,7 +861,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Név"
 
@@ -860,6 +869,10 @@ msgstr "Név"
 msgid "Netmask"
 msgstr "Netmask"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Csak a megadott IP-címre irányított bejövő forgalom illesztése."
@@ -891,7 +904,7 @@ msgid "Outbound zone"
 msgstr "Kimenő zóna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Kimenet"
 
@@ -920,7 +933,7 @@ msgstr ""
 "Átadja a további argumentumokat az <em>iptables</em> részére. Használja "
 "körültekintően!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -938,8 +951,8 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:187
 msgid "Path to file of CIDRs, subnets, host IPs, etc.<br />"
 msgstr ""
-"Elérési út a <abbr title=\"Osztály nélküli tartományok közötti útválasztás ("
-"Classless Inter-Domain Routing)\">CIDR</abbr>-ek, alhálózatok, gazdagép IP-"
+"Elérési út a <abbr title=\"Osztály nélküli tartományok közötti útválasztás "
+"(Classless Inter-Domain Routing)\">CIDR</abbr>-ek, alhálózatok, gazdagép IP-"
 "címek, stb. fájlhoz.<br />"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
@@ -983,24 +996,24 @@ msgstr "Lásd: Külső készlet"
 msgid "Reflection zones"
 msgstr "Tükrözési zónák"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
-"Hardveres <abbr title=\"Hálózati címfordítás (Network Address Translation)\""
-">NAT</abbr> támogatás szükséges."
+"Hardveres <abbr title=\"Hálózati címfordítás (Network Address "
+"Translation)\">NAT</abbr> támogatás szükséges."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Álcázás korlátozása a megadott cél-alhálózatokra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Álcázás korlátozása a megadott forrás-alhálózatokra"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Korlátozás címcsaládra"
 
@@ -1048,12 +1061,10 @@ msgstr ""
 "bitek lesznek módosítva."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
-"Szoftver alapú kiürítés az útválasztásnál vagy <abbr title=\"Hálózati "
-"címfordítás (Network Address Translation)\">NAT</abbr>-nál."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Szoftveres áramláskiürítés"
 
@@ -1142,8 +1153,8 @@ msgstr ""
 "A tűzfalzónákat hoz létre a hálózati csatolók fölött a hálózati forgalom "
 "áramlásának szabályozásához."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1160,7 +1171,7 @@ msgstr ""
 "LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
 "engedélyezett."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1220,11 +1231,12 @@ msgid ""
 "%{dest_port#%{next?, }<var%{item.inv? data-tooltip=\"Match ports except "
 "%{item.val}.\"}>%{item.ival}</var>}}"
 msgstr ""
-"Ide: %{dest}%{dest_device?, csatolón át\\: <var>%{dest_device}</var>}%{"
-"dest_ip?, IP\\: %{dest_ip#%{next?, }<var%{item.inv? data-tooltip=\"Mindenre "
-"illeszkedő IP-cím, kivéve\\: %{item.val}\"}>%{item.ival}</var>}}%{"
-"dest_port?, port\\: %{dest_port#%{next?, }<var%{item.inv? data-tooltip="
-"\"Mindenre illeszkedő portszám, kivéve\\: %{item.val}\"}>%{item.ival}</var>}}"
+"Ide: %{dest}%{dest_device?, csatolón át\\: <var>%{dest_device}</"
+"var>}%{dest_ip?, IP\\: %{dest_ip#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Mindenre illeszkedő IP-cím, kivéve\\: %{item.val}\"}>%{item.ival}</"
+"var>}}%{dest_port?, port\\: %{dest_port#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Mindenre illeszkedő portszám, kivéve\\: %{item.val}\"}>%{item.ival}"
+"</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:61
 msgid ""
@@ -1234,10 +1246,10 @@ msgid ""
 "tooltip=\"Match ports except %{item.val}.\"}>%{item.ival}</var>}}"
 msgstr ""
 "Ide: %{dest}%{dest_ip?, IP\\: %{dest_ip#%{next?, }<var%{item.inv? data-"
-"tooltip=\"Mindenre illeszkedő IP-cím, kivéve\\: %{item.val}\"}>%{item."
-"ival}</var>}}%{dest_port?, port\\: %{dest_port#%{next?, }<var%{item.inv? "
-"data-tooltip=\"Mindenre illeszkedő portszám, kivéve\\: %{item.val}\"}>%{item."
-"ival}</var>}}"
+"tooltip=\"Mindenre illeszkedő IP-cím, kivéve\\: %{item.val}\"}>%{item.ival}</"
+"var>}}%{dest_port?, port\\: %{dest_port#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Mindenre illeszkedő portszám, kivéve\\: %{item.val}\"}>%{item.ival}"
+"</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
 msgid "Tracking helper"
@@ -1300,7 +1312,7 @@ msgstr "Névtelen szabály"
 msgid "Unnamed set"
 msgstr "Névtelen beállítás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Névtelen zóna"
 
@@ -1332,7 +1344,7 @@ msgstr "Belső IP-cím használata"
 msgid "Use ipset"
 msgstr "<em>ipset</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1340,7 +1352,7 @@ msgstr ""
 "Használja ezt a beállítást a zónaforgalom nyers, nem <em>uci</em> által "
 "kezelt hálózati eszközök szerint történő besorolásához."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1378,11 +1390,11 @@ msgstr "Az eszközön nem firewall4 fut."
 msgid "Your device runs firewall4."
 msgstr "Az eszközön firewall4 fut."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Továbbítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zónák"
 
@@ -1396,7 +1408,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "elfogadás"
 
@@ -1485,7 +1497,7 @@ msgstr "nincs követés"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "eldobás"
 
@@ -1558,7 +1570,7 @@ msgstr "port: Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "visszautasítás"
 
@@ -1601,9 +1613,9 @@ msgstr "src_port: Forrásport"
 msgid "this device"
 msgstr "ez az eszköz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "ez az új zóna"
 
@@ -1623,3 +1635,8 @@ msgstr "65 536 bejegyzésig."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr "érvényes tűzfaljelölő"
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr ""
+#~ "Szoftver alapú kiürítés az útválasztásnál vagy <abbr title=\"Hálózati "
+#~ "címfordítás (Network Address Translation)\">NAT</abbr>-nál."
diff --git a/applications/luci-app-firewall/po/id/firewall.po b/applications/luci-app-firewall/po/id/firewall.po
index 0b3b402e46..a4a172ce7a 100644
--- a/applications/luci-app-firewall/po/id/firewall.po
+++ b/applications/luci-app-firewall/po/id/firewall.po
@@ -154,7 +154,7 @@ msgstr "ACCEPT - Nonaktifkan penulisan ulang alamat"
 msgid "Action"
 msgstr "Aksi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -164,7 +164,7 @@ msgstr ""
 "lintas tujuan zona, misalnya <code>-p tcp --dport 443</code> agar hanya "
 "cocok dengan lalu lintas HTTPS keluar."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -186,19 +186,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Setelan Lanjutan"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Izinkan lalu lintas \"tidak valid\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Izinkan forward dari <em> zona sumber </em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Izinkan forward ke <em> zona tujuan </em>:"
 
@@ -233,11 +233,11 @@ msgstr ""
 "Tetapkan pembantu pelacakan koneksi yang ditentukan ke lalu lintas yang "
 "cocok."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Penetapan pembantu otomatis"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -247,11 +247,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -267,15 +267,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -344,18 +344,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -377,7 +377,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -395,15 +395,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -443,6 +443,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "meneruskan"
@@ -498,7 +502,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Setelan Umum"
@@ -507,7 +511,11 @@ msgstr "Setelan Umum"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -535,14 +543,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -550,14 +558,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -588,7 +596,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -604,7 +612,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -624,7 +632,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -640,8 +648,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -657,11 +665,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -773,7 +781,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nama"
 
@@ -781,6 +789,10 @@ msgstr "Nama"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -809,7 +821,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -831,7 +843,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -882,22 +894,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -941,10 +953,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -1026,8 +1038,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1037,7 +1049,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1150,7 +1162,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1179,13 +1191,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1221,11 +1233,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1237,7 +1249,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1326,7 +1338,7 @@ msgstr "jangan lacak"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "buang"
 
@@ -1395,7 +1407,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "tolak"
 
@@ -1438,9 +1450,9 @@ msgstr ""
 msgid "this device"
 msgstr "peranti ini"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "zona baru ini"
 
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index e5d79ddd06..83aae46bff 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -158,7 +158,7 @@ msgstr "ACCETTA - Disattiva riscrittura degli indirizzi"
 msgid "Action"
 msgstr "Azione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -168,7 +168,7 @@ msgstr ""
 "di destinazione della zona, ad es. <code>-p tcp --dport 443</code> per il "
 "solo traffico HTTPS in uscita."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -192,19 +192,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Impostazioni avanzate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Consenti traffico \"non valido\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Consenti l'inoltro da <em>zone di origine</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Consenti l'inoltro a <em>zone di destinazione</em>:"
 
@@ -239,11 +239,11 @@ msgstr ""
 "Assegna l'assistente di tracciamento di connessione specificato al traffico "
 "corrispondente."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Assegnazione automatica dell'assistente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -255,11 +255,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Commento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Impostazioni di conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Assistenti di conntrack"
 
@@ -275,15 +275,15 @@ msgstr "Continua"
 msgid "Counters"
 msgstr "Contatori"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Dispositivi coperti"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Reti coperte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Sottoreti coperte"
 
@@ -332,7 +332,7 @@ msgstr "Zona di destinazione"
 msgid "Device name"
 msgstr "Nome dispositivo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -359,11 +359,11 @@ msgstr "Attiva loopback NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Attiva protezione SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Attiva registro su questa zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -373,7 +373,7 @@ msgstr ""
 "traffico in uscita su questa zona. È tipicamente attivata nella zona "
 "<em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -398,7 +398,7 @@ msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 "Caratteristica sperimentale. Non completamente compatibile con QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Sceglie esplicitamente gli assistenti autorizzati del monitoraggio delle "
@@ -418,15 +418,15 @@ msgstr "Porta esterna"
 msgid "Extra arguments"
 msgstr "Argomenti extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Argomenti di destinazione extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Argomenti di iptables extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Argomenti di origine extra"
 
@@ -466,6 +466,10 @@ msgstr "Firewall - Impostazioni zona"
 msgid "Firewall configuration migration"
 msgstr "Migrazione configurazione del firewall"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Inoltra"
@@ -548,7 +552,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Impostazioni Generali"
@@ -557,7 +561,11 @@ msgstr "Impostazioni Generali"
 msgid "Grant access to firewall configuration"
 msgstr "Concedi l'accesso alla configurazione del firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Scarico del flusso hardware"
 
@@ -585,14 +593,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Solo IPv4"
 
@@ -600,14 +608,14 @@ msgstr "Solo IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Masquerading IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Solo IPv6"
 
@@ -649,7 +657,7 @@ msgid "Initial Hash Size"
 msgstr "Dimensione hash iniziale"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "In entrata"
 
@@ -665,7 +673,7 @@ msgstr "Porta interna"
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Inoltro zona intra"
 
@@ -685,7 +693,7 @@ msgstr "Nome set non valido"
 msgid "Limit burst"
 msgstr "Limite di raffica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limita messaggi del registro"
 
@@ -703,8 +711,8 @@ msgstr ""
 "Limita la corrispondenza a <var>%{limit.num}</var> pacchetti per "
 "<var>%{limit.unit}</var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Masquerading limitato attivato"
 
@@ -721,11 +729,11 @@ msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 "MASQUERADE - Riscrivi automaticamente all'IP dell'interfaccia in uscita"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Ancoraggio MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Masquerading"
 
@@ -855,7 +863,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nome"
 
@@ -863,6 +871,10 @@ msgstr "Nome"
 msgid "Netmask"
 msgstr "Maschera di rete"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
@@ -893,7 +905,7 @@ msgid "Outbound zone"
 msgstr "Zona di uscita"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "In uscita"
 
@@ -920,7 +932,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa comandi addizionali a iptables. Usare con cura!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -979,22 +991,22 @@ msgstr "Fare riferimento a set esterno"
 msgid "Reflection zones"
 msgstr "Zone riflettive"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Richiede supporto NAT hardware."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Limita il Masquerading alle subnet di destinazione date"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Limita il Masquerading alle subnet sorgente date"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Limita agli indirizzi famiglia"
 
@@ -1044,10 +1056,10 @@ msgstr ""
 "impostati nella maschera sono modificati."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Scarico basato sul software per instradamento/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Scarico del flusso software"
 
@@ -1136,8 +1148,8 @@ msgstr ""
 "Il firewall crea delle zone nelle tue interfacce di rete per controllare il "
 "flusso del traffico."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1154,7 +1166,7 @@ msgstr ""
 "alla wan <em>non</em> implica anche un permesso da inoltrare dalla wan alla "
 "lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1292,7 +1304,7 @@ msgstr "Regola senza nome"
 msgid "Unnamed set"
 msgstr "Set senza nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zona senza nome"
 
@@ -1324,7 +1336,7 @@ msgstr "Usa l'indirizzo IP interno"
 msgid "Use ipset"
 msgstr "Usa ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1332,7 +1344,7 @@ msgstr ""
 "Usa questa opzione per classificare il traffico di zona da dispositivi di "
 "rete gestiti grezzi, non<em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1370,11 +1382,11 @@ msgstr "Il dispositivo non sta eseguendo firewall4."
 msgid "Your device runs firewall4."
 msgstr "Il dispositivo sta eseguendo firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Inoltri"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zone"
 
@@ -1388,7 +1400,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "accetta"
 
@@ -1477,7 +1489,7 @@ msgstr "non tracciare"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "scarta (drop)"
 
@@ -1550,7 +1562,7 @@ msgstr "port: porta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "rifiuta (reject)"
 
@@ -1593,9 +1605,9 @@ msgstr "src_port: porta di origine"
 msgid "this device"
 msgstr "questo dispositivo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "questa nuova zona"
 
@@ -1615,3 +1627,6 @@ msgstr "fino a 65536 voci."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr "contrassegno firewall valido"
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Scarico basato sul software per instradamento/NAT"
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 7ecacd1c31..48b1b1c5cd 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -149,7 +149,7 @@ msgstr "ACCEPT - アドレス書き換えを無効化"
 msgid "Action"
 msgstr "アクション"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -159,7 +159,7 @@ msgstr ""
 "em> 引数です。（例: HTTPS 送信トラフィックのみにマッチさせる <code>-p tcp --"
 "dport 443</code>）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -181,19 +181,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "\"invalid\" トラフィックの許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em>宛先ゾーン</em>への転送を許可する:"
 
@@ -226,11 +226,11 @@ msgstr "指定された DSCP クラスまたは値を確立された接続に適
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "指定された接続追跡ヘルパーを対象のトラフィックに割り当てます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "自動ヘルパー割り当て"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -242,11 +242,11 @@ msgstr ""
 msgid "Comment"
 msgstr "コメント"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack 設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack ヘルパー"
 
@@ -262,15 +262,15 @@ msgstr "続行"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "カバーされるデバイス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "対象ネットワーク"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "カバーされるサブネット"
 
@@ -319,7 +319,7 @@ msgstr "宛先ゾーン"
 msgid "Device name"
 msgstr "デバイス名"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -346,18 +346,18 @@ msgstr "NATループバックを有効にする"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-Floodプロテクションを有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "このゾーンのログ記録を有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -379,7 +379,7 @@ msgstr "%sである必要があります"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "ゾーン トラフィックの接続追跡ヘルパーを明示的に選択します。"
 
@@ -397,15 +397,15 @@ msgstr "外部ポート"
 msgid "Extra arguments"
 msgstr "追加の引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "追加の送信先引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "追加の iptables 引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "追加の送信元引数"
 
@@ -445,6 +445,10 @@ msgstr "ファイアウォール - ゾーン設定"
 msgid "Firewall configuration migration"
 msgstr "ファイアウォール設定マイグレーション"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "転送"
@@ -520,7 +524,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "一般設定"
@@ -529,7 +533,11 @@ msgstr "一般設定"
 msgid "Grant access to firewall configuration"
 msgstr "ファイアウォール構成へのアクセスを許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "ハードウェア フローオフロード"
 
@@ -557,14 +565,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4及びIPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "IPv4のみ"
 
@@ -572,14 +580,14 @@ msgstr "IPv4のみ"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "IPv6のみ"
 
@@ -610,7 +618,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "受信"
 
@@ -626,7 +634,7 @@ msgstr "内部ポート"
 msgid "Internal zone"
 msgstr "内部ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -646,7 +654,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "バースト制限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "ログメッセージを制限"
 
@@ -664,8 +672,8 @@ msgstr ""
 "一致するパケット数を <var>%{limit.unit}</var> あたり <var>%{limit.num}</var> "
 "に制限%{limit.burst?（バースト <var>%{limit.burst}</var>）}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "限定的なマスカレードが有効"
 
@@ -681,11 +689,11 @@ msgstr "ループバック元 IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - 自動的に送信側インターフェース IP へ書き換え"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSSクランプ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "マスカレード"
 
@@ -809,7 +817,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "名前"
 
@@ -817,6 +825,10 @@ msgstr "名前"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
@@ -849,7 +861,7 @@ msgid "Outbound zone"
 msgstr "送信側ゾーン"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "送信"
 
@@ -873,7 +885,7 @@ msgstr ""
 "iptablesにパススルーする追加の引数を設定してください。注意して設定してくださ"
 "い！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -933,22 +945,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "ハードウェア NAT サポートが必要です。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "設定された宛先サブネットへのマスカレードを制限する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "設定された送信元サブネットへのマスカレードを制限する"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "アドレスファミリの制限"
 
@@ -996,10 +1008,10 @@ msgstr ""
 "マスクが指定されている場合、マスクによって有効なビットのみ設定されます。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "ソフトウェア フローオフロード"
 
@@ -1089,8 +1101,8 @@ msgstr ""
 "ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
 "ラフィックの制御を行います。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1106,7 +1118,7 @@ msgstr ""
 "向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
 "ません。</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1241,7 +1253,7 @@ msgstr "名称未設定のルール"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "名称未設定のゾーン"
 
@@ -1273,7 +1285,7 @@ msgstr "内部 IP アドレスを使用"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1281,7 +1293,7 @@ msgstr ""
 "生の、または非 <em>uci</em> 管理下にあるデバイスによるゾーン トラフィックの区"
 "分にこのオプションを使用します。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1319,11 +1331,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "ゾーン ⇒ 転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "ゾーン"
 
@@ -1335,7 +1347,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "許可"
 
@@ -1424,7 +1436,7 @@ msgstr "コネクション追跡を行わない"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "破棄"
 
@@ -1493,7 +1505,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "拒否"
 
@@ -1536,9 +1548,9 @@ msgstr ""
 msgid "this device"
 msgstr "このデバイス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "この新しいゾーン"
 
@@ -1559,6 +1571,9 @@ msgstr ""
 msgid "valid firewall mark"
 msgstr "有効なファイアウォール マーク"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
+
 #~ msgid ""
 #~ "Forwarded IPv4%{proto?, protocol %{proto#%{next?, }<var>%{item.name}</"
 #~ "var>}}%{mark?, mark <var%{mark.inv? data-tooltip=\"Match fwmarks except "
diff --git a/applications/luci-app-firewall/po/ka/firewall.po b/applications/luci-app-firewall/po/ka/firewall.po
index 6d95dcc38e..3438920b5a 100644
--- a/applications/luci-app-firewall/po/ka/firewall.po
+++ b/applications/luci-app-firewall/po/ka/firewall.po
@@ -130,14 +130,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -158,19 +158,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "გაფართოებული პარამეტრები"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "გადამისამართების ნებართვა <em>საწყისი არედან</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "გადაგზავნის ნებართვა <em>საბოლოო არეებში</em>:"
 
@@ -200,11 +200,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -214,11 +214,11 @@ msgstr ""
 msgid "Comment"
 msgstr "შენიშვნა"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack-პარამეტრები"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack-დამხმარე"
 
@@ -234,15 +234,15 @@ msgstr "გაგრძელება"
 msgid "Counters"
 msgstr "მთვლელები"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -287,7 +287,7 @@ msgstr "საბოლოო არე"
 msgid "Device name"
 msgstr "მოწყობილობის სახელი"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -311,11 +311,11 @@ msgstr "ამოქმედდეს NAT-უკუკავშირი"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood-დაცვის ჩართვა"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "აღრიცხვის ჩართვა ამ არესთვის"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -324,7 +324,7 @@ msgstr ""
 "ამოქმედდეს ქსელისა და პორტის გარდაქმნა IPv4 (NAT4 ან NAPT4) გამავალი "
 "ნაკადისთვის ამ არეში. ჩვეულებრივ მოქმედია ხოლმე <em>wan</em> არეში."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -348,7 +348,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "საცდელი შესაძლებლობა. სრულად თავსებადი არ იქნება QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -366,15 +366,15 @@ msgstr "გარე პორტი"
 msgid "Extra arguments"
 msgstr "დამატებითი არგუმენტები"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "დამატებით არგუმენტები საბოლოო წერტილისთვის"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "დამატებითი არგუმენტები საწყისი წერტილისთვის"
 
@@ -414,6 +414,10 @@ msgstr "ქსელის ფარი - არეების გამარ�
 msgid "Firewall configuration migration"
 msgstr "ქსელის ფარის გამართვის გადატანა"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "გადაგზავნა"
@@ -469,7 +473,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "ზოგადი პარამეტრები"
@@ -478,7 +482,11 @@ msgstr "ზოგადი პარამეტრები"
 msgid "Grant access to firewall configuration"
 msgstr "ქსელის ფარის გამართვასთან წვდომის ნებართვა"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "ნაკადის აპარატურული განტვირთვა"
 
@@ -506,14 +514,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 და IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "IPv4 მხოლოდ"
 
@@ -521,14 +529,14 @@ msgstr "IPv4 მხოლოდ"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 შენიღბვა"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "IPv6 მხოლოდ"
 
@@ -559,7 +567,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "შემავალი"
 
@@ -575,7 +583,7 @@ msgstr "შიდა პორტი"
 msgid "Internal zone"
 msgstr "შიდა არე"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -595,7 +603,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -611,8 +619,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -628,11 +636,11 @@ msgstr "უკუკავშირის წყაროს IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -746,7 +754,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "სახელი"
 
@@ -754,6 +762,10 @@ msgstr "სახელი"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -782,7 +794,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "გამომავალი"
 
@@ -804,7 +816,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -857,22 +869,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "ესაჭიროება აპარატურული NAT-მხარდაჭერა."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "შენიღბვის აკრძალვა მოცემული საბოლოო ქვექსელებისკენ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "მისამართის ჯგუფის შეზღუდვა"
 
@@ -916,10 +928,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "პროგრამული სახით განიტვირთება დამისამართება/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "ნაკადის პროგრამული განტვირთვა"
 
@@ -1004,8 +1016,8 @@ msgstr ""
 "ქსელის ფარი ქმნის არეებს ქსელის მაკავშირებლებს შორის მიმოცვლილი მონაცემების "
 "სამართავად."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1015,7 +1027,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1131,7 +1143,7 @@ msgstr "უსახელო წესი"
 msgid "Unnamed set"
 msgstr "უსახელო ნაკრები"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "უსახელო არე"
 
@@ -1160,13 +1172,13 @@ msgstr "შიდა IP-მისამართის გამოყენე�
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1204,11 +1216,11 @@ msgstr "თქვენს მოწყობილობაზე არაა
 msgid "Your device runs firewall4."
 msgstr "თქვენს მოწყობილობაზე გაშვებულია firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "არე ⇒ გადამისამართება"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "არეები"
 
@@ -1220,7 +1232,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "მიღება"
 
@@ -1309,7 +1321,7 @@ msgstr "მიდევნების გარეშე"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "აცილება"
 
@@ -1378,7 +1390,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "უარყოფა"
 
@@ -1421,9 +1433,9 @@ msgstr "src_port: საწყისი პორტი"
 msgid "this device"
 msgstr "ეს მოწყობილობა"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "ახალი არე"
 
@@ -1443,3 +1455,6 @@ msgstr "65536 ჩანაწერამდე."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr ""
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "პროგრამული სახით განიტვირთება დამისამართება/NAT"
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index 4bce3efde3..a9887a0ddb 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr "액션"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "고급 설정"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>Source zone</em> 로부터의 forward 허용:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em>Destination zone</em> 으로 forward 허용:"
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -280,7 +280,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -304,18 +304,18 @@ msgstr "NAT 루프백 활성화"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood protection 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "해당 Zone 의 로그 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -337,7 +337,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -355,15 +355,15 @@ msgstr "외부 포트"
 msgid "Extra arguments"
 msgstr "추가 변수"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -403,6 +403,10 @@ msgstr "방화벽 - Zone 설정"
 msgid "Firewall configuration migration"
 msgstr "방화벽 구성 마이그레이션"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "포워드"
@@ -458,7 +462,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "기본 설정"
@@ -467,7 +471,11 @@ msgstr "기본 설정"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -495,14 +503,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4와 IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "IPv4 전용"
 
@@ -510,14 +518,14 @@ msgstr "IPv4 전용"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "IPv6 전용"
 
@@ -548,7 +556,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "입력"
 
@@ -564,7 +572,7 @@ msgstr "내부 포트"
 msgid "Internal zone"
 msgstr "내부 Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -584,7 +592,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "로그 메시지 제한"
 
@@ -600,8 +608,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -617,11 +625,11 @@ msgstr "루프백 소스 IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -733,7 +741,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "이름"
 
@@ -741,6 +749,10 @@ msgstr "이름"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -769,7 +781,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -791,7 +803,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "iptables 명령에 추가 변수들을 전달합니다. 주의하여 사용하세요!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -844,22 +856,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "주어진 destination subnet 으로 Masquerading 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "주어진 source subnet 으로 Masquerading 제한"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Address family 제한"
 
@@ -903,10 +915,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -990,8 +1002,8 @@ msgstr ""
 "방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
 "를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1007,7 +1019,7 @@ msgstr ""
 "<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
 "WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1128,7 +1140,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1157,13 +1169,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1199,11 +1211,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zone 내역"
 
@@ -1215,7 +1227,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1304,7 +1316,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1373,7 +1385,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1416,9 +1428,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/lt/firewall.po b/applications/luci-app-firewall/po/lt/firewall.po
index 747790c5e0..2306f485a5 100644
--- a/applications/luci-app-firewall/po/lt/firewall.po
+++ b/applications/luci-app-firewall/po/lt/firewall.po
@@ -154,7 +154,7 @@ msgstr "PRIIMTI – išjungti adreso perrašymą"
 msgid "Action"
 msgstr "Veiksmas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -164,7 +164,7 @@ msgstr ""
 "zonos paskirties srautą, pvz. „<code>-p tcp --dport 443</code>“, kad "
 "atitiktų tik išsiunčiamą „HTTPS“ srautą."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -188,19 +188,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Pažangūs nustatymai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Leisti „techniškai neveikiančiai“ veiklai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Leisti perleidimą iš <em>išteklio zonų</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Leisti perleidimą į <em>paskirties zonas</em>:"
 
@@ -234,11 +234,11 @@ msgstr "Taikyti nurodyta „DSCP“ klasę arba reikšmę užmegztiems ryšiams.
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "Priskirti nurodytą ryšio sekimo pagelbiklį atitinkančiam srautui."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automatinis pagelbiklio paskyrimas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -250,11 +250,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Komentuoti"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "„Conntrack“ nustatymai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "„Conntrack“ pagelbikliai"
 
@@ -270,15 +270,15 @@ msgstr "Tęsti"
 msgid "Counters"
 msgstr "Rodikliai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Įtraukti/Apgaubti įrenginiai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Įtraukti/Apgaubti tinklai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Įtraukti/Apgaubti potinkliai"
 
@@ -327,7 +327,7 @@ msgstr "Paskirties/Kelionės tikslo zona"
 msgid "Device name"
 msgstr "Įrenginio vardas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -354,11 +354,11 @@ msgstr "Įjungti/Įgalinti „NAT Loopback“"
 msgid "Enable SYN-flood protection"
 msgstr "Įjungti/Įgalinti „SYN-flood“ apsauga"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Įjungti/Įgalinti žurnalinima šitoje zonoje"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -368,7 +368,7 @@ msgstr ""
 "išsiunčiamam srautui šitoje zonoje. Tai tipiškai įjungiama/įgalinima "
 "<em>„wan“</em> zonoje."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -392,7 +392,7 @@ msgstr "Tikimasi: „%s“"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Eksperimentinė funkcija. Nepilnai suderinamas su „QoS“/„SQM“."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "Aiškiai pasirenka leistinus ryšio sekimo pagelbiklius zonos srautui"
 
@@ -410,15 +410,15 @@ msgstr "Išorinis prievadas"
 msgid "Extra arguments"
 msgstr "Papildomi argumentai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Papildomi paskirties/kelionės tikslo argumentai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Papildomi „iptables“ argumentai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Papildomi išteklio argumentai"
 
@@ -458,6 +458,10 @@ msgstr "Užkarda - Zonų nustatymai"
 msgid "Firewall configuration migration"
 msgstr "Užkardos konfigūracijos migracija"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Persiųsti"
@@ -540,7 +544,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Bendri nustatymai"
@@ -550,7 +554,11 @@ msgid "Grant access to firewall configuration"
 msgstr ""
 "Duoti prieigą prie užkardos konfigūravimo „pkg – firewall configuration“"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Aparatinės įrangos srauto iškrovimas"
 
@@ -578,14 +586,14 @@ msgstr "IPv4 – Interneto protokolo versija 4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 ir IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Tik IPv4"
 
@@ -593,14 +601,14 @@ msgstr "Tik IPv4"
 msgid "IPv6"
 msgstr "IPv6 – Interneto protokolo versija 6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 privataus IP į viešojo IP konvertavimas"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Tik IPv6"
 
@@ -642,7 +650,7 @@ msgid "Initial Hash Size"
 msgstr "Pradinis maišos dydis"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Įvestis"
 
@@ -658,7 +666,7 @@ msgstr "Vidinis prievadas"
 msgid "Internal zone"
 msgstr "Vidinė zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Tarpzoninis persiuntimas"
 
@@ -678,7 +686,7 @@ msgstr "Neteisingas rinkinio pavadinimas"
 msgid "Limit burst"
 msgstr "Apriboti pliūpsnius"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Riboti žurnalo pranešimus"
 
@@ -696,8 +704,8 @@ msgstr ""
 "Apriboti atitikimą į „<var>%{limit.num}</var>“ paketus/-ai per „<var>%{limit."
 "unit}</var>%{limit.burst? burst <var>%{limit.burst}</var>}“"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Įjungtas ribotas privataus IP į viešojo IP konvertavimas"
 
@@ -715,11 +723,11 @@ msgstr ""
 "„MASQUERADE“ – Automatiškai perrašyti į išsiunčiamos sąsajos IP (privatus IP "
 "į viešąjį IP)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "„MSS“ prispaudimas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Privataus IP į viešojo IP konvertavimas"
 
@@ -842,7 +850,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Vardas/Pavadinimas"
 
@@ -850,6 +858,10 @@ msgstr "Vardas/Pavadinimas"
 msgid "Netmask"
 msgstr "Tinklavimo „net-kaukė“ – 32-bitų adresas, IP užmaskãvimas"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Atitikti tik įeinantį srautą, nukreiptą nurodytu IP adresu."
@@ -880,7 +892,7 @@ msgid "Outbound zone"
 msgstr "Išsiunčiamoji zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Išvestis"
 
@@ -907,7 +919,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Perduoda papildomus argumentus į „iptables“. Naudokite atsargiai!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -924,8 +936,8 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:187
 msgid "Path to file of CIDRs, subnets, host IPs, etc.<br />"
 msgstr ""
-"Kelias į „CIDR“ (dgs.) failą , potinklius, skleidėjų/vedėjų IP (dgs.) ir "
-"kt.<br />"
+"Kelias į „CIDR“ (dgs.) failą , potinklius, skleidėjų/vedėjų IP (dgs.) ir kt."
+"<br />"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:155
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:26
@@ -971,17 +983,17 @@ msgstr "Žr. Išorinis rinkinys"
 msgid "Reflection zones"
 msgstr "Atspindžio zonos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Reikalingas techninės įrangos „NAT“ palaikymas."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 "Apriboti privataus IP į viešojo IP konvertavimą nurodytais paskirties "
 "potinkliais"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 "Apriboti privataus IP į viešojo IP konvertavimą nurodytais šaltinio "
@@ -990,7 +1002,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Apriboti į adreso „šeimą“"
 
@@ -1040,11 +1052,10 @@ msgstr ""
 "nustatyti bitai."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
-"Taikomosios įrangos pagrįsta kelvada ir (arba) „NAT“ iškrovos perkėlimas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Taikomosios įrangos srauto iškrovos perkėlimas"
 
@@ -1130,8 +1141,8 @@ msgid ""
 "traffic flow."
 msgstr "Užkarda sukuria zonas tinklo sąsajose, kad valdytų tinklo srautą."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1147,7 +1158,7 @@ msgstr ""
 "<em>vienakryptė</em>, pvz. persiuntimas iš „LAN“ į „WAN“ taip pat "
 "<em>nereiškia</em> leidimo persiųsti iš „WAN“ į „LAN“."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1219,10 +1230,10 @@ msgid ""
 "var>}}%{dest_port?, port %{dest_port#%{next?, }<var%{item.inv? data-"
 "tooltip=\"Match ports except %{item.val}.\"}>%{item.ival}</var>}}"
 msgstr ""
-"Į %{dest}%{dest_ip?, IP %{dest_ip#%{next?, }<var%{item.inv? data-tooltip="
-"\"Sutapatinti IP adresus įskyrus %{item.val}.\"}>%{item.ival}</var>}}%{"
-"dest_port?, prievadas %{dest_port#%{next?, }<var%{item.inv? data-tooltip="
-"\"Sutapatinti prievadus įskyrus %{item.val}.\"}>%{item.ival}</var>}}"
+"Į %{dest}%{dest_ip?, IP %{dest_ip#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Sutapatinti IP adresus įskyrus %{item.val}.\"}>%{item.ival}</"
+"var>}}%{dest_port?, prievadas %{dest_port#%{next?, }<var%{item.inv? data-"
+"tooltip=\"Sutapatinti prievadus įskyrus %{item.val}.\"}>%{item.ival}</var>}}"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
 msgid "Tracking helper"
@@ -1284,7 +1295,7 @@ msgstr "Nepavadinta taisyklė"
 msgid "Unnamed set"
 msgstr "Nepavadintas rinkinys"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Nepavadinta zona"
 
@@ -1316,7 +1327,7 @@ msgstr "Naudoti vidinį IP adresą"
 msgid "Use ipset"
 msgstr "Naudoti „ipset“"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1324,7 +1335,7 @@ msgstr ""
 "Naudoti šią parinktį, jei norite klasifikuoti zonos srautą pagal "
 "neapdorotus, ne<em>„uci“</em> valdomus tinklo įrenginius."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1362,11 +1373,11 @@ msgstr "Jūsų įrenginyje neveikia „firewall4“."
 msgid "Your device runs firewall4."
 msgstr "Jūsų įrenginyje veikia „firewall4“."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Perleidimai"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zonos"
 
@@ -1380,7 +1391,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "priimti"
 
@@ -1469,7 +1480,7 @@ msgstr "nesekti"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "mesti/šalinti"
 
@@ -1543,7 +1554,7 @@ msgstr "„port“: Prievadas"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "atmesti"
 
@@ -1586,9 +1597,9 @@ msgstr "„src_port“: Šaltinio prievadas"
 msgid "this device"
 msgstr "šis įrenginys"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "ši nauja zona"
 
@@ -1608,3 +1619,7 @@ msgstr "iki 65536 įrašų."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr "tinkamą užkardos žymę"
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr ""
+#~ "Taikomosios įrangos pagrįsta kelvada ir (arba) „NAT“ iškrovos perkėlimas"
diff --git a/applications/luci-app-firewall/po/mr/firewall.po b/applications/luci-app-firewall/po/mr/firewall.po
index b090af1a17..614eb1ee67 100644
--- a/applications/luci-app-firewall/po/mr/firewall.po
+++ b/applications/luci-app-firewall/po/mr/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "प्रगत सेटिंग्ज"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -301,18 +301,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -352,15 +352,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -400,6 +400,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -455,7 +459,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "सामान्य सेटिंग्ज"
@@ -464,7 +468,11 @@ msgstr "सामान्य सेटिंग्ज"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -492,14 +500,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 आणि IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "केवळ IPv4"
 
@@ -507,14 +515,14 @@ msgstr "केवळ IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "केवळ IPv6"
 
@@ -545,7 +553,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -561,7 +569,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -581,7 +589,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -597,8 +605,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -614,11 +622,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -730,7 +738,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "नाव"
 
@@ -738,6 +746,10 @@ msgstr "नाव"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -766,7 +778,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -788,7 +800,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -839,22 +851,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -898,10 +910,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -983,8 +995,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -994,7 +1006,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1107,7 +1119,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1136,13 +1148,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1178,11 +1190,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1194,7 +1206,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1283,7 +1295,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1352,7 +1364,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1395,9 +1407,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index bad914279b..f4ceb2cd16 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -120,14 +120,14 @@ msgstr ""
 msgid "Action"
 msgstr "Tindakan"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -146,19 +146,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Tetapan Lanjutan"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -188,11 +188,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -202,11 +202,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Ulasan"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -222,15 +222,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -299,18 +299,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -350,15 +350,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -398,6 +398,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -453,7 +457,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -462,7 +466,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -490,14 +498,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -505,14 +513,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -543,7 +551,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -559,7 +567,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -579,7 +587,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -595,8 +603,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -612,11 +620,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -728,7 +736,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -736,6 +744,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -764,7 +776,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -786,7 +798,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -837,22 +849,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -896,10 +908,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -981,8 +993,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -992,7 +1004,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1105,7 +1117,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1134,13 +1146,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1176,11 +1188,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1192,7 +1204,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1281,7 +1293,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1350,7 +1362,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1393,9 +1405,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/nb_NO/firewall.po b/applications/luci-app-firewall/po/nb_NO/firewall.po
index 4fa391b473..af8398212d 100644
--- a/applications/luci-app-firewall/po/nb_NO/firewall.po
+++ b/applications/luci-app-firewall/po/nb_NO/firewall.po
@@ -118,14 +118,14 @@ msgstr ""
 msgid "Action"
 msgstr "Handling"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -144,19 +144,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Avanserte innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillat videresending fra <em>kilde soner</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Tillat videresending til <em>destinasjon soner</em>:"
 
@@ -186,11 +186,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -200,11 +200,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -220,15 +220,15 @@ msgstr "Fortsett"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Gjeldene nettverk"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgstr "Målsone"
 msgid "Device name"
 msgstr "Enhetsnavn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -300,18 +300,18 @@ msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
 msgid "Enable SYN-flood protection"
 msgstr "Aktiver SYN-flood beskyttelse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Aktiver logging av denne sonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -333,7 +333,7 @@ msgstr "Forventer: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -351,15 +351,15 @@ msgstr "Ekstern port"
 msgid "Extra arguments"
 msgstr "Ekstra argumenter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -399,6 +399,10 @@ msgstr "Brannmur - Sone Innstillinger"
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Frem"
@@ -454,7 +458,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Generelle innstillinger"
@@ -463,7 +467,11 @@ msgstr "Generelle innstillinger"
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -491,14 +499,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 og IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Kun IPv4"
 
@@ -506,14 +514,14 @@ msgstr "Kun IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Kun IPv6"
 
@@ -544,7 +552,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Inndata"
 
@@ -560,7 +568,7 @@ msgstr "Intern port"
 msgid "Internal zone"
 msgstr "Intern sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -580,7 +588,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Begrens logging"
 
@@ -596,8 +604,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -613,11 +621,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS Kontroll (Clamping)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Masquerading"
 
@@ -731,7 +739,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Navn"
 
@@ -739,6 +747,10 @@ msgstr "Navn"
 msgid "Netmask"
 msgstr "Nettmaske"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
@@ -769,7 +781,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Utdata"
 
@@ -791,7 +803,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -846,22 +858,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Begrens til adresse familie"
 
@@ -905,10 +917,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -992,8 +1004,8 @@ msgstr ""
 "Brannmuren skaper soner over nettverkets grensesnitt for å styre "
 "nettverkstrafikken."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1009,7 +1021,7 @@ msgstr ""
 "ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
 "<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -1132,7 +1144,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1161,13 +1173,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1203,11 +1215,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Sone = Videresendinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Soner"
 
@@ -1219,7 +1231,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "godta"
 
@@ -1308,7 +1320,7 @@ msgstr "ikke track"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "forkast"
 
@@ -1377,7 +1389,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "avslå"
 
@@ -1420,9 +1432,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/nl/firewall.po b/applications/luci-app-firewall/po/nl/firewall.po
index 382cf9d6f0..15d3d9ddc2 100644
--- a/applications/luci-app-firewall/po/nl/firewall.po
+++ b/applications/luci-app-firewall/po/nl/firewall.po
@@ -154,7 +154,7 @@ msgstr "ACCEPTEREN - Herschrijven van adres uitschakelen"
 msgid "Action"
 msgstr "Actie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -164,7 +164,7 @@ msgstr ""
 "classificeren, bv. <code>-p tcp --dport 443</code> om alleen overeen te "
 "komen met uitgaand HTTPS-verkeer."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -188,19 +188,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Geavanceerde instellingen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Laat \"ongeldig\" verkeer toe"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Doorsturen vanuit <em>bronzones</em> toestaan:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Doorsturen naar <em>bestemmingszones</em> toestaan:"
 
@@ -237,11 +237,11 @@ msgstr ""
 "Wijst de gespecificeerde helper voor het volgen van verbindingen toe aan "
 "gematcht verkeer."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automatische helper opdracht"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Opmerking"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack Instellingen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack helpers"
 
@@ -273,15 +273,15 @@ msgstr "Doorgaan"
 msgid "Counters"
 msgstr "Tellers"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Gedekte apparaten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Gedekte netwerken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Gedekte subnetten"
 
@@ -330,7 +330,7 @@ msgstr "Bestemmingszone"
 msgid "Device name"
 msgstr "Naam apparaat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -357,11 +357,11 @@ msgstr "NAT Loopback inschakelen"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood bescherming inschakelen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Logging op deze zone inschakelen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -371,7 +371,7 @@ msgstr ""
 "uitgaand verkeer in deze zone. Dit is meestal ingeschakeld in de zone "
 "<em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -395,7 +395,7 @@ msgstr "Verwacht: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Experimentele functie. Niet volledig compatibel met QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "Kiest expliciet toegestane connectie tracking helpers voor zoneverkeer"
 
@@ -413,15 +413,15 @@ msgstr "Externe poort"
 msgid "Extra arguments"
 msgstr "Extra argumenten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Extra bestemmingsargumenten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Extra iptables argumenten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Extra bron argumenten"
 
@@ -461,6 +461,10 @@ msgstr "Firewall - Zone-instellingen"
 msgid "Firewall configuration migration"
 msgstr "Migratie van firewallconfiguratie"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Forward"
@@ -543,7 +547,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Algemene instellingen"
@@ -552,7 +556,11 @@ msgstr "Algemene instellingen"
 msgid "Grant access to firewall configuration"
 msgstr "Toegang verlenen tot firewallconfiguratie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Hardware stroom ontlasten"
 
@@ -580,14 +588,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 en IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Alleen IPv4"
 
@@ -595,14 +603,14 @@ msgstr "Alleen IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6-maskering"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Alleen IPv6"
 
@@ -644,7 +652,7 @@ msgid "Initial Hash Size"
 msgstr "Initiële hashgrootte"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Invoer"
 
@@ -660,7 +668,7 @@ msgstr "Interne poort"
 msgid "Internal zone"
 msgstr "Interne zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -680,7 +688,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "Beperk burst"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Logboekberichten beperken"
 
@@ -698,8 +706,8 @@ msgstr ""
 "Beperk matching tot <var>%{limit.num}</var> pakketten per <var>%{limit.unit}"
 "</var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Beperkte maskering ingeschakeld"
 
@@ -715,11 +723,11 @@ msgstr "Loopback-bron-IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Automatisch herschrijven naar uitgaande interface IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS klemmen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Gemaskerd"
 
@@ -848,7 +856,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Naam"
 
@@ -856,6 +864,10 @@ msgstr "Naam"
 msgid "Netmask"
 msgstr "Netmasker"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -888,7 +900,7 @@ msgid "Outbound zone"
 msgstr "Uitgaande zone"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Uitgang"
 
@@ -915,7 +927,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Geeft aanvullende argumenten door aan iptables. Zorgvuldig gebruiken!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -977,22 +989,22 @@ msgstr "Raadpleeg Externe set"
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Vereist hardware NAT-ondersteuning."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Beperk Masquerading tot bepaalde bestemmingssubnetten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Beperk Masquerading tot bepaalde bronsubnetten"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Beperken tot adres familie"
 
@@ -1040,10 +1052,10 @@ msgstr ""
 "masker zijn ingesteld, gewijzigd."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Op software gebaseerde offloading voor routing/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Software flow offloading"
 
@@ -1133,8 +1145,8 @@ msgstr ""
 "De firewall creëert zones over uw netwerkinterfaces om de "
 "netwerkverkeersstroom te regelen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1151,7 +1163,7 @@ msgstr ""
 "wan impliceert <em>niet</em> een toestemming om ook van wan naar lan door te "
 "sturen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1291,7 +1303,7 @@ msgstr "Naamloze regel"
 msgid "Unnamed set"
 msgstr "Naamloze set"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Naamloze zone"
 
@@ -1323,7 +1335,7 @@ msgstr "Intern IP-adres gebruiken"
 msgid "Use ipset"
 msgstr "Gebruik ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1331,7 +1343,7 @@ msgstr ""
 "Gebruik deze optie om zoneverkeer te classificeren op basis van onbewerkte, "
 "niet door <em>uci</em> beheerde netwerkapparaten."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1369,11 +1381,11 @@ msgstr "Uw apparaat heeft geen firewall4."
 msgid "Your device runs firewall4."
 msgstr "Uw apparaat gebruikt een firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Forwardings"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zones"
 
@@ -1385,7 +1397,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "accepteer"
 
@@ -1474,7 +1486,7 @@ msgstr "niet volgen"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "laat vallen"
 
@@ -1547,7 +1559,7 @@ msgstr "poort: Poort"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "afwijzen"
 
@@ -1590,9 +1602,9 @@ msgstr "src_port: Bronpoort"
 msgid "this device"
 msgstr "dit apparaat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "deze nieuwe zone"
 
@@ -1612,3 +1624,6 @@ msgstr "tot 65536 vermeldingen."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr "geldige firewallmarkering"
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Op software gebaseerde offloading voor routing/NAT"
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index d9d34c3485..713d71f17c 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -155,7 +155,7 @@ msgstr "ACCEPT - Wyłącz przepisywanie adresów"
 msgid "Action"
 msgstr "Akcja"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -165,7 +165,7 @@ msgstr ""
 "docelowej, np. <code>-p tcp --dport 443</code> tylko w celu dopasowania "
 "ruchu wychodzącego HTTPS."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -189,19 +189,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Zezwól na „nieprawidłowy” ruch"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Zezwól na przekazywanie ze <em>strefy źródłowej</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Zezwól na przekazywanie do <em>strefy docelowej</em>:"
 
@@ -235,11 +235,11 @@ msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 "Przydziel określonego pomocnika śledzenia połączeń do dopasowanego ruchu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Automatyczne przydzielanie pomocnika"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -251,11 +251,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Komentarz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Ustawienia conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Pomocnicy conntrack"
 
@@ -271,15 +271,15 @@ msgstr "Kontynuuj"
 msgid "Counters"
 msgstr "Liczniki"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Objęte urządzenia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Objęte sieci"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Objęte podsieci"
 
@@ -327,7 +327,7 @@ msgstr "Strefa docelowa"
 msgid "Device name"
 msgstr "Nazwa urządzenia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -354,11 +354,11 @@ msgstr "Włącz pętlę zwrotną NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Włącz ochronę przed SYN‑flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Włącz logowanie tej strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -368,7 +368,7 @@ msgstr ""
 "wychodzącego w tej strefie. Jest ona zazwyczaj włączona w strefie <em>wan</"
 "em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -392,7 +392,7 @@ msgstr "Zaleca się użyć: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Funkcja eksperymentalna. Nie w pełni kompatybilna z QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Dokładnie wybiera dozwolonych pomocników śledzenia połączeń dla ruchu "
@@ -412,15 +412,15 @@ msgstr "Port zewnętrzny"
 msgid "Extra arguments"
 msgstr "Dodatkowe argumenty"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Dodatkowe argumenty przeznaczenia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Dodatkowe argumenty tablicy IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Dodatkowe argumenty zródłowe"
 
@@ -460,6 +460,10 @@ msgstr "Zapora sieciowa - Ustawienia stref"
 msgid "Firewall configuration migration"
 msgstr "Migracja konfiguracji zapory sieciowej"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Ruch przekazujący"
@@ -542,7 +546,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Ustawienia główne"
@@ -551,7 +555,11 @@ msgstr "Ustawienia główne"
 msgid "Grant access to firewall configuration"
 msgstr "Udziel dostępu do konfiguracji zapory sieciowej"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Sprzętowy flow offloading"
 
@@ -579,14 +587,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 i IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Tylko IPv4"
 
@@ -594,14 +602,14 @@ msgstr "Tylko IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Maskarada IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Tylko IPv6"
 
@@ -643,7 +651,7 @@ msgid "Initial Hash Size"
 msgstr "Początkowy rozmiar hasha"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Ruch przychodzący"
 
@@ -659,7 +667,7 @@ msgstr "Port wewnętrzny"
 msgid "Internal zone"
 msgstr "Strefa wewnętrzna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Przekazywanie wewnątrzstrefowe"
 
@@ -679,7 +687,7 @@ msgstr "Nieprawidłowa nazwa zestawu"
 msgid "Limit burst"
 msgstr "Naruszenie limitu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Ograniczenie logowania"
 
@@ -697,8 +705,8 @@ msgstr ""
 "Dopasowanie limitu do <var>%{limit.num}</var> pakiety na <var>%{limit.unit}</"
 "var>%{limit.burst? seria <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Ograniczona maskarada włączona"
 
@@ -714,11 +722,11 @@ msgstr "Źródło pętli zwrotnej IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Automatyczne przepisywanie na interfejs wyjściowy IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Dostosuj MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Maskarada"
 
@@ -842,7 +850,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nazwa"
 
@@ -850,6 +858,10 @@ msgstr "Nazwa"
 msgid "Netmask"
 msgstr "Maska sieci"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
@@ -880,7 +892,7 @@ msgid "Outbound zone"
 msgstr "Strefa wychodząca"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Ruch wychodzący"
 
@@ -908,7 +920,7 @@ msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -969,22 +981,22 @@ msgstr "Patrz zestaw zewnętrzny"
 msgid "Reflection zones"
 msgstr "Strefy odbicia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Wymaga obsługi sprzętowej NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Ogranicz maskaradę do wskazanych podsieci docelowych"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Ogranicz maskaradę do wskazanych podsieci źródłowych"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Ogranicz do rodziny adresów"
 
@@ -1032,10 +1044,10 @@ msgstr ""
 "w masce."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Offloading oparty na oprogramowaniu dla trasowania/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Programowy flow offloading"
 
@@ -1125,8 +1137,8 @@ msgstr ""
 "Zapora tworzy strefy na interfejsach sieciowych, aby kontrolować przepływ "
 "ruchu w sieci."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1142,7 +1154,7 @@ msgstr ""
 "przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
 "do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1150,9 +1162,9 @@ msgid ""
 "forwarded traffic between different networks within the zone. <em>Covered "
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
-"Ta sekcja określa ustawienia ogólne %q. Opcje <em>Ruch przychodzący</em> i "
-"<em>Ruch wychodzący</em> ustalają domyślne zasady dla ruchu przychodzącego i "
-"wychodzącego w tej strefie, podczas gdy <em>Ruch przekazujący</em> opisuje "
+"Ta sekcja określa ustawienia ogólne %q. Opcje <em>Ruch przychodzący</em> "
+"i <em>Ruch wychodzący</em> ustalają domyślne zasady dla ruchu przychodzącego "
+"i wychodzącego w tej strefie, podczas gdy <em>Ruch przekazujący</em> opisuje "
 "zasady przekazywania ruchu między różnymi sieciami w obrębie strefy. Opcja "
 "<em>Objęte sieci</em> określa, które dostępne sieci należą do tej strefy."
 
@@ -1278,7 +1290,7 @@ msgstr "Nieznana zasada"
 msgid "Unnamed set"
 msgstr "Zestaw nienazwany"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Strefa bez nazwy"
 
@@ -1310,7 +1322,7 @@ msgstr "Użyj wewnętrznego adresu IP"
 msgid "Use ipset"
 msgstr "Użyj ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1318,7 +1330,7 @@ msgstr ""
 "Opcji tej należy używać do klasyfikacji ruchu strefowego według surowych, "
 "niezarządzanych przez <em>uci</em> urządzeń sieciowych."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1356,11 +1368,11 @@ msgstr "Na tym urządzeniu nie działa firewall4."
 msgid "Your device runs firewall4."
 msgstr "Na tym urządzeniu działa firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Strefa ⇒ Przekazywanie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Strefy"
 
@@ -1374,7 +1386,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "akceptuj"
 
@@ -1463,7 +1475,7 @@ msgstr "nie śledź"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "porzucaj"
 
@@ -1537,7 +1549,7 @@ msgstr "port: Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "odrzucaj"
 
@@ -1580,9 +1592,9 @@ msgstr "src_port: Źródłowy port"
 msgid "this device"
 msgstr "to urządzenie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "ta nowa strefa"
 
@@ -1603,6 +1615,9 @@ msgstr "do 65536 wpisów."
 msgid "valid firewall mark"
 msgstr "prawidłowy znacznik zapory sieciowej"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Offloading oparty na oprogramowaniu dla trasowania/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 411a69215d..30a3ebf818 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -156,7 +156,7 @@ msgstr "ACCEPT - Desativar reescrever endereços"
 msgid "Action"
 msgstr "Ação"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -166,7 +166,7 @@ msgstr ""
 "destino da zona, por exemplo, <code>-p tcp -- dport 443</code> para "
 "corresponder apenas ao tráfego https de saída."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -190,19 +190,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Configurações avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Permitir tráfego \"inválido\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permitir encaminhamento de <em>zonas de origem</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permitir encaminhamento para <em>zonas de destino</em>:"
 
@@ -237,11 +237,11 @@ msgstr ""
 "Atribua o ajudante de rastreamento de conexão especificado para o tráfego "
 "combinado."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Atribuição automática de assistentes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentário"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Configurações do Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Assistentes do Conntrack"
 
@@ -273,15 +273,15 @@ msgstr "Continuar"
 msgid "Counters"
 msgstr "Contadores"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Aparelhos abrangidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Redes abrangidas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Subredes abrangidas"
 
@@ -330,7 +330,7 @@ msgstr "Zona de destino"
 msgid "Device name"
 msgstr "Nome do aparelho"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -357,11 +357,11 @@ msgstr "Ativar NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Ativar a Proteção SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Ativar registo nesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -371,7 +371,7 @@ msgstr ""
 "tráfego de saída nesta zona. Normalmente, isso é ativado na zona <em>wan</"
 "em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -396,7 +396,7 @@ msgstr "Esperando: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Característica experimental. Não totalmente compatível com QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Escolhe explicitamente os assistentes de rastreamento de conexão permitidos "
@@ -416,15 +416,15 @@ msgstr "Porta externa"
 msgid "Extra arguments"
 msgstr "Argumentos adicionais"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Argumentos adicionais de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Argumentos adicionais do iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Argumentos adicionais da fonte"
 
@@ -464,6 +464,10 @@ msgstr "Firewall - Definições de Zona"
 msgid "Firewall configuration migration"
 msgstr "Migração de configuração do Firewall"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Encaminhar"
@@ -546,7 +550,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Configurações gerais"
@@ -555,7 +559,11 @@ msgstr "Configurações gerais"
 msgid "Grant access to firewall configuration"
 msgstr "Conceder acesso à configuração do firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Descarga de fluxo em hardware"
 
@@ -583,14 +591,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Apenas IPv4"
 
@@ -598,14 +606,14 @@ msgstr "Apenas IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Mascaramento IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Apenas IPv6"
 
@@ -647,7 +655,7 @@ msgid "Initial Hash Size"
 msgstr "Tamanho inicial do hash"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Entrada"
 
@@ -663,7 +671,7 @@ msgstr "Porta interna"
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Reencaminhamento na zona interna"
 
@@ -683,7 +691,7 @@ msgstr "Nome de conjunto inválido"
 msgid "Limit burst"
 msgstr "Limite de burst"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limitar registo de mensagens"
 
@@ -701,8 +709,8 @@ msgstr ""
 "Limitar a correspondência de <var>%{limit.num}</var> pacotes por "
 "<var>%{limit.unit}</var>%{limit.burst? estouro <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Mascaramento limitado ativado"
 
@@ -718,11 +726,11 @@ msgstr "IP fonte de loopback"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Reescreve automaticamente para o IP da interface de saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Fixação de MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Mascaramento"
 
@@ -856,7 +864,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nome"
 
@@ -864,6 +872,10 @@ msgstr "Nome"
 msgid "Netmask"
 msgstr "Máscara de rede"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
@@ -894,7 +906,7 @@ msgid "Outbound zone"
 msgstr "Zona de saída"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Saída"
 
@@ -921,7 +933,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -981,22 +993,22 @@ msgstr "Consulte o conjunto externo"
 msgid "Reflection zones"
 msgstr "Zonas de reflexão"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Requer suporte de hardware para NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringir o Mascaramento às sub-redes de destino dadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringir Mascaramento a sub-redes de origem fornecidas"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Restringir a família de endereços"
 
@@ -1046,10 +1058,10 @@ msgstr ""
 "máscara são modificados."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Descarga baseada em software para roteamento/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Descarga de fluxo de software"
 
@@ -1139,8 +1151,8 @@ msgstr ""
 "A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1157,7 +1169,7 @@ msgstr ""
 "lan para wan <em>não</em> implica uma permissão para avançar de wan para lan "
 "também."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1295,7 +1307,7 @@ msgstr "Regra sem nome"
 msgid "Unnamed set"
 msgstr "Conjunto sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zona sem nome"
 
@@ -1327,7 +1339,7 @@ msgstr "Usar endereço IP interno"
 msgid "Use ipset"
 msgstr "Use o ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1335,7 +1347,7 @@ msgstr ""
 "Use esta opção para classificar o tráfego da zona por aparelhos de rede "
 "brutos, não geridos por <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1373,11 +1385,11 @@ msgstr "O seu aparelho não executa o firewall4."
 msgid "Your device runs firewall4."
 msgstr "O seu aparelho executa o firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zonas"
 
@@ -1391,7 +1403,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "aceitar"
 
@@ -1480,7 +1492,7 @@ msgstr "não rastrear"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "descartar"
 
@@ -1554,7 +1566,7 @@ msgstr "porta: Porta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "rejeitar"
 
@@ -1597,9 +1609,9 @@ msgstr "src_port: Porta de origem"
 msgid "this device"
 msgstr "este aparelho"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "esta nova zona"
 
@@ -1620,6 +1632,9 @@ msgstr "até 65536 entradas."
 msgid "valid firewall mark"
 msgstr "marca de firewall válida"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Descarga baseada em software para roteamento/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/pt_BR/firewall.po b/applications/luci-app-firewall/po/pt_BR/firewall.po
index dc6631b924..ebff968017 100644
--- a/applications/luci-app-firewall/po/pt_BR/firewall.po
+++ b/applications/luci-app-firewall/po/pt_BR/firewall.po
@@ -154,7 +154,7 @@ msgstr "ACEITAR - Desativar a reescrita do endereço"
 msgid "Action"
 msgstr "Ação"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -164,7 +164,7 @@ msgstr ""
 "da zona, por exemplo, <code>-p tcp --dport 443</code> para corresponder "
 "apenas ao tráfego HTTPS de saída."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -188,19 +188,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Configurações avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Permitir tráfego \"inválido\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
 
@@ -235,11 +235,11 @@ msgstr ""
 "Atribua o auxiliar de rastreamento de conexão especificado para o tráfego "
 "combinado."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Atribuição automática de assistentes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -251,11 +251,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentário"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Configurações do Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Ajudantes do Conntrack"
 
@@ -271,15 +271,15 @@ msgstr "Continuar"
 msgid "Counters"
 msgstr "Contadores"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Dispositivos cobertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Redes cobertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Sub-redes cobertas"
 
@@ -327,7 +327,7 @@ msgstr "Zona de destino"
 msgid "Device name"
 msgstr "Nome do dispositivo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -354,11 +354,11 @@ msgstr "Habilite o Loopback do NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Habilite proteção contra SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Habilite o registro nesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -368,7 +368,7 @@ msgstr ""
 "tráfego de saída nesta zona. Normalmente, isso é ativado na zona <em>wan</"
 "em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -394,7 +394,7 @@ msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 "Funcionalidade experimental. Ela não é totalmente compatível com QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Escolhe explicitamente os assistentes de rastreamento de conexão permitidos "
@@ -414,15 +414,15 @@ msgstr "Porta Externa"
 msgid "Extra arguments"
 msgstr "Argumentos extras"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Argumentos extra de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Argumentos extras para o iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Argumentos extras da fonte"
 
@@ -462,6 +462,10 @@ msgstr "Firewall - Configurações de Zona"
 msgid "Firewall configuration migration"
 msgstr "Migração de configuração do Firewall"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Encaminhar"
@@ -544,7 +548,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Configurações gerais"
@@ -553,7 +557,11 @@ msgstr "Configurações gerais"
 msgid "Grant access to firewall configuration"
 msgstr "Conceder acesso à configuração do firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Aceleração do fluxo dos dados via hardware"
 
@@ -581,14 +589,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Apenas IPv4"
 
@@ -596,14 +604,14 @@ msgstr "Apenas IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Mascaramento IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Apenas IPv6"
 
@@ -645,7 +653,7 @@ msgid "Initial Hash Size"
 msgstr "Tamanho inicial do hash"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Entrada"
 
@@ -661,7 +669,7 @@ msgstr "Porta Interna"
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Encaminhamento"
 
@@ -681,7 +689,7 @@ msgstr "Nome de conjunto inválido"
 msgid "Limit burst"
 msgstr "Estouro limite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limita as mensagens de registro"
 
@@ -699,8 +707,8 @@ msgstr ""
 "Limitar a correspondência de <var>%{limit.num}</var> pacotes por "
 "<var>%{limit.unit}</var>%{limit.burst? estouro <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Mascaramento limitado ativado"
 
@@ -716,11 +724,11 @@ msgstr "IP da fonte de Loopback"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Reescreve automaticamente para o IP da interface de saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Ajuste do MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Mascaramento"
 
@@ -852,7 +860,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nome"
 
@@ -860,6 +868,10 @@ msgstr "Nome"
 msgid "Netmask"
 msgstr "Máscara de rede"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -891,7 +903,7 @@ msgid "Outbound zone"
 msgstr "Zona de saída"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Saída"
 
@@ -918,7 +930,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -977,22 +989,22 @@ msgstr "Consulte o conjunto externo"
 msgid "Reflection zones"
 msgstr "Zonas de reflexão"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Requer suporte de NAT em hardware."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringe o mascaramento para uma subrede de destino específica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringe o mascaramento para uma subrede de origem específica"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Restringe à uma família de endereços"
 
@@ -1042,10 +1054,10 @@ msgstr ""
 "máscara são modificados."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Aceleração do roteamento/NAT via software"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Aceleração do fluxo dos dados via software"
 
@@ -1135,8 +1147,8 @@ msgstr ""
 "O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego de rede."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1152,7 +1164,7 @@ msgstr ""
 "encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
 "WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1290,7 +1302,7 @@ msgstr "Regra sem nome"
 msgid "Unnamed set"
 msgstr "Conjunto sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zona sem nome"
 
@@ -1322,7 +1334,7 @@ msgstr "Usar endereço IP interno"
 msgid "Use ipset"
 msgstr "Use o ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1330,7 +1342,7 @@ msgstr ""
 "Use esta opção para classificar o tráfego bruto da zona por dispositivos de "
 "rede não gerenciados pela<em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1368,11 +1380,11 @@ msgstr "O seu dispositivo não roda o firewall4."
 msgid "Your device runs firewall4."
 msgstr "O seu dispositivo roda o firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zonas"
 
@@ -1386,7 +1398,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "aceitar"
 
@@ -1475,7 +1487,7 @@ msgstr "não rastrear"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "descartar"
 
@@ -1549,7 +1561,7 @@ msgstr "porta: Porta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "rejeitar"
 
@@ -1592,9 +1604,9 @@ msgstr "src_port: Porta de origem"
 msgid "this device"
 msgstr "este dispositivo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "esta nova zona"
 
@@ -1615,6 +1627,9 @@ msgstr "até 65536 entradas."
 msgid "valid firewall mark"
 msgstr "marca de firewall válida"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Aceleração do roteamento/NAT via software"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index cd3bdd5d13..b02c51737d 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -153,7 +153,7 @@ msgstr "ACCEPT - Dezactivează rescrierea adreselor"
 msgid "Action"
 msgstr "Acțiune"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -163,7 +163,7 @@ msgstr ""
 "de destinație al zonei, de exemplu, <code>-p tcp --dport 443</code> pentru a "
 "se potrivi numai cu traficul HTTPS de ieșire."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -185,19 +185,19 @@ msgstr "Familia de adrese, adresa IP internă trebuie să corespundă"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Setări avansate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Permiteți traficul \"invalid\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite trecerea din <em>zonele sursa</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permite trecerea catre <em>zonele sursa</em>:"
 
@@ -232,11 +232,11 @@ msgstr ""
 "Alocarea ajutorului de urmărire a conexiunilor specificat pentru traficul "
 "corespunzător."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Atribuirea automată a ajutorului"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -248,11 +248,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Comentariu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Setări Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Ajutoarele Conntrack"
 
@@ -268,15 +268,15 @@ msgstr "Continuați"
 msgid "Counters"
 msgstr "Contoare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Dispozitive acoperite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Retele acoperite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Subrețele acoperite"
 
@@ -325,7 +325,7 @@ msgstr "Zonă de destinație"
 msgid "Device name"
 msgstr "Numele dispozitivului"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -352,11 +352,11 @@ msgstr "Activează loopback NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Activează protecţia SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Activeaza log in aceasta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -366,7 +366,7 @@ msgstr ""
 "traficul de ieșire din această zonă. Acest lucru este de obicei activat pe "
 "<em>wan</em> zone."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -390,7 +390,7 @@ msgstr "Se așteaptă: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Funcție experimentală. Nu este complet compatibiă cu QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Alege în mod explicit ajutoarele de urmărire a conexiunilor permise pentru "
@@ -410,15 +410,15 @@ msgstr "Port extern"
 msgid "Extra arguments"
 msgstr "Argumente suplimentare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Argumente suplimentare pentru destinație"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Argumente suplimentare pentru iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Argumente sursă suplimentare"
 
@@ -458,6 +458,10 @@ msgstr "Setari zona la firewall"
 msgid "Firewall configuration migration"
 msgstr "Migrarea configurației firewall-ului"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "redirecționare"
@@ -540,7 +544,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Setări generale"
@@ -549,7 +553,11 @@ msgstr "Setări generale"
 msgid "Grant access to firewall configuration"
 msgstr "Acordarea accesului la configurația firewall-ului"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Descărcarea fluxului hardware"
 
@@ -577,14 +585,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 și IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Doar IPv4"
 
@@ -592,14 +600,14 @@ msgstr "Doar IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Mascare IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Doar IPv6"
 
@@ -640,7 +648,7 @@ msgid "Initial Hash Size"
 msgstr "Dimensiunea inițială a hash-ului"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Intrare"
 
@@ -656,7 +664,7 @@ msgstr "Port intern"
 msgid "Internal zone"
 msgstr "Zonă internă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -676,7 +684,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "Limitați explozia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Limitează mesaje în log"
 
@@ -694,8 +702,8 @@ msgstr ""
 "Limitați potrivirea la <var>%{limit.num}</var> pachete pe <var>%{limit.unit}"
 "</var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Activarea limitată a mascării"
 
@@ -711,11 +719,11 @@ msgstr "IP sursă Loopback"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Rescrierea automată către IP-ul interfeței de ieșire"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Ajustare MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Translatare"
 
@@ -844,7 +852,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Nume"
 
@@ -852,6 +860,10 @@ msgstr "Nume"
 msgid "Netmask"
 msgstr "Mască de rețea"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -884,7 +896,7 @@ msgid "Outbound zone"
 msgstr "Zona de ieșire"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Ieşire"
 
@@ -911,7 +923,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Transmite argumente suplimentare către iptables. Folosiți cu grijă!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -975,22 +987,22 @@ msgstr "Consultați Setul extern"
 msgid "Reflection zones"
 msgstr "Zone de reflexie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Necesită suport hardware NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restrângerea masquerading-ului la anumite subrețele de destinație"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restrângerea masquerading-ului la anumite subrețele sursă"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Restricționarea la adresa familiei"
 
@@ -1039,10 +1051,10 @@ msgstr ""
 "numai acei biți setați în mască."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Descărcarea bazată pe software pentru rutare/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Descărcarea fluxului de software"
 
@@ -1132,8 +1144,8 @@ msgstr ""
 "Firewall-ul creează zone peste interfețele de rețea pentru a controla fluxul "
 "de trafic de rețea."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1150,7 +1162,7 @@ msgstr ""
 "o redirecționare de la lan la wan <em>nu implică<em>o permisiune</em> de "
 "redirecționare de la wan la lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1288,7 +1300,7 @@ msgstr "Regula fără nume"
 msgid "Unnamed set"
 msgstr "Set fără nume"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zona fără nume"
 
@@ -1320,7 +1332,7 @@ msgstr "Utilizați adresa IP internă"
 msgid "Use ipset"
 msgstr "Utilizați ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1328,7 +1340,7 @@ msgstr ""
 "Utilizați această opțiune pentru a clasifica traficul de zonă prin "
 "dispozitive de rețea brute, ne<em>uci</em> gestionate."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1366,11 +1378,11 @@ msgstr "Dispozitivul nu rulează firewall4."
 msgid "Your device runs firewall4."
 msgstr "Dispozitivul rulează firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zonă ⇒ Redirecționări"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zone"
 
@@ -1384,7 +1396,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "acceptă"
 
@@ -1473,7 +1485,7 @@ msgstr "nu urmăriți"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "picătură"
 
@@ -1547,7 +1559,7 @@ msgstr "port: Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "respingeți"
 
@@ -1590,9 +1602,9 @@ msgstr "src_port: Port sursă"
 msgid "this device"
 msgstr "acest dispozitiv"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "această nouă zonă"
 
@@ -1613,6 +1625,9 @@ msgstr "până la 65536 intrări."
 msgid "valid firewall mark"
 msgstr "marca de firewall validă"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Descărcarea bazată pe software pentru rutare/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index c1fe4caa9d..83a4381d3d 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -160,7 +160,7 @@ msgstr "ACCEPT — отключить перезапись адреса"
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -170,7 +170,7 @@ msgstr ""
 "назначения, например <code>-p tcp --dport 443</code> для соответствия только "
 "исходящему HTTPS-трафику."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -192,19 +192,19 @@ msgstr "Адреса источника, назначения и перезап�
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Расширеные настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Разрешить «недействительный» трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
 
@@ -240,11 +240,11 @@ msgstr ""
 "Назначить указанного помощника отслеживания соединений для соответствующего "
 "трафика."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Автоматическое назначение помощников"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -256,11 +256,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Комментарий"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Отслеживание соединений (conntrack)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Помощники отслеживания соединений"
 
@@ -276,15 +276,15 @@ msgstr "Продолжить"
 msgid "Counters"
 msgstr "Счетчики"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Охватываемые устройства"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Охватываемые сети"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Охватываемые подсети"
 
@@ -333,7 +333,7 @@ msgstr "Зона назначения"
 msgid "Device name"
 msgstr "Имя устройства"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -360,11 +360,11 @@ msgstr "Включить NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Включить защиту от SYN-flood атак"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Включить журналирование в этой зоне"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -373,7 +373,7 @@ msgstr ""
 "Включите трансляцию сетевых адресов и портов IPv4 (NAT4 или NAPT4) для "
 "исходящего трафика в этой зоне. Обычно это включается в зоне <em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -397,7 +397,7 @@ msgstr "Ожидание: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Явно определяет допустимые варианты помощников (helpers) отслеживания "
@@ -417,15 +417,15 @@ msgstr "Внешний порт"
 msgid "Extra arguments"
 msgstr "Дополнительные аргументы"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Дополнительные аргументы для назначения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Дополнительные аргументы iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Дополнительные аргументы для источника"
 
@@ -465,6 +465,10 @@ msgstr "Межсетевой экран - Настройка зон"
 msgid "Firewall configuration migration"
 msgstr "Миграция конфигурации межсетевого экрана"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Перенаправление"
@@ -547,7 +551,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Основные Настройки"
@@ -556,7 +560,11 @@ msgstr "Основные Настройки"
 msgid "Grant access to firewall configuration"
 msgstr "Разрешить конфигурировать брандмауер"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Аппаратная разгрузка потока"
 
@@ -584,14 +592,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 и IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Только IPv4"
 
@@ -599,14 +607,14 @@ msgstr "Только IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "Маскарадинг IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Только IPv6"
 
@@ -648,7 +656,7 @@ msgid "Initial Hash Size"
 msgstr "Начальный размер хэша"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Входящий трафик"
 
@@ -664,7 +672,7 @@ msgstr "Внутренний порт"
 msgid "Internal zone"
 msgstr "Внутренняя зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Внутризональная пересылка"
 
@@ -684,7 +692,7 @@ msgstr "Недопустимое имя набора"
 msgid "Limit burst"
 msgstr "Ограничение барста (burst)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Ограничить журнал сообщений"
 
@@ -702,8 +710,8 @@ msgstr ""
 "Ограничение до <var>%{limit.num}</var> пакетов в <var>%{limit.unit}</"
 "var>%{limit.burst? барст (burst) <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Включены ограничения маскарадинга"
 
@@ -720,11 +728,11 @@ msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 "MASQUERADE — автоматически переписывать на IP-адрес исходящего интерфейса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Ограничение MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Маскарадинг"
 
@@ -853,7 +861,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Название"
 
@@ -861,6 +869,10 @@ msgstr "Название"
 msgid "Netmask"
 msgstr "Маска сети"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -894,7 +906,7 @@ msgid "Outbound zone"
 msgstr "Исходящая зона"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Исходящий трафик"
 
@@ -923,7 +935,7 @@ msgstr ""
 "Передаёт дополнительные аргументы таблице iptables. Используйте с "
 "осторожностью!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -983,22 +995,22 @@ msgstr "Обращение к внешнему набору"
 msgid "Reflection zones"
 msgstr "Зоны отражения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Требуется аппаратная поддержка NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Использовать протокол"
 
@@ -1047,10 +1059,10 @@ msgstr ""
 "маске."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Программная реализация offloading для маршрутизации/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Программный flow offloading"
 
@@ -1138,8 +1150,8 @@ msgid ""
 "traffic flow."
 msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1156,7 +1168,7 @@ msgstr ""
 "перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
 "из wan в lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1294,7 +1306,7 @@ msgstr "Правило без имени"
 msgid "Unnamed set"
 msgstr "Безымянный набор"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Зона без имени"
 
@@ -1326,7 +1338,7 @@ msgstr "Использовать внутренний IP-адрес"
 msgid "Use ipset"
 msgstr "Использовать ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1334,7 +1346,7 @@ msgstr ""
 "Используйте эту опцию для классификации трафика зоны по сетевым устройствам, "
 "управляемым не через <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1372,11 +1384,11 @@ msgstr "На вашем устройстве не работает firewall4."
 msgid "Your device runs firewall4."
 msgstr "На вашем устройстве работает firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Перенаправления"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Зоны"
 
@@ -1390,7 +1402,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "принимать"
 
@@ -1479,7 +1491,7 @@ msgstr "не отслеживать"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "не обрабатывать"
 
@@ -1553,7 +1565,7 @@ msgstr "порт: Порт"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "отклонить"
 
@@ -1596,9 +1608,9 @@ msgstr "src_port: Исходный порт"
 msgid "this device"
 msgstr "это устройство"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "эта новая зона"
 
@@ -1619,6 +1631,9 @@ msgstr "до 65536 записей."
 msgid "valid firewall mark"
 msgstr "верная метка брандмауэра"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Программная реализация offloading для маршрутизации/NAT"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/si/firewall.po b/applications/luci-app-firewall/po/si/firewall.po
index 95ce035e79..54cd9c03de 100644
--- a/applications/luci-app-firewall/po/si/firewall.po
+++ b/applications/luci-app-firewall/po/si/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -301,18 +301,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -352,15 +352,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -400,6 +400,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -455,7 +459,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -464,7 +468,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -492,14 +500,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -507,14 +515,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -545,7 +553,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -561,7 +569,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -581,7 +589,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -597,8 +605,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -614,11 +622,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -730,7 +738,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -738,6 +746,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -766,7 +778,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -788,7 +800,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -839,22 +851,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -898,10 +910,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -983,8 +995,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -994,7 +1006,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1107,7 +1119,7 @@ msgstr "නම් නොකළ නීතිය"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1136,13 +1148,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1178,11 +1190,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1194,7 +1206,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1283,7 +1295,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1352,7 +1364,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1395,9 +1407,9 @@ msgstr ""
 msgid "this device"
 msgstr "මෙම උපාංගය"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index a356014404..7ff1d2e9fc 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -149,14 +149,14 @@ msgstr "ACCEPT - Zakázať prepis adresy"
 msgid "Action"
 msgstr "Akcia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -177,19 +177,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Pokročilé nastavenia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Umožniť „neplatný“ prenos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Umožniť presmerovanie zo <em>zdrojových zón</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Umožniť presmerovanie do <em>cieľových zón</em>:"
 
@@ -219,11 +219,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -233,11 +233,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -253,15 +253,15 @@ msgstr "Pokračovať"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Pokryté zariadenia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Pokryté siete"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Pokryté podsiete"
 
@@ -306,7 +306,7 @@ msgstr "Cieľová zóna"
 msgid "Device name"
 msgstr "Názov zariadenia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -330,18 +330,18 @@ msgstr "Povoliť slučku NAT"
 msgid "Enable SYN-flood protection"
 msgstr "Povoliť ochranu pred útokom SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Povoliť zaznamenávanie tejto zóny"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -363,7 +363,7 @@ msgstr "Očakáva sa: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Experimentálna funkcia. Nie je plne kompatibilná so službami QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -381,15 +381,15 @@ msgstr "Vonkajší port"
 msgid "Extra arguments"
 msgstr "Argumenty navyše"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -429,6 +429,10 @@ msgstr "Brána Firewall - Nastavenia zón"
 msgid "Firewall configuration migration"
 msgstr "Migrácia konfigurácie brány Firewall"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Presmerovanie"
@@ -484,7 +488,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Všeobecné nastavenia"
@@ -493,7 +497,11 @@ msgstr "Všeobecné nastavenia"
 msgid "Grant access to firewall configuration"
 msgstr "Udeliť prístup ku konfigurácii brány firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Hardvérové odľahčenie toku"
 
@@ -521,14 +529,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 a IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Iba IPv4"
 
@@ -536,14 +544,14 @@ msgstr "Iba IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Iba IPv6"
 
@@ -574,7 +582,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Vstup"
 
@@ -590,7 +598,7 @@ msgstr "Vnútorný port"
 msgid "Internal zone"
 msgstr "Vnútorná zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -610,7 +618,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Obmedziť správy záznamu"
 
@@ -626,8 +634,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -643,11 +651,11 @@ msgstr "Zdrojová adresa IP slučky"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Maškaráda"
 
@@ -759,7 +767,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Názov"
 
@@ -767,6 +775,10 @@ msgstr "Názov"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -795,7 +807,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Výstup"
 
@@ -817,7 +829,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -871,22 +883,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Vyžaduje hardvérovú podporu NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Obmedziť maškarádu na zadané cieľové podsiete"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Obmedziť maškarádu na zadané zdrojové podsiete"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Obmedziť na rodinu adries"
 
@@ -932,10 +944,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Softvérové odľahčenie smerovania/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Softvérové odľahčenie toku"
 
@@ -1021,8 +1033,8 @@ msgstr ""
 "Brána firewall vytvorí zóny medzi vašimi sieťovými rozhraniami na ovládanie "
 "toku sieťového prenosu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1032,7 +1044,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1145,7 +1157,7 @@ msgstr "Nepomenované pravidlo"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Nepomenovaná zóna"
 
@@ -1174,13 +1186,13 @@ msgstr "Použiť vnútornú adresu IP"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1216,11 +1228,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Presmerovania"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zóny"
 
@@ -1232,7 +1244,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "prijať"
 
@@ -1321,7 +1333,7 @@ msgstr "nesledovať"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "zahodiť"
 
@@ -1390,7 +1402,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "zamietnuť"
 
@@ -1433,9 +1445,9 @@ msgstr ""
 msgid "this device"
 msgstr "toto zariadenie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "táto nová zóna"
 
@@ -1455,3 +1467,6 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr ""
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Softvérové odľahčenie smerovania/NAT"
diff --git a/applications/luci-app-firewall/po/sr/firewall.po b/applications/luci-app-firewall/po/sr/firewall.po
index e80d0d0ae7..ec2ef7a2e3 100644
--- a/applications/luci-app-firewall/po/sr/firewall.po
+++ b/applications/luci-app-firewall/po/sr/firewall.po
@@ -122,14 +122,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -148,19 +148,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -204,11 +204,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -301,18 +301,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -352,15 +352,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -400,6 +400,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -455,7 +459,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -464,7 +468,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -492,14 +500,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -507,14 +515,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -545,7 +553,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -561,7 +569,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -581,7 +589,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -597,8 +605,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -614,11 +622,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -730,7 +738,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -738,6 +746,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -766,7 +778,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -788,7 +800,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -839,22 +851,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -898,10 +910,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -983,8 +995,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -994,7 +1006,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1107,7 +1119,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1136,13 +1148,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1178,11 +1190,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1194,7 +1206,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1283,7 +1295,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1352,7 +1364,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1395,9 +1407,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index e61f3a3ec5..eb03f5c99d 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -133,7 +133,7 @@ msgstr "ACCEPT - Inaktivera adressomskrivning"
 msgid "Action"
 msgstr "Åtgärd"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -143,7 +143,7 @@ msgstr ""
 "destinationszonens trafik, t.ex. <code>-p tcp --dport 443</code> för att "
 "bara matcha utgående HTTP-trafik."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -167,19 +167,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Tillåt \"ogiltig\" trafik"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillåt vidarebefordring från <em>källzonerna</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Till vidarebefordring till <em>destinationszonerna:</em>:"
 
@@ -211,11 +211,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -226,11 +226,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Kommentar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Inställningar för Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack-hjälpare"
 
@@ -246,15 +246,15 @@ msgstr "Fortsätt"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Täckta enheter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Nätverk som omfattas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Subnät som omfattas"
 
@@ -302,7 +302,7 @@ msgstr "Destinationens zon"
 msgid "Device name"
 msgstr "Enhetens namn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -329,21 +329,21 @@ msgstr "Aktivera NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Aktivera loggning i den här zonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 "Aktivera IPv4 nätverksadress och portöversättning (NAT4 eller NAPT4) för "
-"utåtgående trafik på denna zon. Detta är vanligtvist aktiverat på "
-"<em>wan</em>-zonen."
+"utåtgående trafik på denna zon. Detta är vanligtvist aktiverat på <em>wan</"
+"em>-zonen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -367,7 +367,7 @@ msgstr "Förväntade: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Experimentell funktion. Inte fullt kompatibel med QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -385,15 +385,15 @@ msgstr "Extern port"
 msgid "Extra arguments"
 msgstr "Extra argument"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -433,6 +433,10 @@ msgstr "Brandvägg - Zoninställningar"
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Vidarebefordra"
@@ -493,7 +497,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Generella inställningar"
@@ -502,7 +506,11 @@ msgstr "Generella inställningar"
 msgid "Grant access to firewall configuration"
 msgstr "Tillåt åtkomst till brandväggskonfigurationen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -530,14 +538,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 och IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Endast IPv4"
 
@@ -545,14 +553,14 @@ msgstr "Endast IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Endast IPv6"
 
@@ -583,7 +591,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Inmatning"
 
@@ -599,7 +607,7 @@ msgstr "Intern port"
 msgid "Internal zone"
 msgstr "Intern zon"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -619,7 +627,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Begränsa loggmeddelanden"
 
@@ -635,8 +643,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -652,11 +660,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Maskering"
 
@@ -770,7 +778,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Namn"
 
@@ -778,6 +786,10 @@ msgstr "Namn"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -807,7 +819,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Utmatning"
 
@@ -829,7 +841,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -880,22 +892,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Kräver hårdvarustöd för NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Begränsa till adressfamilj"
 
@@ -939,10 +951,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -1026,8 +1038,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1037,7 +1049,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1150,7 +1162,7 @@ msgstr "Regel utan namn"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Zon utan namn"
 
@@ -1179,13 +1191,13 @@ msgstr "Använd en intern IP-adress"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1221,11 +1233,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Zon ⇒ Vidarebefordringar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Zoner"
 
@@ -1237,7 +1249,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "acceptera"
 
@@ -1326,7 +1338,7 @@ msgstr "spåra inte"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "släpp"
 
@@ -1395,7 +1407,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "neka"
 
@@ -1438,9 +1450,9 @@ msgstr ""
 msgid "this device"
 msgstr "den här enheten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "den här nya zonen"
 
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 089d0944ee..9e9c7064a4 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -109,14 +109,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -135,19 +135,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -177,11 +177,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -191,11 +191,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -211,15 +211,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -288,18 +288,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -321,7 +321,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -339,15 +339,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -387,6 +387,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -442,7 +446,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -451,7 +455,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -479,14 +487,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -494,14 +502,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -532,7 +540,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -548,7 +556,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -568,7 +576,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -584,8 +592,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -601,11 +609,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -717,7 +725,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -725,6 +733,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -753,7 +765,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -775,7 +787,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -826,22 +838,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -885,10 +897,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -970,8 +982,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -981,7 +993,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1094,7 +1106,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1123,13 +1135,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1165,11 +1177,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1181,7 +1193,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1270,7 +1282,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1339,7 +1351,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1382,9 +1394,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index c01c955330..5d566bdc6a 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -153,7 +153,7 @@ msgstr "KABUL ET - Adres yeniden yazmayı devre dışı bırak"
 msgid "Action"
 msgstr "Eylem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -163,7 +163,7 @@ msgstr ""
 "değişkenleri, ör. Yalnızca giden HTTPS trafiğini eşleştirmek için <code>-p "
 "tcp --dport 443</code>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -187,19 +187,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Gelişmiş Ayarlar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "\"Geçersiz\" trafiğe izin ver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>Kaynak bölgelerden</em> gelen yönlendirmeye izin ver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em> Hedef bölgelerden </em> gelen yönlendirmeye izin ver"
 
@@ -232,11 +232,11 @@ msgstr "Verilen DSCP sınıfını veya değerini kurulan bağlantılara uygulay�
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "Belirtilen bağlantı izleme yardımcısını eşleşen trafiğe atayın."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Otomatik yardımcı atama"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -248,11 +248,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Yorum"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack Ayarları"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack yardımcıları"
 
@@ -268,15 +268,15 @@ msgstr "Devam et"
 msgid "Counters"
 msgstr "Sayaçlar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Kapsanan cihazlar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Kapsanan ağlar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Kapsanan alt ağlar"
 
@@ -325,7 +325,7 @@ msgstr "Hedef bölge"
 msgid "Device name"
 msgstr "Cihaz adı"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -352,11 +352,11 @@ msgstr "NAT Döngü sınamasını etkinleştir"
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood korumasını etkinleştir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Bu bölgede günlük kaydetmeyi etkinleştir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -366,7 +366,7 @@ msgstr ""
 "IPv4'ü (NAT4 veya NAPT4) etkinleştirin. Bu genellikle <em>wan</em> "
 "bölgesinde etkinleştirilir."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -390,7 +390,7 @@ msgstr "Beklenen: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Deneysel özellik. QoS/SQM ile tam uyumlu değildir."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Bölge trafiği için izin verilen bağlantı izleme yardımcılarını açıkça seçer"
@@ -409,15 +409,15 @@ msgstr "Harici port"
 msgid "Extra arguments"
 msgstr "Ekstra argümanlar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Ekstra hedef argümanlar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Ekstra iptables argümanları"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Ekstra kaynak argümanlar"
 
@@ -457,6 +457,10 @@ msgstr "Güvenlik duvarı - Bölge Ayarları"
 msgid "Firewall configuration migration"
 msgstr "Güvenlik duvarı yapılandırma geçişi"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Yönlendir"
@@ -539,7 +543,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Genel Ayarlar"
@@ -548,7 +552,11 @@ msgstr "Genel Ayarlar"
 msgid "Grant access to firewall configuration"
 msgstr "Güvenlik duvarı yapılandırmasına erişim ver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Donanım akış boşaltma"
 
@@ -576,14 +584,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 ve IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Yalnızca IPv4"
 
@@ -591,14 +599,14 @@ msgstr "Yalnızca IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 Maskeleme"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Yalnızca IPv6"
 
@@ -640,7 +648,7 @@ msgid "Initial Hash Size"
 msgstr "İlk Hash Boyutu"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Giriş"
 
@@ -656,7 +664,7 @@ msgstr "İç bağlantı noktası"
 msgid "Internal zone"
 msgstr "İç bölge"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "Bölge içi ileri"
 
@@ -676,7 +684,7 @@ msgstr "Geçersiz küme adı"
 msgid "Limit burst"
 msgstr "Sınır patlaması"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Günlük mesajlarını sınırla"
 
@@ -694,8 +702,8 @@ msgstr ""
 "Eşleşmeyi bununla sınırla <var>%{limit.num}</var> packets per <var>%{limit."
 "unit}</var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Sınırlı maskeleme etkin"
 
@@ -711,11 +719,11 @@ msgstr "Geri döngü kaynak IP'si"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Giden arayüz IP'sine otomatik olarak yeniden yaz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS bağlama"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Maskeleme"
 
@@ -838,7 +846,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Ad"
 
@@ -846,6 +854,10 @@ msgstr "Ad"
 msgid "Netmask"
 msgstr "Netmask"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Yalnızca verilen IP adresine yönlendirilen gelen trafiği eşleştirin."
@@ -876,7 +888,7 @@ msgid "Outbound zone"
 msgstr "Giden bölge"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Çıkış"
 
@@ -903,7 +915,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "İptables'a ek argümanlar iletir. Dikkatli kullanın!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -964,22 +976,22 @@ msgstr "Harici Sete Bakın"
 msgid "Reflection zones"
 msgstr "Yansıma bölgeleri"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Donanımsal NAT desteği gerektirir."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Maskelendirmeyi verilen hedef alt ağlarla sınırla"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Maskelemeyi verilen kaynak alt ağlarla kısıtla"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Adres ailesiyle sınırla"
 
@@ -1027,10 +1039,10 @@ msgstr ""
 "mask]. Bir maske belirtilirse, sadece maskede ayarlanan bitler değiştirilir."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Yazılım tabanlı boşaltma, yönlendirme/NAT için"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Yazılım tabanlı akış boşaltma"
 
@@ -1120,8 +1132,8 @@ msgstr ""
 "Güvenlik duvarı, ağ trafiği akışını kontrol etmek için ağ arayüzleriniz "
 "üzerinde bölgeler oluşturur."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1137,7 +1149,7 @@ msgstr ""
 "%q</strong>. İletim kuralı <em>tek yönlüdür</em>,Örneğin. lan'dan wan'a "
 "yönlendirme, wan'dan lan'a yönlendirme izni <em>anlamına gelmez</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1276,7 +1288,7 @@ msgstr "İsimsiz kural"
 msgid "Unnamed set"
 msgstr "Adsız küme"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "İsimsiz bölge"
 
@@ -1308,7 +1320,7 @@ msgstr "Dahili bir IP adresi kullan"
 msgid "Use ipset"
 msgstr "ipset'i kullan"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1316,7 +1328,7 @@ msgstr ""
 "Bölge trafiğini ham, <em>uci</em> yönetilmeyen ağ cihazlarına göre "
 "sınıflandırmak için bu seçeneği kullanın."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1354,11 +1366,11 @@ msgstr "Cihazınız firewall4'ü çalıştırmıyor."
 msgid "Your device runs firewall4."
 msgstr "Cihazınız firewall4'ü çalıştırıyor."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Bölge ⇒ Yönlendirmeler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Bölgeler"
 
@@ -1372,7 +1384,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "kabul et"
 
@@ -1461,7 +1473,7 @@ msgstr "izleme"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "düşür"
 
@@ -1535,7 +1547,7 @@ msgstr "port: Port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "reddet"
 
@@ -1578,9 +1590,9 @@ msgstr "src_port: Kaynak Bağlantı Noktası"
 msgid "this device"
 msgstr "bu cihaz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "bu yeni bölge"
 
@@ -1601,6 +1613,9 @@ msgstr "65536 girişe kadar."
 msgid "valid firewall mark"
 msgstr "geçerli güvenlik duvarı işareti"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Yazılım tabanlı boşaltma, yönlendirme/NAT için"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 610fd867c3..cccb6ec010 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -156,7 +156,7 @@ msgstr "ACCEPT — Вимкнути перезапис адреси"
 msgid "Action"
 msgstr "Дія"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -166,7 +166,7 @@ msgstr ""
 "призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб зіставляти "
 "лише вихідний трафік HTTPS."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -188,19 +188,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Розширені налаштування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Дозволити \"неправильний\" трафік"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
 
@@ -235,11 +235,11 @@ msgstr ""
 "Призначити вказаного помічника відслідковування з'єднань для відповідного "
 "трафіку."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Автоматичне призначення помічника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -252,13 +252,13 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 "Параметри відслідковування з'єднань (<abbr title=\"Connection "
 "tracking\">Conntrack</abbr>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 "Помічники відслідковування з'єднань (<abbr title=\"Connection "
@@ -276,15 +276,15 @@ msgstr "Продовжити"
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Охоплені пристрої"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Охоплені мережі"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Охоплені підмережі"
 
@@ -333,7 +333,7 @@ msgstr "Зона призначення"
 msgid "Device name"
 msgstr "Назва пристрою"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -360,18 +360,18 @@ msgstr "Увімкнути NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Увімкнути захист від SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Увімкнути реєстрування у цій зоні"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -393,7 +393,7 @@ msgstr "Очікується: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "В явному вигляді дозволені помічники відслідковування з'єднань для трафіку "
@@ -413,15 +413,15 @@ msgstr "Зовнішній порт"
 msgid "Extra arguments"
 msgstr "Додаткові аргументи"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Додаткові аргументи для призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Додаткові аргументи iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Додаткові аргументи для джерела"
 
@@ -461,6 +461,10 @@ msgstr "Брандмауер — Параметри зон"
 msgid "Firewall configuration migration"
 msgstr "Переміщення конфігурації брандмауера"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Переспрямовування"
@@ -537,7 +541,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Загальні налаштування"
@@ -546,7 +550,11 @@ msgstr "Загальні налаштування"
 msgid "Grant access to firewall configuration"
 msgstr "Надати доступ до конфігурування брандмауера"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Апаратні засоби розвантаження потоку"
 
@@ -574,14 +582,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 та IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Лише IPv4"
 
@@ -589,14 +597,14 @@ msgstr "Лише IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Лише IPv6"
 
@@ -627,7 +635,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Вхідний трафік"
 
@@ -643,7 +651,7 @@ msgstr "Внутрішній порт"
 msgid "Internal zone"
 msgstr "Внутрішня зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -663,7 +671,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr "Обмеження блоку"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Обмеження повідомлень журналу"
 
@@ -681,8 +689,8 @@ msgstr ""
 "Обмеження зіставляння до <var>%{limit.num}</var> пакетів на <var>%{limit."
 "unit}</var>%{limit.burst? блок <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Увімкнено обмежене маскування"
 
@@ -699,11 +707,11 @@ msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 "MASQUERADE - Автоматично переписувати на IP-адресу вихідного інтерфейсу"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "Обмежування MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Підміна"
 
@@ -831,7 +839,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Назва"
 
@@ -839,6 +847,10 @@ msgstr "Назва"
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Зіставляти тільки вхідний трафік, спрямований на вказану IP-адресу."
@@ -869,7 +881,7 @@ msgid "Outbound zone"
 msgstr "Вихідна зона"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Вихідний трафік"
 
@@ -892,7 +904,7 @@ msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Передавання додаткових аргументів для IPTables. Використовуйте з обережністю!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -951,22 +963,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Необхідна апаратна підтримка NAT."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Обмежити підміну заданими підмережами призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Обмежити підміну заданими підмережами джерела"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Обмежити сімейство протоколів"
 
@@ -1014,10 +1026,10 @@ msgstr ""
 "встановлені в масці."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Програмне розвантаження для маршрутизації/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Програмне розвантаження потоку"
 
@@ -1107,8 +1119,8 @@ msgstr ""
 "Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
 "потоком мережевого трафіку."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1125,7 +1137,7 @@ msgstr ""
 "від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
 "до LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1261,7 +1273,7 @@ msgstr "Правило без назви"
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Зона без назви"
 
@@ -1293,7 +1305,7 @@ msgstr "Використовувати внутрішню IP-адресу"
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1301,7 +1313,7 @@ msgstr ""
 "Використовуйте цей параметр для класифікації трафіку зон за мережевими "
 "пристроями raw, які не управляються через <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1339,11 +1351,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Зони"
 
@@ -1355,7 +1367,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "приймати"
 
@@ -1444,7 +1456,7 @@ msgstr "не відстежувати"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "опускати"
 
@@ -1513,7 +1525,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "відхиляти"
 
@@ -1556,9 +1568,9 @@ msgstr ""
 msgid "this device"
 msgstr "цього пристрою"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "ця нова зона"
 
@@ -1579,6 +1591,9 @@ msgstr ""
 msgid "valid firewall mark"
 msgstr "дійсна позначка брандмауера"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Програмне розвантаження для маршрутизації/NAT"
+
 #~ msgid ""
 #~ "Forwarded IPv4%{proto?, protocol %{proto#%{next?, }<var>%{item.name}</"
 #~ "var>}}%{mark?, mark <var%{mark.inv? data-tooltip=\"Match fwmarks except "
diff --git a/applications/luci-app-firewall/po/ur/firewall.po b/applications/luci-app-firewall/po/ur/firewall.po
index d1d9e551c4..eb210dbe9c 100644
--- a/applications/luci-app-firewall/po/ur/firewall.po
+++ b/applications/luci-app-firewall/po/ur/firewall.po
@@ -121,14 +121,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -147,19 +147,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -189,11 +189,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -203,11 +203,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -223,15 +223,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -300,18 +300,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -333,7 +333,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -351,15 +351,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -399,6 +399,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -454,7 +458,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -463,7 +467,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -491,14 +499,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -506,14 +514,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -544,7 +552,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -560,7 +568,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -580,7 +588,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -596,8 +604,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -613,11 +621,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -729,7 +737,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -737,6 +745,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -765,7 +777,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -787,7 +799,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -838,22 +850,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -897,10 +909,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -982,8 +994,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -993,7 +1005,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1106,7 +1118,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1135,13 +1147,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1177,11 +1189,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1193,7 +1205,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1282,7 +1294,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1351,7 +1363,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1394,9 +1406,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index c230f713cb..068ea4db77 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -151,7 +151,7 @@ msgstr "ACCEPT - Vô hiệu hóa viết lại địa chỉ"
 msgid "Action"
 msgstr "Hành động"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -160,7 +160,7 @@ msgstr ""
 "Các đối số thô <em>iptables</em> bổ sung để phân loại lưu lượng đích vùng, "
 "ví dụ: <code>-p tcp --dport 443</code> để chỉ khớp lưu lượng HTTPS đi ra."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -181,19 +181,19 @@ msgstr "Họ địa chỉ, địa chỉ nguồn, địa chỉ đích, địa ch�
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "Cài đặt Nâng cao"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "Cho phép lưu lượng \"không hợp lệ\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Cho phép tiến về từ <em>vùng nguồn</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Cho phép tiến về đến <em>vùng đích</em>:"
 
@@ -226,11 +226,11 @@ msgstr "Áp dụng lớp hoặc giá trị DSCP đã cho cho các kết nối đ
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "Gán trình theo dõi kết nối đã chỉ định cho lưu lượng khớp."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "Gán tự động trình theo dõi kết nối"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -241,11 +241,11 @@ msgstr ""
 msgid "Comment"
 msgstr "Bình luận"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Cài đặt Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Trình theo dõi kết nối"
 
@@ -261,15 +261,15 @@ msgstr "Tiếp tục"
 msgid "Counters"
 msgstr "Bộ đếm"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "Thiết bị được bao phủ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "Mạng được bao phủ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "Mạng con được bao phủ"
 
@@ -317,7 +317,7 @@ msgstr "Vùng điểm đến"
 msgid "Device name"
 msgstr "Tên thiết bị"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -344,11 +344,11 @@ msgstr "Bật NAT Loopback"
 msgid "Enable SYN-flood protection"
 msgstr "Kích hoạt bảo vệ SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "Bật ghi nhật ký trên vùng này"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -358,7 +358,7 @@ msgstr ""
 "ngoài trên vùng này. Thông thường, điều này được kích hoạt trên vùng "
 "<em>wan</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -382,7 +382,7 @@ msgstr "Đang chờ: %s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Tính năng thử nghiệm. Không hoàn toàn tương thích với QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Chọn rõ ràng các trình hỗ trợ theo dõi kết nối được phép cho giao thông vùng"
@@ -401,15 +401,15 @@ msgstr "External port"
 msgid "Extra arguments"
 msgstr "Các tham số bổ sung"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "Các tham số đích bổ sung"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "Các tham số iptables bổ sung"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "Các tham số nguồn bổ sung"
 
@@ -449,6 +449,10 @@ msgstr "Tường lửa - Cài đặt Vùng"
 msgid "Firewall configuration migration"
 msgstr "Di cư cấu hình tường lửa"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "Forward"
@@ -530,7 +534,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "Các cài đặt chung"
@@ -539,7 +543,11 @@ msgstr "Các cài đặt chung"
 msgid "Grant access to firewall configuration"
 msgstr "Cấp quyền truy cập vào cấu hình tường lửa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "Xả luồng phần cứng"
 
@@ -567,14 +575,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 và IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "Chỉ IPv4"
 
@@ -582,14 +590,14 @@ msgstr "Chỉ IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 Masquerading"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "Chỉ IPv6"
 
@@ -631,7 +639,7 @@ msgid "Initial Hash Size"
 msgstr "Kích thước băm Ban đầu"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "Input"
 
@@ -647,7 +655,7 @@ msgstr "Cổng nội bộ"
 msgid "Internal zone"
 msgstr "Vùng nội bộ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -667,7 +675,7 @@ msgstr "Tên thiết lập không hợp lệ"
 msgid "Limit burst"
 msgstr "Số lượng tắt đột ngột"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "Giới hạn tin nhắn nhật ký"
 
@@ -685,8 +693,8 @@ msgstr ""
 "Giới hạn khớp <var>%{limit.num}</var> gói tin mỗi <var>%{limit.unit}%</"
 "var>{limit.burst? với cú pháp <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "Bật masquerading có giới hạn"
 
@@ -702,11 +710,11 @@ msgstr "Địa chỉ IP nguồn Loopback"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - Tự động viết lại thành địa chỉ IP giao diện ra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS Clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "Masquerading"
 
@@ -827,7 +835,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "Tên"
 
@@ -835,6 +843,10 @@ msgstr "Tên"
 msgid "Netmask"
 msgstr "Netmask"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Chỉ khớp lưu lượng đến địa chỉ IP cụ thể."
@@ -864,7 +876,7 @@ msgid "Outbound zone"
 msgstr "Vùng đầu cuối ra"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "Output"
 
@@ -890,7 +902,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Truyền các đối số bổ sung cho iptables. Sử dụng cẩn thận!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -948,22 +960,22 @@ msgstr "Tham chiếu tới tập hợp ngoại vi"
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "Yêu cầu hỗ trợ NAT phần cứng."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Hạn chế Masquerading cho các mạng con đích được chỉ định"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Hạn chế Masquerading cho các mạng con nguồn được chỉ định"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "Giới hạn địa chỉ gia đình"
 
@@ -1010,10 +1022,10 @@ msgstr ""
 "mới được thay đổi."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "Bật tính năng Offloading dựa trên phần mềm cho định tuyến/NAT"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "Xả luồng dựa trên phần mềm"
 
@@ -1102,8 +1114,8 @@ msgstr ""
 "The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
 "thông của mạng."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1119,7 +1131,7 @@ msgstr ""
 "tiếp là <em>một chiều</em>, ví dụ: một chuyển tiếp từ lan đến wan <em>không</"
 "em> bao gồm quyền chuyển tiếp từ wan đến lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1256,7 +1268,7 @@ msgstr "Quy tắc không có tên"
 msgid "Unnamed set"
 msgstr "Bộ không có tên"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "Vùng không có tên"
 
@@ -1288,7 +1300,7 @@ msgstr "Sử dụng địa chỉ IP nội bộ"
 msgid "Use ipset"
 msgstr "Sử dụng ipset"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -1296,7 +1308,7 @@ msgstr ""
 "Sử dụng tùy chọn này để phân loại lưu lượng vùng theo thiết bị mạng thô, "
 "không được quản lý bởi <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1334,11 +1346,11 @@ msgstr "Thiết bị của bạn không chạy firewall4."
 msgid "Your device runs firewall4."
 msgstr "Thiết bị của bạn chạy firewall4."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "Vùng ⇒ Chuyển tiếp"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "Các vùng"
 
@@ -1350,7 +1362,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "chấp nhận"
 
@@ -1439,7 +1451,7 @@ msgstr "không theo dõi"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "drop"
 
@@ -1512,7 +1524,7 @@ msgstr "port: Cổng"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "Không chấp nhận"
 
@@ -1555,9 +1567,9 @@ msgstr "src_port: Cổng nguồn"
 msgid "this device"
 msgstr "thiết bị này"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "vùng mới này"
 
@@ -1577,3 +1589,6 @@ msgstr "lên đến 65536 mục."
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:339
 msgid "valid firewall mark"
 msgstr "dấu tường lửa hợp lệ"
+
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "Bật tính năng Offloading dựa trên phần mềm cho định tuyến/NAT"
diff --git a/applications/luci-app-firewall/po/yua/firewall.po b/applications/luci-app-firewall/po/yua/firewall.po
index a883f3fbb3..116ff9788e 100644
--- a/applications/luci-app-firewall/po/yua/firewall.po
+++ b/applications/luci-app-firewall/po/yua/firewall.po
@@ -121,14 +121,14 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -147,19 +147,19 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
@@ -189,11 +189,11 @@ msgstr ""
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
@@ -203,11 +203,11 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr ""
 
@@ -223,15 +223,15 @@ msgstr ""
 msgid "Counters"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Device name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -300,18 +300,18 @@ msgstr ""
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
 "zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -333,7 +333,7 @@ msgstr ""
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
@@ -351,15 +351,15 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr ""
 
@@ -399,6 +399,10 @@ msgstr ""
 msgid "Firewall configuration migration"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr ""
@@ -454,7 +458,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr ""
@@ -463,7 +467,11 @@ msgstr ""
 msgid "Grant access to firewall configuration"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -491,14 +499,14 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr ""
 
@@ -506,14 +514,14 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr ""
 
@@ -544,7 +552,7 @@ msgid "Initial Hash Size"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr ""
 
@@ -560,7 +568,7 @@ msgstr ""
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr ""
 
@@ -580,7 +588,7 @@ msgstr ""
 msgid "Limit burst"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr ""
 
@@ -596,8 +604,8 @@ msgid ""
 "var>%{limit.burst? burst <var>%{limit.burst}</var>}"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr ""
 
@@ -613,11 +621,11 @@ msgstr ""
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr ""
 
@@ -729,7 +737,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr ""
 
@@ -737,6 +745,10 @@ msgstr ""
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
@@ -765,7 +777,7 @@ msgid "Outbound zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr ""
 
@@ -787,7 +799,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -838,22 +850,22 @@ msgstr ""
 msgid "Reflection zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr ""
 
@@ -897,10 +909,10 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
+msgid "Software based offloading for routing/NAT."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr ""
 
@@ -982,8 +994,8 @@ msgid ""
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -993,7 +1005,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1106,7 +1118,7 @@ msgstr ""
 msgid "Unnamed set"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr ""
 
@@ -1135,13 +1147,13 @@ msgstr ""
 msgid "Use ipset"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1177,11 +1189,11 @@ msgstr ""
 msgid "Your device runs firewall4."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr ""
 
@@ -1193,7 +1205,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr ""
 
@@ -1282,7 +1294,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr ""
 
@@ -1351,7 +1363,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr ""
 
@@ -1394,9 +1406,9 @@ msgstr ""
 msgid "this device"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/zh_Hans/firewall.po b/applications/luci-app-firewall/po/zh_Hans/firewall.po
index e912de9d5c..1408023387 100644
--- a/applications/luci-app-firewall/po/zh_Hans/firewall.po
+++ b/applications/luci-app-firewall/po/zh_Hans/firewall.po
@@ -141,7 +141,7 @@ msgstr "接受 - 禁用地址重写"
 msgid "Action"
 msgstr "操作"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -150,7 +150,7 @@ msgstr ""
 "用于对区域目标流量进行分类的额外 <em>iptables</em> 参数。如：<code>-p tcp --"
 "dport 443</code> 表示仅匹配出站 HTTPS 流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -171,19 +171,19 @@ msgstr "地址族、源地址、目标地址、重写 IP 地址必须相匹配"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "允许“无效”流量"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允许来自<em>源区域</em>的转发："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "允许转发到<em>目标区域</em>："
 
@@ -215,11 +215,11 @@ msgstr "将给定的 DSCP 类或值应用于已建立的连接。"
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "将指定的连接跟踪助手分配给匹配的流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "自动助手分配"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr "根据流量协议和端口自动分配连接跟踪助手"
@@ -229,11 +229,11 @@ msgstr "根据流量协议和端口自动分配连接跟踪助手"
 msgid "Comment"
 msgstr "注释"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "连接跟踪设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "连接跟踪助手"
 
@@ -249,15 +249,15 @@ msgstr "继续"
 msgid "Counters"
 msgstr "计数器"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "涵盖的设备"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "涵盖的网络"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "涵盖的子网"
 
@@ -304,7 +304,7 @@ msgstr "目标区域"
 msgid "Device name"
 msgstr "设备名"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -330,11 +330,11 @@ msgstr "启用 NAT 环回"
 msgid "Enable SYN-flood protection"
 msgstr "启用 SYN-flood 防御"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "启用此区域的日志记录"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -343,7 +343,7 @@ msgstr ""
 "为此区域的出站流量开启网络地址和端口转换 IPv4 （NAT4 或 NAPT4）。 <em>wan</"
 "em>区域通常开启此功能。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -365,7 +365,7 @@ msgstr "请输入：%s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "实验特性。与 QoS/SQM 不完全兼容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "为区域流量明确选择允许的连接跟踪助手"
 
@@ -383,15 +383,15 @@ msgstr "外部端口"
 msgid "Extra arguments"
 msgstr "额外参数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "额外的目标参数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "额外的 iptables 参数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "额外的源参数"
 
@@ -431,6 +431,10 @@ msgstr "防火墙 - 区域设置"
 msgid "Firewall configuration migration"
 msgstr "防火墙配置迁移"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "转发"
@@ -512,7 +516,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "常规设置"
@@ -521,7 +525,11 @@ msgstr "常规设置"
 msgid "Grant access to firewall configuration"
 msgstr "授予访问防火墙配置的权限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "硬件流量分载"
 
@@ -549,14 +557,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "仅 IPv4"
 
@@ -564,14 +572,14 @@ msgstr "仅 IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 伪装"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "仅 IPv6"
 
@@ -612,7 +620,7 @@ msgid "Initial Hash Size"
 msgstr "初始哈希大小"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "入站数据"
 
@@ -628,7 +636,7 @@ msgstr "内部端口"
 msgid "Internal zone"
 msgstr "内部区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "区域内转发"
 
@@ -648,7 +656,7 @@ msgstr "无效的集合名"
 msgid "Limit burst"
 msgstr "限制突发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "限制日志信息"
 
@@ -666,8 +674,8 @@ msgstr ""
 "限制匹配到 <var>%{limit.num}</var> 包每 <var>%{limit.unit}</var>%{limit."
 "burst? 突发 <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "已启用有限伪装"
 
@@ -683,11 +691,11 @@ msgstr "环回源 IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE - 自动重写源地址为出站接口 IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS 钳制"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "IP 动态伪装"
 
@@ -799,7 +807,7 @@ msgstr "NAT 规则允许对源 IP 进行精细控制，以用于出站或转发�
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "名称"
 
@@ -807,6 +815,10 @@ msgstr "名称"
 msgid "Netmask"
 msgstr "网络掩码"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "仅匹配指定目的 IP 地址的入站流量。"
@@ -835,7 +847,7 @@ msgid "Outbound zone"
 msgstr "出站区域"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "出站数据"
 
@@ -861,7 +873,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "传递到 iptables 的额外参数。小心使用！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -915,22 +927,22 @@ msgstr "参考外部集合"
 msgid "Reflection zones"
 msgstr "反射区"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "需要硬件 NAT 支持。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 动态伪装的目标子网"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "要限制 IP 动态伪装的源子网"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "地址族限制"
 
@@ -976,10 +988,10 @@ msgstr ""
 "掩码中设置的位。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "基于软件的 路由/NAT 分载"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "软件流量分载"
 
@@ -1061,8 +1073,8 @@ msgid ""
 "traffic flow."
 msgstr "防火墙通过在网络接口上创建区域来控制网络流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1076,7 +1088,7 @@ msgstr ""
 "%q</strong> 的其它区域。转发规则的作用是<em>单向</em>的，例如：转发从 lan 到 "
 "wan 的流量并<em>不</em>意味着允许反向转发从 wan 到 lan 的流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1210,7 +1222,7 @@ msgstr "未命名规则"
 msgid "Unnamed set"
 msgstr "未命名的集合"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "未命名区域"
 
@@ -1241,13 +1253,13 @@ msgstr "使用内部 IP 地址"
 msgid "Use ipset"
 msgstr "使用 ip 集"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr "此选项可对原始的、非 <em>uci</em> 托管的网络设备进行区域流量分类。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1283,11 +1295,11 @@ msgstr "你的设备不运行 firewall4。"
 msgid "Your device runs firewall4."
 msgstr "你的设备运行 firewall4。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "区域 ⇒ 转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "区域"
 
@@ -1299,7 +1311,7 @@ msgstr "应创建反射规则的区域。如果未设置，则仅使用目标区
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "接受"
 
@@ -1388,7 +1400,7 @@ msgstr "不跟踪"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "丢弃"
 
@@ -1459,7 +1471,7 @@ msgstr "port: 端口"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "拒绝"
 
@@ -1502,9 +1514,9 @@ msgstr "src_port: 源端口"
 msgid "this device"
 msgstr "此设备"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "此新区域"
 
@@ -1525,6 +1537,9 @@ msgstr "最多 65536 个条目。"
 msgid "valid firewall mark"
 msgstr "有效的防火墙标记"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "基于软件的 路由/NAT 分载"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-firewall/po/zh_Hant/firewall.po b/applications/luci-app-firewall/po/zh_Hant/firewall.po
index d97c6c7c07..d658df8fb9 100644
--- a/applications/luci-app-firewall/po/zh_Hant/firewall.po
+++ b/applications/luci-app-firewall/po/zh_Hant/firewall.po
@@ -146,7 +146,7 @@ msgstr "接受 - 禁用位址重置"
 msgid "Action"
 msgstr "操作"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -155,7 +155,7 @@ msgstr ""
 "允許原生 <em>iptables</em> 對區域目標流量進行分類的參數, 譬如... <code>-p "
 "tcp --dport 443</code> 只針對相符輸出的HTTPS流量."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -176,19 +176,19 @@ msgstr "位址族、來源位址、目的位址、重寫IP位址必須匹配"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:161
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:181
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:114
 msgid "Advanced Settings"
 msgstr "進階設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid "Allow \"invalid\" traffic"
 msgstr "允許 \"無效\" 流量"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:385
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允許從<em>來源區域</em>轉發："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:338
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:344
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "允許轉發到<em>目標區</em>："
 
@@ -220,11 +220,11 @@ msgstr "啟用付予的DSCP(區別服務代碼點)來建立連線."
 msgid "Assign the specified connection tracking helper to matched traffic."
 msgstr "指定特定的連線追蹤幫手來匹配流量."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid "Automatic helper assignment"
 msgstr "自動分派幫手"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:280
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:286
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr "根據流量和埠號自動指定conntrack幫手"
@@ -234,11 +234,11 @@ msgstr "根據流量和埠號自動指定conntrack幫手"
 msgid "Comment"
 msgstr "註解"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Conntrack Settings"
 msgstr "Conntrack 設定值"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Conntrack helpers"
 msgstr "Conntrack 幫手"
 
@@ -254,15 +254,15 @@ msgstr "繼續"
 msgid "Counters"
 msgstr "計數器"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid "Covered devices"
 msgstr "已涵蓋裝置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered networks"
 msgstr "已涵蓋網路"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid "Covered subnets"
 msgstr "已涵蓋子網路"
 
@@ -309,7 +309,7 @@ msgstr "目標區域"
 msgid "Device name"
 msgstr "裝置名稱"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:277
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:283
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -335,11 +335,11 @@ msgstr "啟用 NAT 環回"
 msgid "Enable SYN-flood protection"
 msgstr "啟用 SYN-flood(SYN 洪水) 防禦"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:296
 msgid "Enable logging on this zone"
 msgstr "啟用此區域的日誌記錄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:168
 msgid ""
 "Enable network address and port translation IPv4 (NAT4 or NAPT4) for "
 "outbound traffic on this zone. This is typically enabled on the <em>wan</em> "
@@ -348,7 +348,7 @@ msgstr ""
 "為此區域的出站流量開啟網路位址和端口轉換 IPv4 （NAT4 或 NAPT4）。 <em>wan</"
 "em>區域通常開啟此功能。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
 msgid ""
 "Enable network address and port translation IPv6 (NAT6 or NAPT6) for "
 "outbound traffic on this zone."
@@ -370,7 +370,7 @@ msgstr "請輸入：%s"
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "實驗性功能。與 QoS/SQM 不完全相容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:284
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:290
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "針對區域流量明確選擇已允許的連接追蹤幫手"
 
@@ -388,15 +388,15 @@ msgstr "外部埠號"
 msgid "Extra arguments"
 msgstr "額外引數"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:322
 msgid "Extra destination arguments"
 msgstr "額外目標引數"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:110
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Extra iptables arguments"
 msgstr "額外iptables引數"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:306
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:312
 msgid "Extra source arguments"
 msgstr "額外來源引數"
 
@@ -436,6 +436,10 @@ msgstr "防火牆 - 區域設定"
 msgid "Firewall configuration migration"
 msgstr "防火牆設定移轉"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:82
+msgid "Flow offloading type"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:64
 msgid "Forward"
 msgstr "轉發"
@@ -516,7 +520,7 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:181
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:180
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
 #: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:17
 msgid "General Settings"
 msgstr "一般設定"
@@ -525,7 +529,11 @@ msgstr "一般設定"
 msgid "Grant access to firewall configuration"
 msgstr "授予存取防火牆組態的權限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+msgid "Hardware based offloading for routing with/without NAT."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Hardware flow offloading"
 msgstr "硬體流量卸載"
 
@@ -553,14 +561,14 @@ msgstr "IPv4"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:256
 msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:280
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
 msgid "IPv4 only"
 msgstr "僅 IPv4"
 
@@ -568,14 +576,14 @@ msgstr "僅 IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:242
 msgid "IPv6 Masquerading"
 msgstr "IPv6 偽裝"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:192
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:281
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:252
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:258
 msgid "IPv6 only"
 msgstr "僅 IPv6"
 
@@ -616,7 +624,7 @@ msgid "Initial Hash Size"
 msgstr "初始雜湊大小"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
 msgid "Input"
 msgstr "入站資料"
 
@@ -632,7 +640,7 @@ msgstr "內部埠"
 msgid "Internal zone"
 msgstr "內部區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:147
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
 msgid "Intra zone forward"
 msgstr "區內轉發"
 
@@ -652,7 +660,7 @@ msgstr "集合名無效"
 msgid "Limit burst"
 msgstr "限制爆潰"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:293
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:299
 msgid "Limit log messages"
 msgstr "限制日誌資訊量"
 
@@ -670,8 +678,8 @@ msgstr ""
 "限制相符到 <var>%{limit.num}</var> 封包數每 <var>%{limit.unit}</var>%{limit."
 "burst? burst <var>%{limit.burst}</var>}"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:244
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:250
 msgid "Limited masquerading enabled"
 msgstr "已啟用有限偽裝"
 
@@ -687,11 +695,11 @@ msgstr "回送來源IP"
 msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
 msgstr "MASQUERADE偽裝 - 自動重置到輸出界面的IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:180
 msgid "MSS clamping"
 msgstr "MSS 鉗制"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:167
 msgid "Masquerading"
 msgstr "IP 動態偽裝"
 
@@ -805,7 +813,7 @@ msgstr "NAT 規則允許對來源IP進行精細控制以便用於輸出或是轉
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/ipsets.js:51
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:209
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:188
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
 msgid "Name"
 msgstr "名稱"
 
@@ -813,6 +821,10 @@ msgstr "名稱"
 msgid "Netmask"
 msgstr "網路遮罩"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+msgid "None"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:274
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "僅相符指定目的 IP 位址的入站流量。"
@@ -841,7 +853,7 @@ msgid "Outbound zone"
 msgstr "輸出區域"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:63
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:146
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
 msgid "Output"
 msgstr "出站資料"
 
@@ -867,7 +879,7 @@ msgstr ""
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "傳遞附加引數到 iptables，小心使用！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:303
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:309
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -921,22 +933,22 @@ msgstr "參考外部集合"
 msgid "Reflection zones"
 msgstr "回應區"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
 msgid "Requires hardware NAT support."
 msgstr "需要硬體 NAT 支援。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:272
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 動態偽裝的目標子網"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
 msgid "Restrict Masquerading to given source subnets"
 msgstr "要限制 IP 動態偽裝的來源子網路"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:276
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:255
 msgid "Restrict to address family"
 msgstr "限制到位址群"
 
@@ -982,10 +994,10 @@ msgstr ""
 "則僅修改子網路遮罩中設置的那些位元."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
-msgid "Software based offloading for routing/NAT"
-msgstr "軟體式的 路由/NAT 卸載"
+msgid "Software based offloading for routing/NAT."
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
 msgid "Software flow offloading"
 msgstr "軟體式流量卸載"
 
@@ -1067,8 +1079,8 @@ msgid ""
 "traffic flow."
 msgstr "防火牆透過在網路介面上建立區域來控制網路流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:340
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -1083,7 +1095,7 @@ msgstr ""
 "如：一條允許從 LAN 到 WAN 的轉發規則並<em>不隱含</em>有允許相反方向從 WAN 到 "
 "LAN 的流量轉發。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -1217,7 +1229,7 @@ msgstr "未命名規則"
 msgid "Unnamed set"
 msgstr "未命名集合"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
 msgid "Unnamed zone"
 msgstr "未命名區域"
 
@@ -1248,13 +1260,13 @@ msgstr "使用內部IP位址"
 msgid "Use ipset"
 msgstr "使用 IP 集合"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:225
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:231
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr "依照原生, 非-<em>uci</em>管理的網路設備採用選項來分類流量."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -1290,11 +1302,11 @@ msgstr "你的設備沒有使用 firewall4。"
 msgid "Your device runs firewall4."
 msgstr "你的設備使用 firewall4。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:143
 msgid "Zone ⇒ Forwardings"
 msgstr "區域 ⇒ 轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:95
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:101
 msgid "Zones"
 msgstr "區域"
 
@@ -1306,7 +1318,7 @@ msgstr "創建回應規則的區域。若未設置，將僅使用目標區域。
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:414
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:70
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:159
 msgid "accept"
 msgstr "接受"
 
@@ -1395,7 +1407,7 @@ msgstr "不跟蹤"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:413
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:152
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:158
 msgid "drop"
 msgstr "丟棄"
 
@@ -1466,7 +1478,7 @@ msgstr "port: 埠"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:415
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:68
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:151
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:157
 msgid "reject"
 msgstr "拒絕"
 
@@ -1509,9 +1521,9 @@ msgstr "src_port: 源 埠"
 msgid "this device"
 msgstr "此裝置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:339
 msgid "this new zone"
 msgstr "新區域"
 
@@ -1532,6 +1544,9 @@ msgstr "最多 65536 個條目。"
 msgid "valid firewall mark"
 msgstr "有效正確的防火牆標記"
 
+#~ msgid "Software based offloading for routing/NAT"
+#~ msgstr "軟體式的 路由/NAT 卸載"
+
 #~ msgid ""
 #~ "Enable network address and port translation (NAT or NAPT) for outbound "
 #~ "traffic on this zone. This is typically enabled on the <em>wan</em> zone."
diff --git a/applications/luci-app-tinyproxy/po/ar/tinyproxy.po b/applications/luci-app-tinyproxy/po/ar/tinyproxy.po
index f34866db79..fcd97436c4 100644
--- a/applications/luci-app-tinyproxy/po/ar/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ar/tinyproxy.po
@@ -15,106 +15,98 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "التكوين"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -122,224 +114,239 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "ملف تسجيل"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "مستوى التسجيل"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "سياسة"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "اعدادات الخادم"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "الحالة"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "مستخدم"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "التكوين"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/bg/tinyproxy.po b/applications/luci-app-tinyproxy/po/bg/tinyproxy.po
index a9052f11f1..ad3d504d08 100644
--- a/applications/luci-app-tinyproxy/po/bg/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/bg/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,99 +24,91 @@ msgstr ""
 "прокси нагоре по веригата, <em>Отказ на достъп</em> деактивира всички "
 "проксита нагоре по веригата за целта"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Конфигурация"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -124,224 +116,239 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Адрес на слушане"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Порт на слушане"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Ниво на записи"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Отказ на достъп"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Състояние"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "Конфигурация"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po b/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po
index 0a7a0a898a..ada8ab8016 100644
--- a/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/bn_BD/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.9-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "অ্যাড্রেস বাইন্ড করুন"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "কনফিগারেশন"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -121,224 +113,239 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "লগ ফাইল"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "লগ লেভেল"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "নীতি"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "অবস্থা"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "কনফিগারেশন"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/ca/tinyproxy.po b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po
index 3668308806..8169878853 100644
--- a/applications/luci-app-tinyproxy/po/ca/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ca/tinyproxy.po
@@ -15,106 +15,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clients permesos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Ports de connexió permesos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configuració"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Temps d'espera de connexió"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Habilita el servidor Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Pàgina d'error"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtra per expressió regular"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtra per adreça"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Fitxer de filtració"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtració i ACLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Ajusts generals"
 
@@ -122,227 +114,245 @@ msgstr "Ajusts generals"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grup"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Llista blanca de capçaleres"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Llista d'adreces IP o rangs dels quals es permeten utilitzar el servidor "
 "intermediari"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Adreça d'escolta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Port d'escolta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Fitxer de registre"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Màx servidors spare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Mín servidors spare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Nombre mínim de processos ociosos preparats"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Nombre de processos ociosos que iniciar al iniciar el Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Política"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Ajusts de privacitat"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Rebutja accés"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Ajusts de servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Límits de servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Pàgina d'estadístiques"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Estat"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Màquina destí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Estat de Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy és un proxy HTTP no caché petit i ràpid"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Utilitza el syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Usuari"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Via nom de host"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 "Escriu els missatges de registre al syslog en lloc d'un fitxer de registre"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Capçalera X-Tinyproxy"
 
+#~ msgid "Configuration"
+#~ msgstr "Configuració"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Estat de Tinyproxy"
+
 #~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
diff --git a/applications/luci-app-tinyproxy/po/cs/tinyproxy.po b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po
index c959aea200..87e26123e8 100644
--- a/applications/luci-app-tinyproxy/po/cs/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/cs/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 5.1-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -21,101 +21,91 @@ msgstr ""
 "<em>Přes proxy</em>routuje požadavky na daný cíl přes specifikovaný upstream "
 "proxy, <em>Odmítnutí přístupu</em> vypne jakýkoli upstream proxy pro cíl"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Přidá do přeposlaného požadavku HTTP hlavičku \"X-Tinyproxy\", která "
-"obsahuje IP adresu klienta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Povolení klienti"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Nastavení"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Povolit server Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Chybová stránka"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrovat podle RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrovat podle URL adres"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Obecné nastavení"
 
@@ -123,220 +113,245 @@ msgstr "Obecné nastavení"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Skupina"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Naslouchající adresa"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Naslouchající port"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Soubor pro záznam událostí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Úroveň logu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Max. klientů"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Max. žádostí na server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. záložních serverů"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. záložních serverů"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politika"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Nastavení soukromí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Odepřít přístup"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Nastavení serveru"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Stránka statistik"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Stav"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Cílový hostitel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Stav Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy je malý a rychlý necachující HTTP(S)-Proxy server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Použít syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Uživatel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy hlavička"
+
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Přidá do přeposlaného požadavku HTTP hlavičku \"X-Tinyproxy\", která "
+#~ "obsahuje IP adresu klienta"
+
+#~ msgid "Configuration"
+#~ msgstr "Nastavení"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Stav Tinyproxy"
diff --git a/applications/luci-app-tinyproxy/po/da/tinyproxy.po b/applications/luci-app-tinyproxy/po/da/tinyproxy.po
index 1b8c33af66..6ad31503b5 100644
--- a/applications/luci-app-tinyproxy/po/da/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/da/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Tilladte klienter"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Generelle indstillinger"
 
@@ -121,221 +113,233 @@ msgstr "Generelle indstillinger"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Gruppe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Lytteadresse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Lytteport"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Log niveau"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politik"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Serverindstillinger"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Bruger"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
diff --git a/applications/luci-app-tinyproxy/po/de/tinyproxy.po b/applications/luci-app-tinyproxy/po/de/tinyproxy.po
index 8c4193b67f..396648816d 100644
--- a/applications/luci-app-tinyproxy/po/de/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/de/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,27 +24,25 @@ msgstr ""
 "Upstream-Proxy, <em>Zugriff verweigern</em> deaktiviert jegliche Proxies für "
 "das Ziel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Fügt eine \"X-Tinyproxy\" HTTP-Headerzeile mit der Client Adresse in "
-"weitergeleitete Anfragen ein"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Erlaubte Clients"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Erlaubte Verbindungsports"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Bind-Adresse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -52,7 +50,7 @@ msgstr ""
 "Standardmäßig werden einfache POSIX Ausdrücke für die Filterung genutzt, "
 "diese Option aktiviert erweiterte reguläre Ausdrücke"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -61,7 +59,7 @@ msgstr ""
 "Rolle, diese Option aktiviert die Unterscheidung von Groß- und "
 "Kleinschreibung"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -69,7 +67,7 @@ msgstr ""
 "Standardmäßig basiert die Filterung auf Domainnamen, diese Option aktiviert "
 "das Filtern gegen die volle URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -77,59 +75,49 @@ msgstr ""
 "Standardmäßig fungieren die Filterregeln als Blacklist, diese Option kehrt "
 "diese in eine Whitelist um und lässt nur treffende URLs oder Domains zu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Kann entweder eine IP-Adresse, ein Domain-Name oder \".\" für jegliche Hosts "
-"sein"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Verbindungstimeout"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Standardmäßig verbieten"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Tinyproxy Server aktivieren"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Fehlerseite"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Empfangen der Statistiken von URL fehlgeschlagen:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtern nach RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtern nach URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Filtern nach Groß-/Kleinschreibung"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Filterdatei"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filterung und Zugriffsregeln"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Allgemeine Einstellungen"
 
@@ -137,77 +125,75 @@ msgstr "Allgemeine Einstellungen"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "UCI-Zugriff für luci-app-tinyproxy erlauben"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Gruppe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "HTML-Vorlage für Statistikseiten"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTML-Vorlage für Fehlerseiten"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Headerzeilen-Whitelist"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Liste von IP-Adressen oder Netzbereichen welche diesen Server nutzen dürfen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Liste der zulässigen Ports für die CONNECT-Methode. Ein einzelner Wert \"0\" "
-"deaktiviert CONNECT vollständig, eine leere Liste erlaubt alle Ports"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Listen-Adresse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Listen-Port"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Gibt die Datei an, in welche Protokollausgaben geschrieben werden"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Protokollierungslevel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Umfang der Tinyproxy Protokollmeldungen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Max. Clients"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Max. Anfragen pro Server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. Prozesszahl"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Maximal erlaubte Anzahl gleichzeitig verbundener Clients"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -215,54 +201,62 @@ msgstr ""
 "Maximal erlaubte Anzahl an Anfragen pro Prozess. Wenn diese erreicht wird, "
 "startet der Prozess neu. Null bedeutet unlimitiert."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Maximale Anzahl an vorgehaltenen Leerlaufprozessen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Maximale Anzahl an Sekunden, die eine etablierte, inaktive Verbindung offen "
 "gehalten wird"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. Prozesszahl"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Minimale Anzahl an vorgehaltenen Leerlaufprozessen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Anzahl zu erzeugender Leerlaufprozesse beim Start von Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Klartextdatei mit zu filternden URLs oder Domains. Ein Eintrag pro Zeile"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Standardregel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Privatsphäre"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Verbiete Zugriff"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Servereinstellungen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Serverlimits"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -271,34 +265,34 @@ msgstr ""
 "dürfen, alle anderen werden entfernt. Leer lassen um den Filter zu "
 "deaktivieren"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Konfiguriert den Port an welchem Tinyproxy auf Anfragen wartet"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Konfiguriert den Hostname, welchen Tinyproxy in die \"Via\" Headerzeile "
 "schreibt"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Konfiguriert die lokale IP-Adresse welche Tinyproxy für ausgehende, "
 "weitergeleitete Anfragen benutzt"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 "Konfiguriert die IP-Adressen auf welchen Tinyproxy Anfragen entgegen nimmt"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 "Spezifiziert den UNIX-Gruppennamen mit welchem der Tinyproxy Prozess läuft"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -306,46 +300,46 @@ msgstr ""
 "Spezifiziert den Upstream-Proxy über welchen auf den Zielhost zugegriffen "
 "wird. Das Format ist <code>IP-Adresse:Port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 "Spezifiziert den UNIX-Nutzernamen mit welchem der Tinyproxy Prozess läuft"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Starte Leerlaufserver"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Statistikseite"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Zielhost"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Status Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 "Tinyproxy ist ein schlanker HTTP(S)-Proxy ohne eigenen Zwischenspeicher"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Upstream-Proxies"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -353,34 +347,68 @@ msgstr ""
 "Upstream-Proxy-Regeln definieren Proxy-Server welche immer dann genutzt "
 "werden wenn bestimmte IP-Adressen oder Domains angefragt werden."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Nutze den Systemprotokolldienst"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Benutzer"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "\"Via\" Hostname"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Zwischenproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 "Schreibt Protokolleinträge an den Protokolldienst statt in eine separate "
 "Protokolldatei"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy Headerzeile"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Fügt eine \"X-Tinyproxy\" HTTP-Headerzeile mit der Client Adresse in "
+#~ "weitergeleitete Anfragen ein"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Kann entweder eine IP-Adresse, ein Domain-Name oder \".\" für jegliche "
+#~ "Hosts sein"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Empfangen der Statistiken von URL fehlgeschlagen:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Liste der zulässigen Ports für die CONNECT-Methode. Ein einzelner Wert "
+#~ "\"0\" deaktiviert CONNECT vollständig, eine leere Liste erlaubt alle Ports"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Status Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/el/tinyproxy.po b/applications/luci-app-tinyproxy/po/el/tinyproxy.po
index fa2d4e0938..2c1de291a6 100644
--- a/applications/luci-app-tinyproxy/po/el/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/el/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.13-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -25,27 +25,25 @@ msgstr ""
 "πρόσβασης</em> απενεργοποιεί τη χρήση διαμεσολαβητή ανωτέρου επιπέδου για το "
 "συγκεκριμένο προορισμό"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Προσθέτει μια κεφαλίδα HTTP \"X-Tinyproxy\" με τη διεύθυνση IP του πελάτη "
-"στις προωθούμενες αιτήσεις"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Επιτρεπόμενοι πελάτες"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Επιτρεπόμενες θύρες σύνδεσης"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Διεύθυνση στην οποία ακούει η υπηρεσία"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -54,7 +52,7 @@ msgstr ""
 "φιλτράρισμα. Ενεργοποιήστε αυτή την επιλογή για να χρησιμοποιούνται "
 "εκτεταμένες κανονικές εκφράσεις"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -63,7 +61,7 @@ msgstr ""
 "κεφαλαίων. Ενεργοποιήστε αυτή την επιλογή για να γίνεται διάκριση πεζών "
 "κεφαλαίων"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -71,7 +69,7 @@ msgstr ""
 "Προεπιλεγμένα, το φιλτράρισμα γίνεται βάσει του ονόματος τομέα. "
 "Ενεργοποιήστε αυτή την επιλογή για να γίνεται βάσει URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -80,59 +78,49 @@ msgstr ""
 "Ενεργοποιήστε αυτή την επιλογή ώστε να επιτρέπονται μόνο τα ονόματα τομέα ή "
 "URLs που ταιριάζουν"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Μπορεί να είναι μια IP διεύθυνση ή εύρος, ένα όνομα τομέα ή \".\" για "
-"οποιοδήποτε σύστημα χωρίς όνομα τομέα"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Διαμόρφωση"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Χρονικό όριο σύνδεσης"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Άρνηση προεπιλεγμένα"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Ενεργοποίηση διαμεσολαβητή Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Σελίδα σφάλματος"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Απέτυχε η ανάκτηση στατιστικών στοιχείων από τη διεύθυνση url:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Φιλτράρισμα με Κανονικές Εκφράσεις"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Φιλτράρισμα με URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Φιλτράρισμα με διάκριση πεζών/κεφαλαίων"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Αρχείο φίλτρων"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Φιλτράρισμα και λίστες ελέγχου πρόσβασης"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Γενικές ρυθμίσεις"
 
@@ -140,79 +128,77 @@ msgstr "Γενικές ρυθμίσεις"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Παραχωρήστε πρόσβαση UCI για luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Ομάδα"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 "Αρχείο προτύπου HTML που στέλνεται σε αιτήσεις για στατιστικά του συστήματος"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Αρχείο προτύπου HTML που στέλνεται όταν προκύπτουν σφάλματα HTML"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Λευκή λίστα κεφαλίδων"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Λίστα διευθύνσεων IP ή εύρη αυτών στις οποίες επιτρέπεται η χρήση του "
 "διαμεσολαβητή"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Λίστα επιτρεπόμενων θυρών για τη μέθοδο CONNECT. Μια μοναδική τιμή \"0\" "
-"απενεργοποιεί πλήρως το CONNECT, μια κενή λίστα επιτρέπει όλες τις θύρες"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Διεύθυνση ακοής"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Θύρα ακοής"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Αρχείο καταγραφής"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Αρχείο καταγραφής που θα χρησιμοποιηθεί για την καταγραφή μηνυμάτων"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Επίπεδο καταγραφής της υπηρεσίας Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Μέγ. πελάτες"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Μέγ. αιτήματα ανά διακομιστή"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Μέγ. εφεδρικοί διακομιστές"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Μέγιστος επιτρεπόμενος αριθμός ταυτόχρονα συνδεδεμένων πελατών"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -220,55 +206,63 @@ msgstr ""
 "Μέγιστος επιτρεπόμενος αριθμός αιτημάτων ανά υπηρεσία. Σε περίπτωση "
 "υπέρβασης, η υπηρεσία επανεκκινείται. Μηδέν σημαίνει απεριόριστα."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Μέγιστος αριθμός προετοιμασμένων αδρανών υπηρεσιών"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Μέγιστος αριθμός δευτερολέπτων που παραμένει ανοιχτή μια ανενεργή σύνδεση"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Ελάχ. εφεδρικοί διακομιστές"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Ελάχιστος αριθμός προετοιμασμένων αδρανών υπηρεσιών"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 "Αριθμός αδρανών υπηρεσιών που θα ξεκινήσουν κατά την εκκίνηση του Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Αρχείο απλού κειμένου με διευθύνσεις URL ή domains προς φιλτράρισμα. Μία "
 "καταχώρηση ανά γραμμή"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Πολιτική"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Ρυθμίσεις απορρήτου"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Απόρριψη πρόσβασης"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Ρυθμίσεις διακομιστή"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Όρια διακομιστή"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -277,33 +271,33 @@ msgstr ""
 "άλλα απορρίπτονται. Αφήστε το κενό για να απενεργοποιήσετε το φιλτράρισμα "
 "κεφαλίδων"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Καθορίζει τη θύρα HTTP που ακούει το Tinyproxy για αιτήματα"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Καθορίζει το hostname του Tinyproxy που θα χρησιμοποιηθεί στην κεφαλίδα Via "
 "HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Καθορίζει τη διεύθυνση με την οποία συνδέεται το Tinyproxy για εξερχόμενα "
 "προωθημένα αιτήματα"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Καθορίζει τις διευθύνσεις που ακούει το Tinyproxy για αιτήματα"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 "Καθορίζει το όνομα της ομάδας στην οποία εκτελείται η υπηρεσία Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -311,46 +305,46 @@ msgstr ""
 "Καθορίζει το upstream proxy που θα χρησιμοποιηθεί για την πρόσβαση στον "
 "κεντρικό υπολογιστή προορισμού. Η μορφή είναι <code>address:port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Καθορίζει το όνομα χρήστη με το οποίο εκτελείται η υπηρεσία Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Ξεκινήστε τους εφεδρικούς διακομιστές"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Σελίδα στατιστικών"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Host προορισμού"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Κατάσταση Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 "Το Tinyproxy είναι ένας μικρός και γρήγορος διακομιστής μεσολάβησης HTTP(S) "
 "χωρίς προσωρινή αποθήκευση"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Upstream μεσολαβητές"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -358,32 +352,66 @@ msgstr ""
 "Οι κανόνες μεσολάβησης upstream ορίζουν τους διακομιστές μεσολάβησης που θα "
 "χρησιμοποιηθούν κατά την πρόσβαση σε συγκεκριμένες διευθύνσεις IP ή domains."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Χρήση του syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Χρήστης"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Μέσω hostname"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Μέσω μεσολαβητή"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Γράφει μηνύματα καταγραφής στο syslog αντί για ένα αρχείο καταγραφής"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Κεφαλίδα X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Προσθέτει μια κεφαλίδα HTTP \"X-Tinyproxy\" με τη διεύθυνση IP του πελάτη "
+#~ "στις προωθούμενες αιτήσεις"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Μπορεί να είναι μια IP διεύθυνση ή εύρος, ένα όνομα τομέα ή \".\" για "
+#~ "οποιοδήποτε σύστημα χωρίς όνομα τομέα"
+
+#~ msgid "Configuration"
+#~ msgstr "Διαμόρφωση"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Απέτυχε η ανάκτηση στατιστικών στοιχείων από τη διεύθυνση url:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Λίστα επιτρεπόμενων θυρών για τη μέθοδο CONNECT. Μια μοναδική τιμή \"0\" "
+#~ "απενεργοποιεί πλήρως το CONNECT, μια κενή λίστα επιτρέπει όλες τις θύρες"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Κατάσταση Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/en/tinyproxy.po b/applications/luci-app-tinyproxy/po/en/tinyproxy.po
index 14f912aa03..dfe1c65634 100644
--- a/applications/luci-app-tinyproxy/po/en/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/en/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configuration"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -121,224 +113,239 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Log level"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. spare servers"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. spare servers"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Reject access"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Target host"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "Configuration"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/es/tinyproxy.po b/applications/luci-app-tinyproxy/po/es/tinyproxy.po
index 44bb0cb1ed..2d6ed1e24e 100644
--- a/applications/luci-app-tinyproxy/po/es/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/es/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7.2-rc\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,27 +24,25 @@ msgstr ""
 "especificado, <em>Rechazar acceso</em> desactiva cualquier proxy superior al "
 "destino"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Añade una cabecera HTTP con \"X-Tinyproxy\" con la dirección IP del cliente "
-"a las peticiones retransmitidas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clientes permitidos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Puertos permitidos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Dirección de unión"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -52,19 +50,19 @@ msgstr ""
 "Expresiones regulares extendidas. Por defecto se filtra con expresiones "
 "regulares POSIX básicas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr "Distinguir mayúsculas y minúsculas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr "Comparar con URLs. Por defecto el filtro se basa en nombres de dominio"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -72,59 +70,49 @@ msgstr ""
 "De forma predeterminada, las reglas de filtro actúan como lista negra. "
 "Active esta opción para permitir solo URLs coincidentes o nombres de dominio"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Puede ser un rango de IPs, un nombre de dominio o \".\" para cualquier host "
-"sin dominio"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configuración"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Espera de conexión"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Denegar por defecto"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Habilitar servidor Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Página de error"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "No se han podido obtener estadísticas de:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrar por RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrar por URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Distinguir entre mayúsculas y minúsculas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Archivo de filtro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtrado y ACLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Configuración general"
 
@@ -132,78 +120,76 @@ msgstr "Configuración general"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Conceder acceso UCI para luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grupo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 "Archivo de plantilla HTML para servir a las solicitudes del host de "
 "estadísticas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Archivo con la plantilla HTTP a usar cuando ocurra algún error"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Cabeceras autorizadas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr "Direcciones IP o rangos a los que se permite usar el servidor proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Lista de puertos permitidos para el método CONNECT. Un solo valor \"0\" "
-"desactiva CONNECT por completo, una lista vacía permite todos los puertos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Escuchar la dirección"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Puerto de escucha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Archivo de registro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Archivo de volcado de mensajes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Nivel de registro del proceso Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Clientes máximos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Peticiones máximas por servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Procesos servidores máximos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Máximo de clientes conectados simultáneamente"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -211,51 +197,59 @@ msgstr ""
 "Peticiones máximas por proceso. Si se supera el proceso es arrancado de "
 "nuevo. Para ilimitados indique 0."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Máximo de procesos inactivos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Segundos máximos que se tiene una conexión inactiva abierta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Procesos servidores mínimos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Mínimo de procesos inactivos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Procesos inactivos a arrancar cuando se lanza Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr "Archivo plano con URLs o dominios a filtrar. Uno por línea"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Política"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Configuración de privacidad"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Rechazar acceso"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Configuración del servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Límites del servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -264,29 +258,29 @@ msgstr ""
 "todos los demás se descartan. Deje vacío para desactivar el filtrado de "
 "encabezado"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Puerto de escucha de peticiones"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "Nombre de host a usar en la cabecera HTTP \"Via\""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Dirección a la que se asocia Tinyproxy para peticiones de reenvío salientes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Direcciones de escucha de peticiones"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Nombre de grupo en el que se ejecuta el proceso Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -295,44 +289,44 @@ msgstr ""
 "destino. El formato es <code>dirección:puerto</code> o <code>socks5 "
 "dirección:puerto</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Nombre de usuario con en el que se ejecuta el proceso Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Arrancar servidores libres"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Estadísticas"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Estado"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Host destino"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Estado de Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy es un proxy sin cache HTTP/HTTPS pequeño y rápido"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Proxies superiores"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -340,34 +334,68 @@ msgstr ""
 "Las reglas de proxy superior definen qué servidores usar cuando se accede a "
 "ciertas direcciones IP o dominios."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Usar SysLog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Usuario"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Nombre de host en \"Via\""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 "Escribe los mensajes de registro en SysLog en vez de en un archivo de "
 "registro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Cabecera X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Añade una cabecera HTTP con \"X-Tinyproxy\" con la dirección IP del "
+#~ "cliente a las peticiones retransmitidas"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Puede ser un rango de IPs, un nombre de dominio o \".\" para cualquier "
+#~ "host sin dominio"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "No se han podido obtener estadísticas de:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Lista de puertos permitidos para el método CONNECT. Un solo valor \"0\" "
+#~ "desactiva CONNECT por completo, una lista vacía permite todos los puertos"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Estado de Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/fi/tinyproxy.po b/applications/luci-app-tinyproxy/po/fi/tinyproxy.po
index e385777dc8..50d2b03bbc 100644
--- a/applications/luci-app-tinyproxy/po/fi/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/fi/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.12-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Sido osoite"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Kokoonpano"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Yleiset asetukset"
 
@@ -121,224 +113,239 @@ msgstr "Yleiset asetukset"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Ryhmä"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Kuunteluportti"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Lokitiedosto"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Käytäntö"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Palvelimen asetukset"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Tila"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Käyttäjä"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "Kokoonpano"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/fr/tinyproxy.po b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po
index c3ca450d8d..58ee8a1ae2 100644
--- a/applications/luci-app-tinyproxy/po/fr/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/fr/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.18.1\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,27 +24,25 @@ msgstr ""
 "amont donné, <em>Reject access</em> interdit tout mandataire amont comme "
 "cible"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Ajoute un en-tête HTTP \"X-Tinyproxy\" avec l'adresse IP du client aux "
-"requêtes retransmises"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clients autorisés"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Ports de connexion autorisés"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Lier l'adresse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -52,7 +50,7 @@ msgstr ""
 "Par défaut, le filtrage utilise des expressions POSIX basiques. Activez-ceci "
 "pour permettre l'utilisation d'expressions régulières étendues"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -61,7 +59,7 @@ msgstr ""
 "attention à leurs casses. Activez-ceci pour les rendre sensible à la casse "
 "des caractères"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -69,7 +67,7 @@ msgstr ""
 "Par défaut, le filtrage s'effectue sur les noms de domaines. Activez-ceci "
 "pour l'appliquer plutôt aux URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -78,59 +76,49 @@ msgstr ""
 "Activez cette option pour n'autoriser que les noms de domaines ou URLs qui "
 "correspondent aux règles"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Ce peut être soit une adresse ou une gamme d'adresses IP, un nom de domaine, "
-"ou \".\" pour n'importe quel nom d'hôte sans domaine"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configuration"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Délai de connexion"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Interdit par défaut"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Activer le serveur Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Page d'erreur"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Impossible de récupérer les statistiques de l'URL:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrage par RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrage par URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Filtrage sensible à la casse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Fichier des filtres"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtrage et ACLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Réglages généraux"
 
@@ -138,79 +126,77 @@ msgstr "Réglages généraux"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Accorder l’accès à l’UCI pour luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Groupe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 "Modèle de fichier HTML à utiliser pour les requêtes de statistiques des hôtes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Modèle de fichier HTML à utiliser quand une erreur HTTP survient"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Liste des en-têtes autorisés"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Liste des adresses IP ou gammes d'adresses IP autorisées à utiliser le "
 "serveur mandataire"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Liste des ports autorisés pour la méthode CONNECT. Une valeur unique \"0\" "
-"désactive complètement CONNECT, une liste vide autorise tous les ports"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Adresse d'écoute"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Port d'écoute"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Fichier journal"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Fichier-journal utilisé pour y copier les messages"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Niveau de journalisation"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Verbosité du journal du processus Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Nombre max. de clients"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Nombre max. de requêtes par serveur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Nombre Maximum de processus serveur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Nombre max autorisé de clients connectés en même temps"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -218,56 +204,64 @@ msgstr ""
 "Nombre maximum autorisé de requêtes par processus. S'il est dépassé, le "
 "processus est relancé. Un zéro désactive cette limite."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Nombre maximum de processus lancés, prêts à traiter des requêtes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Une connexion inactive est maintenue ouverte pendant cette durée maximum (en "
 "secondes)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Nombre Minimum de processus serveur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Nombre minimum de processus lancés, prêts à traiter des requêtes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 "Nombre de processus lancés en sus, prêts à traiter des requêtes, au "
 "démarrage de Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Fichier-texte contenant les URLs ou noms de domaines à filtrer, un par ligne"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politique"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Paramètres de confidentialité"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Refuser l'accès"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Paramètres du serveur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Limites du serveur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -275,32 +269,32 @@ msgstr ""
 "Indique les noms des entêtes HTTP qui sont autorisées à transiter, tous les "
 "autres seront retirés. Laisser vide pour désactiver le filtrage des entêtes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Indique le port HTTP où Tinyproxy est en écoute de requêtes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Indique le nom d'hôte que Tinyproxy utilisera dans l'entête HTTP « Via »"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Décrit l'adresse que Tinyproxy utilisera pour les requêtes retransmises à "
 "l'extérieur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Indique les adresses où Tinyproxy est en écoute de requêtes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 "Indique le nom de groupe sous lequel les processus Tinyproxy fonctionnent"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -308,45 +302,45 @@ msgstr ""
 "Indique un mandataire amont à utiliser pour atteindre l'hôte cible. Le "
 "format est <code>adresse:port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 "Indique le nom d'utilisateur sous lequel les processus Tinyproxy fonctionnent"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Serveurs en surplus au démarrage"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Page de statistiques"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "État"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Hôte de destination"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Statut Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy est un petit HTTP(S)-Proxy sans cache rapide"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Mandataires amont"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -354,32 +348,67 @@ msgstr ""
 "Les règles de mandataires amont définissent les serveurs mandataire à "
 "utiliser pour l'accès à certaines adresses IP ou domaines."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Utiliser syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Utilisateur"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "nom d'hôte « Via »"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Envoyer les messages à syslog plutôt que dans un fichier-journal"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Entête X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Ajoute un en-tête HTTP \"X-Tinyproxy\" avec l'adresse IP du client aux "
+#~ "requêtes retransmises"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Ce peut être soit une adresse ou une gamme d'adresses IP, un nom de "
+#~ "domaine, ou \".\" pour n'importe quel nom d'hôte sans domaine"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuration"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Impossible de récupérer les statistiques de l'URL:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Liste des ports autorisés pour la méthode CONNECT. Une valeur unique "
+#~ "\"0\" désactive complètement CONNECT, une liste vide autorise tous les "
+#~ "ports"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Statut Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/ga/tinyproxy.po b/applications/luci-app-tinyproxy/po/ga/tinyproxy.po
index 997d04b7c8..3e15895e42 100644
--- a/applications/luci-app-tinyproxy/po/ga/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ga/tinyproxy.po
@@ -15,7 +15,7 @@ msgstr ""
 "n>6 && n<11) ? 3 : 4;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -26,27 +26,25 @@ msgstr ""
 "<em>Diúltaigh rochtain</em> aon seachfhreastalaí in aghaidh an tsrutha don "
 "sprioc"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Cuireann sé ceanntásc HTTP \"X-Tinyproxy\" le seoladh IP an chliaint le "
-"hiarratais a chuirtear ar aghaidh"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Cliaint ceadaithe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Ceadaithe calafoirt nascadh"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Seoladh ceangail"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -54,7 +52,7 @@ msgstr ""
 "De réir réamhshocraithe, úsáidtear abairtí bunúsacha POSIX le haghaidh "
 "scagadh. Cumasaigh é seo chun sloinn rialta sínte a ghníomhachtú"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -62,7 +60,7 @@ msgstr ""
 "De réir réamhshocraithe, láimhseáiltear teaghráin scagaire mar chás-"
 "neamhíogair. Cumasaigh é seo chun an cás meaitseála a dhéanamh íogair"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -70,7 +68,7 @@ msgstr ""
 "De réir réamhshocraithe, déantar an scagadh bunaithe ar ainmneacha fearainn. "
 "Cumasaigh é seo chun meaitseáil le URLanna ina ionad sin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -79,58 +77,49 @@ msgstr ""
 "Cumasaigh an rogha seo gan ach URLanna comhoiriúnaithe nó ainmneacha "
 "fearainn a cheadú"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Is féidir seoladh IP nó raon, ainm fearainn nó \".\" d'aon ósta gan fearann"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Cumraíocht"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Teorainn ama ceangail"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Réamhshocrú shéanadh"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Cumasaigh freastalaí Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Leathanach earráide"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Theip ar staitisticí a aisghabháil ón URL:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Scag de réir RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Scag de réir URLanna"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Scag cás-íogair"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Comhad scagaire"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Scagadh agus ACLanna"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Socruithe ginearálta"
 
@@ -138,77 +127,75 @@ msgstr "Socruithe ginearálta"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Deonaigh rochtain UCI do luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grúpa"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "Comhad teimpléad HTML le freastal ar iarratais óstaigh stat"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Comhad teimpléad HTML le freastal nuair a tharlaíonn earráidí HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Liosta bán ceanntásca"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Liosta seoltaí IP nó raonta IP a bhfuil cead acu an seachfhreastalaí a úsáid"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Liosta de na poirt ceadaithe don mhodh CONNECT. Díchumasaíonn luach aonair "
-"\"0\" CONNECT go hiomlán, ceadaíonn liosta folamh gach calafort"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Éist leis an seoladh"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Éist port"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Comhad logála"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Comhad logála le húsáid chun teachtaireachtaí a dhumpáil"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Leibhéal logála"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Fíorfhocal logála an phróisis Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Uasta. cliaint"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Uas. iarratais in aghaidh an fhreastalaí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Uas. freastalaithe spártha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "An t-uaslíon cliant atá nasctha go comhthráthach"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -216,53 +203,61 @@ msgstr ""
 "An líon uasta iarratas a cheadaítear in aghaidh an phróisis. Má sháraítear "
 "é, atosófar an próiseas. Ciallaíonn nialais gan teorainn."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Líon uasta na bpróiseas díomhaoin ullmhaithe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Uaslíon soicind coinnítear nasc neamhghníomhach ar oscailt"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. freastalaithe spártha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Íoslíon na bpróiseas díomhaoin ullmhaithe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Líon na bpróiseas díomhaoin le tosú agus Tinyproxy á sheoladh"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Comhad gnáth-théacs le URLanna nó fearainn le scagadh. Iontráil amháin in "
 "aghaidh an líne"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Beartas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Socruithe príobháideachta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Diúltaigh rochtain"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Socruithe Freastalaí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Teorainneacha freastalaí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -271,34 +266,34 @@ msgstr ""
 "cuirtear gach ceann eile i leataobh. Fág folamh chun scagadh ceanntásca a "
 "dhíchumasú"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 "Sonraítear an port HTTP a bhfuil Tinyproxy ag éisteacht air le haghaidh "
 "iarratas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "Sonraíonn sé an t-óstainm Tinyproxy le húsáid sa cheanntásc Via HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Sonraítear an seoladh a nascann Tinyproxy leis le haghaidh iarratais a "
 "chuirtear ar aghaidh amach"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 "Sonraítear na seoltaí a bhfuil Tinyproxy ag éisteacht leo le haghaidh "
 "iarratas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Sonraíonn an t-ainm grúpa atá an próiseas Tinyproxy ag rith mar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -307,45 +302,45 @@ msgstr ""
 "rochtain a fháil ar an spriocóstach. Is éard atá san fhormáid ná "
 "<code>seoladh:port</code> nó <code>seoladh stocaí5: port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 "Sonraíonn sé an t-ainm úsáideora a bhfuil an próiseas Tinyproxy ag rith mar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Tosaigh freastalaithe spártha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Leathanach staitisticí"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Stádas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Sprioc-óstach"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Stádas Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Is HTTP(S)-Seachfhreastalaí é Tinyproxy beag agus tapa neamh-taisce"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Proxies in aghaidh srutha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -354,31 +349,65 @@ msgstr ""
 "seachfhreastalaí le húsáid agus rochtain á fáil acu ar sheoltaí IP nó ar "
 "fhearainn áirithe."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Úsáid syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Úsáideoir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Tríd an óstainm"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Trí seachfhreastalaí"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Scríobhann teachtaireachtaí logála chuig syslog in ionad logchomhad"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Ceanntásc X-Tinyproxy"
 
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Cuireann sé ceanntásc HTTP \"X-Tinyproxy\" le seoladh IP an chliaint le "
+#~ "hiarratais a chuirtear ar aghaidh"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Is féidir seoladh IP nó raon, ainm fearainn nó \".\" d'aon ósta gan "
+#~ "fearann"
+
+#~ msgid "Configuration"
+#~ msgstr "Cumraíocht"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Theip ar staitisticí a aisghabháil ón URL:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Liosta de na poirt ceadaithe don mhodh CONNECT. Díchumasaíonn luach "
+#~ "aonair \"0\" CONNECT go hiomlán, ceadaíonn liosta folamh gach calafort"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Stádas Tinyproxy"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/he/tinyproxy.po b/applications/luci-app-tinyproxy/po/he/tinyproxy.po
index d85b8076cc..62a5d3be84 100644
--- a/applications/luci-app-tinyproxy/po/he/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/he/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 5.0.2\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -21,99 +21,91 @@ msgstr ""
 "<em>דרך מתווך</em> מנתב את הבקשות ליעד שסופק דרך המתווך שנבחר כלפי מעלה, "
 "<em>דחיית גישה</em> משביתה מתווך כלפי מעלה עבור היעד"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "הגדרות"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -121,220 +113,235 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "מדיניות"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
+
+#~ msgid "Configuration"
+#~ msgstr "הגדרות"
diff --git a/applications/luci-app-tinyproxy/po/hi/tinyproxy.po b/applications/luci-app-tinyproxy/po/hi/tinyproxy.po
index aa4a4f93c5..136e2e8cda 100644
--- a/applications/luci-app-tinyproxy/po/hi/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/hi/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -121,221 +113,233 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "स्थिति"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
diff --git a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
index 53b92c77d0..74e380bd99 100644
--- a/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/hu/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7.1-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -22,27 +22,25 @@ msgstr ""
 "megadott proxy-n át küldi, a <em>Hozzáférés tiltása</em> opció letiltja "
 "proxy használatát a címnél"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"\"X-Tinyproxy\" HTTP fejlécet ad az ügyfél IP-címével a továbbított "
-"kérésekhez"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Engedélyezett ügyfelek"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Engedélyezett csatlakozási portok"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Cím kötése"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -50,7 +48,7 @@ msgstr ""
 "Alapértelmezésben csak egyszerű POSIX-formátumú kifejezéseket lehet "
 "használni. Ezzel lehet kibővített reguláris kifejezéseket engedélyezni."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -58,7 +56,7 @@ msgstr ""
 "Alapértelmezésben a szűrők nem nagybetűérzékenyek. Ezzel lehet "
 "nagybetűérzékeny kifejezéseket engedélyezni."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -66,7 +64,7 @@ msgstr ""
 "Alapértelmezésben a szűrés tartományneveken alapul. Ezzel lehet URL-alapú "
 "szűrést engedélyezni."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -74,59 +72,49 @@ msgstr ""
 "Alapértelmezésben a szűrő kizárási listaként működik. Ezzel lehet "
 "engedélyezési URL-eket és tartományneveket használni."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Lehet IP-cím, IP-címtartomány, tartománynév vagy \".\", ha a tartománynév "
-"nélküli gépneveket szeretné"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Beállítás"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Várakozási idő csatlakozásnál"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Tiltás alapból"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Tinyproxy kiszolgáló engedélyezése"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Hibaoldal"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Nem sikerült statisztikai adatokat lekérni innen:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Szűrés reg. kifejezéssel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Szűrés URL-lel"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Nagybetűérzékeny mód"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Szűrőfájl"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Szűrés és ACL-ek"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Általános beállítások"
 
@@ -134,74 +122,74 @@ msgstr "Általános beállítások"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "UCI jogosultság adása a \"luci-app-tinyproxy\"-nak"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Csoport"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "HTML sablonfájl stat host kérések feldolgozásához"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTML sablonfájl HTTP-hibák kezeléséhez"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Engedélyezett fejlécek"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr "A proxy kiszolgálónál engedélyezett IP-címek és -címtartományok"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Cím figyelése"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Port figyelése"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Naplófájl"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "A naplófájl neve"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Naplózás szintje"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "A Tinyproxy naplózási verbozitása"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Max. ügyfélszám"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Max. kérésszám kiszolgálónként"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. tartalékkiszolgáló-szám"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Max. csatlakozott ügyfélszám egy időben"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -209,53 +197,61 @@ msgstr ""
 "Max. kérésszám folyamatonként. Túllépése esetén a folyamat újraindul. 0 "
 "esetén nincs korlát."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Max. előkészített várakozó folyamat"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Az inaktív kapcsolatok max. nyitvahagyási ideje másodpercben"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "A tartalékkiszolgálók min. száma"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Az előkészített várakozó folyamatok min. száma"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Min. elinduló várakozó folyamat a Tinyproxy elindulásakor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "URL-eket és tartományneveket tartalmazó szöveges fájl. Minden bejegyzés "
 "külön sorba kerüljön."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Szabályzat"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Adatvédelmi beállítások"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Elutasítás"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Kiszolgáló beállításai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "A kiszolgáló paraméterei"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -263,28 +259,28 @@ msgstr ""
 "Engedélyezett HTTP fejlécek, minden más el lesz dobva. Ha üres, nem történik "
 "szűrés."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "A Tinyproxy ezen a porton várja a kéréseket"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "A \"Via\" HTTP fejlécekben használandó Tinyproxy gépnév"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr "A kimenő, továbbítandó kérések kötési címe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "A Tinyproxy ezeken a címeken várja a kéréseket"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "A Tinyproxy folyamat csoportneve"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -292,75 +288,102 @@ msgstr ""
 "A megadott cím eléréséhez használni kívánt proxy címe. <code>cím:port</code> "
 "formátumban kell megadni."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "A Tinyproxy folyamat felhasználóneve"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Tartalékkiszolgálók használata"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Statisztikai oldal"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Állapot"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Cím"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Tinyproxy állapot"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "A Tinyproxy egy kis méretű, gyors, gyorstár nélküli HTTP(S)-proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Továbbítási proxy-k"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr "Egyes IP-címek vagy tartományok eléréshez használandó proxy címek."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Syslog használata"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Felhasználó"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Gépnéven keresztül"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Proxy-n keresztül"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Fájl helyett syslog-ba naplózzon"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy fejléc"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "\"X-Tinyproxy\" HTTP fejlécet ad az ügyfél IP-címével a továbbított "
+#~ "kérésekhez"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Lehet IP-cím, IP-címtartomány, tartománynév vagy \".\", ha a tartománynév "
+#~ "nélküli gépneveket szeretné"
+
+#~ msgid "Configuration"
+#~ msgstr "Beállítás"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Nem sikerült statisztikai adatokat lekérni innen:"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Tinyproxy állapot"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/it/tinyproxy.po b/applications/luci-app-tinyproxy/po/it/tinyproxy.po
index 04fce0dc18..9b02106a0a 100644
--- a/applications/luci-app-tinyproxy/po/it/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/it/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,27 +24,25 @@ msgstr ""
 "il proxy upstream specificato, <em>Rifiuta l'accesso</em> disattiva "
 "qualsiasi proxy upstream per la destinazione"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Aggiungi una intestazione http \"X-Tinyproxy\" contenente l'IP del client a "
-"cui forwardare la richiesta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Client permessi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Porte di connessione permesse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Associa indirizzo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -53,7 +51,7 @@ msgstr ""
 "il filtraggio. Abilita questa opzione per attivare le espressioni regolari "
 "estese"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -61,7 +59,7 @@ msgstr ""
 "Per impostazione predefinita, le stringhe dei filtri non distinguono "
 "maiuscole e minuscole. Attiva questa opzione per farle distinguere"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -69,63 +67,55 @@ msgstr ""
 "Di default, il filto è basato sul nome di dominio. Abilita questa opzione "
 "per effettuare il match con URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configurazione"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Abilita il server Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Impossibile recuperare le statistiche dall'url:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Impostazioni generali"
 
@@ -133,221 +123,246 @@ msgstr "Impostazioni generali"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Gruppo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Lista di indirizzi IP o range di indirizzi a cui è permesso l'uso del proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Indirizzo in ascolto"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Porta in ascolto"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "File registro eventi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Livello dei log"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Numero massimo di client simultanei permessi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politica"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Rifiuta l'accesso"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Impostazioni del server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Stato"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Utente"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
+
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Aggiungi una intestazione http \"X-Tinyproxy\" contenente l'IP del client "
+#~ "a cui forwardare la richiesta"
+
+#~ msgid "Configuration"
+#~ msgstr "Configurazione"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Impossibile recuperare le statistiche dall'url:"
diff --git a/applications/luci-app-tinyproxy/po/ja/tinyproxy.po b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po
index 58cde96563..e12b193612 100644
--- a/applications/luci-app-tinyproxy/po/ja/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ja/tinyproxy.po
@@ -14,37 +14,35 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
-"<em>Via proxy</em>は、指定されたアップストリームプロキシを介して指定されたタ"
-"ーゲットへのリクエストをルーティングし、<em>Reject "
-"access</em>はターゲットのアップストリームプロキシを無効にします。"
+"<em>Via proxy</em>は、指定されたアップストリームプロキシを介して指定された"
+"ターゲットへのリクエストをルーティングし、<em>Reject access</em>はターゲット"
+"のアップストリームプロキシを無効にします。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"転送するリクエストのHTTPヘッダに\"X-Tinyproxy\"及びクライアントIPアドレスを追"
-"加します。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "接続を許可するクライアント"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "接続を許可するポート番号"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "バインドするIPアドレス"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -52,7 +50,7 @@ msgstr ""
 "初期設定では、基本的なPOSIX正規表現がフィルタリングに使用されますが、このオプ"
 "ションが有効に設定されている場合、拡張版のPOSIX正規表現が用いられます"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -60,7 +58,7 @@ msgstr ""
 "初期設定では、フィルターの文字列は大文字小文字を区別しませんが、このオプショ"
 "ンが有効に設定されている場合、区別してフィルタリングを行います"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -68,7 +66,7 @@ msgstr ""
 "初期設定では、ドメイン名を使用してフィルタリングを行いますが、このオプション"
 "が有効に設定されている場合、代わりにURLに対してフィルタリングを行います"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -77,57 +75,49 @@ msgstr ""
 "オプションが有効に設定されている場合、URLまたはドメイン名が一致した場合のみ、"
 "接続が許可されます"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "設定"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "接続タイムアウト"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "拒否 (デフォルト)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Tinyproxy サーバーを有効にする"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "エラーページ"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "統計を取得できませんでした URL:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "正規表現フィルタリング"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "URL フィルタリング"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "大文字小文字を区別してフィルタリング"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "フィルタファイル"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "フィルタリングとアクセス制御"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "一般設定"
 
@@ -135,74 +125,74 @@ msgstr "一般設定"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "luci-app-tinyproxy の UCI アクセスを許可"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "グループ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "リクエスト数を表示するHTMLテンプレートファイル"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTTPエラー時に表示するHTMLテンプレートファイル"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "ヘッダー・ホワイトリスト"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr "プロキシサーバーの使用を許可するIPアドレスリストです。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "リッスンアドレス"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "リッスンポート"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "ログファイル"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "メッセージを書き込むログファイルを指定します。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "ログレベル"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Tinyproxyプロセスのログの詳細度を設定"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "最大クライアント数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "サーバー毎の最大リクエスト数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "最大スペアサーバ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "同時接続可能なクライアントの最大数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -210,78 +200,86 @@ msgstr ""
 "プロセス毎の許可される最大リクエスト数を設定します。設定値を超えた場合、プロ"
 "セスを再起動します。0を入力すると、無制限に設定されます。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "アイドル状態で準備するプロセスの最大数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "アイドル状態で準備するプロセスの最小数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "ポリシー"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "プライバシー設定"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "アクセス拒否"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "サーバー設定"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "サーバー制限設定"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "リクエストに対して、TinyproxyがリッスンするHTTPポートを設定します"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "リクエストに対して、Tinyproxyがリッスンするアドレスを設定します。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Tinyproxyを実行するグループを設定します"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -289,45 +287,45 @@ msgstr ""
 "特定のホストにアクセスする際に使用する、上位のプロキシサーバーを設定します。"
 "書式は <code>アドレス:ポート</code> です。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Tinyproxyを実行するユーザーを設定します"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "状態"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "宛先ホスト"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 "Tinyproxyは、軽量で高速なキャッシュを行わないHTTP(S)-プロキシサーバーです。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "上位のプロキシサーバー"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -335,32 +333,49 @@ msgstr ""
 "特定のIPアドレスやドメインに接続する場合に、上位のプロキシサーバーを使用する"
 "ように設定することができます。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Syslogを使用する"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "ユーザー"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "経由するホスト名"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "経由するプロキシ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "ログファイルの代わりにsyslogへメッセージを記録します"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy ヘッダー"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "転送するリクエストのHTTPヘッダに\"X-Tinyproxy\"及びクライアントIPアドレス"
+#~ "を追加します。"
+
+#~ msgid "Configuration"
+#~ msgstr "設定"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "統計を取得できませんでした URL:"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/ko/tinyproxy.po b/applications/luci-app-tinyproxy/po/ko/tinyproxy.po
index dfcd884708..24240027c0 100644
--- a/applications/luci-app-tinyproxy/po/ko/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ko/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.14-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "설정"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -121,224 +113,239 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "로그 파일"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "상태"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "설정"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/lt/tinyproxy.po b/applications/luci-app-tinyproxy/po/lt/tinyproxy.po
index 3842b9f1be..7526d04352 100644
--- a/applications/luci-app-tinyproxy/po/lt/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/lt/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "1 : 2);\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -25,27 +25,25 @@ msgstr ""
 "prieigą“</em> išjungia bet kokią išsiuntimo srauto įgaliotinį, skirta "
 "taikomajam"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Prideda – „X-Tinyproxy“, „HTTP“ antraštę su kliento IP adresu, į persiųstas "
-"užklausas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Leidžiami klientai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Leidžiami prijungti prievadai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Pririšti adresą"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -54,7 +52,7 @@ msgstr ""
 "naudojamos filtravimui. Įjunkite/Įgalinkite tai, kad suaktyvintumėte "
 "išplėstines reguliariąsias išraiškas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -63,7 +61,7 @@ msgstr ""
 "neskiriančios didžiųjų ir mažųjų raidžių. Įjunkite/Įgalinkite tai, kad "
 "atitiktų didžiosios ir mažosios raidės"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -72,7 +70,7 @@ msgstr ""
 "sričių pavadinimus. Įjunkite/Įgalinkite tai, kad atitiktumėte „URL“– saito "
 "adresus"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -81,59 +79,49 @@ msgstr ""
 "sąrašas. Įjunkite/Įgalinkite šią parinktį, jei norite leisti tik "
 "atitinkančius „URL“ – saitų arba domenų-sričių pavadinimus"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Gali būti IP adresas arba diapazonas, domeno-srities pavadinimas arba – „.“ "
-"bet kuriam skleidėjui/vedėjui be domeno-srities"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Konfigūravimas"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Ryšio pasibaigusios užklausos laikas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Numatytas atmetimas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Įjungti „Tinyproxy“ serverį"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Klaidos puslapis"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Nepavyko gauti statistikos iš „URL“ – saito:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtruoti pagal „RegExp“"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtruoti pagal „URLs“ – saitus"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Filtruoti didžiąsias ir mažąsias raides"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Filtruoti failą"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtravimas ir „ACLs“"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Bendri nustatymai"
 
@@ -141,81 +129,79 @@ msgstr "Bendri nustatymai"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Suteikti „UCI“ prieigą – „luci-app-tinyproxy“"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grupė"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 "„HTML“ šablono failas, skirtas tarnauti skleidėjo/vedėjo statistikos "
 "užklausoms"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "„HTML“ šablono failas, skirtas tarnauti, kai įvyksta „HTTP“ klaidos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Antraštės/-čių leidžiamasis sąrašas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "IP adresų arba diapazonų sąrašas, kuriems yra leidžiama naudoti įgaliotinį "
 "serverį"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Leidžiamų – „CONNECT“ metodo prievadų sąrašas. Viena reikšmė – „0-is“, "
-"visiškai išjungia – „CONNECT“, o tuščias sąrašas leidžia visus prievadus"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Laukti (-iama/-s) prisijungimo/jungties ryšio adresas/-o"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Laukti (-iama/-s) prisijungimo/jungties ryšio prievadui"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Žurnalo failas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Žurnalo failas, skirtas naudoti iškraunant/išklojant pranešimus"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Žurnalo lygis"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "„Tinyproxy“ vyksmo žurnalinimo išsamumas/platumas/daugiažodiškumas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Maksimalus klientų skaičius"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Maksimalios užklausos, vienam serveriui"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Maksimalūs atsarginiai serveriai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 "Maksimalus leistinas vienu metu prijungtų/užmegztų ryšių, klientų skaičius"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -223,55 +209,63 @@ msgstr ""
 "Maksimalus leistinas užklausų skaičius, vienam vyksmui. Jei jis viršijamas, "
 "vyksmas bus paleidžiamas iš naujo. Nulis reiškia neribotas."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Maksimalus paruoštų budinčių vyksmų skaičius"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Maksimalus sekundžių skaičius, kurio neaktyvus ryšys yra laikomas atidarytas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Minimalūs atsarginiai serveriai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Minimalus paruoštų budinčių vyksmų skaičius"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 "Budinčių vyksmų, kuriuos reikia pradėti paleidžiant – „Tinyproxy“, skaičius"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Atviro teksto failas su „URL“ – saitais arba domenais-sritimis, kuriuos "
 "reikia filtruoti. Viena įvestis, kiekvienai eilutėj"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politika"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Privatumo nustatymai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Neleisti prieigos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Serverio nustatymai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Serverio limitai"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -280,36 +274,36 @@ msgstr ""
 "kiti yra atmetami. Palikite tuščią, kad išjungtumėte/išgalintumėte antraštės "
 "filtravimą"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 "Nurodo – „HTTP“ prievadą, prie kurio – „Tinyproxy“ laukia prisijungimo/"
 "jungties ryšio užklausų"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Nurodo – „Tinyproxy“ įrenginio (t.y skleidėjo/vedėjo) pavadinimą, kuris bus "
 "naudojamas – „HTTP“ antraštėje"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Nurodo adresą prie kurio – „Tinyproxy“ prisiriša į, skirtas išsiunčiamoms "
 "persiuntimo užklausoms"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 "Nurodo adresus, prie kurio – „Tinyproxy“ laukia prisijungimo/jungties ryšio "
 "užklausų"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Nurodo grupės pavadinimą, prie kurio veikia – „Tinyproxy“ vyksmas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -318,46 +312,46 @@ msgstr ""
 "taikomąją skleidėją/vedėją. Formatas yra – <code>adresas:prievedas</code> "
 "arba <code>„socks5“ adresas:prievadas</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 "Nurodo naudotojo/vartotojo vardą (t.y. slapyvardį), prie kurio veikia – "
 "„Tinyproxy“ vyksmas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Paleisti atsarginius serverius"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Statistikos puslapis"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Būklė/Būsena"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Taikomasis skleidėjas/vedėjas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "„Tinyproxy“"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "„Tinyproxy“ būsena"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "„Tinyproxy“ yra nedidelė ir greita netalpojantis „HTTP/-S“-įgaliotojas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Išsiunčiamieji/-ojo (srauto) įgaliotieji"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -365,27 +359,61 @@ msgstr ""
 "Išsiunčiamo srauto įgaliotojo taisyklės apibrėžia įgaliotinius serverius, "
 "naudojamus pasiekiant tam tikrus IP adresus ar domenus-sritis."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Naudoti „syslog“"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Naudotojas/Vartotojas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Per įrenginio (t.y skleidėjo/vedėjo) pavadinimas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Per įgaliotąjį"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Įrašo žurnalo pranešimus į „syslog“, vietoj į žurnalo failą"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "„X-Tinyproxy“ antraštė"
+
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Prideda – „X-Tinyproxy“, „HTTP“ antraštę su kliento IP adresu, į "
+#~ "persiųstas užklausas"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Gali būti IP adresas arba diapazonas, domeno-srities pavadinimas arba – "
+#~ "„.“ bet kuriam skleidėjui/vedėjui be domeno-srities"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigūravimas"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Nepavyko gauti statistikos iš „URL“ – saito:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Leidžiamų – „CONNECT“ metodo prievadų sąrašas. Viena reikšmė – „0-is“, "
+#~ "visiškai išjungia – „CONNECT“, o tuščias sąrašas leidžia visus prievadus"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "„Tinyproxy“ būsena"
diff --git a/applications/luci-app-tinyproxy/po/mr/tinyproxy.po b/applications/luci-app-tinyproxy/po/mr/tinyproxy.po
index ea13aeb90a..2e66a7bb2d 100644
--- a/applications/luci-app-tinyproxy/po/mr/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/mr/tinyproxy.po
@@ -14,106 +14,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "कॉन्फिगरेशन"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -121,224 +113,239 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "ऐकण्याचा पत्ता"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "ऐकण्याचा पत्ता"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "लॉग फाइल"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "सर्व्हर सेटिंग्ज"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "स्थिती"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
 
+#~ msgid "Configuration"
+#~ msgstr "कॉन्फिगरेशन"
+
 #~ msgid "Allow access from"
 #~ msgstr "Allow access from"
 
diff --git a/applications/luci-app-tinyproxy/po/ms/tinyproxy.po b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po
index e132a2b56d..bddeb50adf 100644
--- a/applications/luci-app-tinyproxy/po/ms/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ms/tinyproxy.po
@@ -12,106 +12,98 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Konfigurasi"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -119,220 +111,235 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Kumpulan"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Port pendengar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigurasi"
diff --git a/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po b/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po
index ea65c250ad..d6452937f2 100644
--- a/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/nb_NO/tinyproxy.po
@@ -12,106 +12,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Tillatte klienter"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Bind-adresse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Oppsett"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Generelle innstillinger"
 
@@ -119,220 +111,235 @@ msgstr "Generelle innstillinger"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Loggingsnivå"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Bruker"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
+
+#~ msgid "Configuration"
+#~ msgstr "Oppsett"
diff --git a/applications/luci-app-tinyproxy/po/nl/tinyproxy.po b/applications/luci-app-tinyproxy/po/nl/tinyproxy.po
index 94dab9f8cd..8f206f2610 100644
--- a/applications/luci-app-tinyproxy/po/nl/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/nl/tinyproxy.po
@@ -9,106 +9,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -116,220 +108,232 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/pl/tinyproxy.po b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po
index b075359ada..77710676d7 100644
--- a/applications/luci-app-tinyproxy/po/pl/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/pl/tinyproxy.po
@@ -13,7 +13,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -23,27 +23,25 @@ msgstr ""
 "\"upstream proxy\", <em>Odrzuć dostęp</em> wyłącza jakiekolwiek \"upstream "
 "proxy\" dla danego celu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Dodaje nagłówek HTTP \"X-Tinyproxy\" z adresem IP klienta do przekazywanych "
-"żądań"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Dozwolone klienty"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Dozwolone porty połączenia"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Zwiąż adres"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -51,7 +49,7 @@ msgstr ""
 "Domyślnie do filtrowania używane są podstawowe wyrażenia POSIX. Włącz tę "
 "opcję, aby aktywować rozszerzone wyrażenia regularne"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -59,7 +57,7 @@ msgstr ""
 "Domyślnie ciągi filtrowania traktowane są jako wrażliwe na wielkość liter. "
 "Włącz tę opcję, aby dopasowania były wrażliwe na wielkości liter"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -67,7 +65,7 @@ msgstr ""
 "Domyślnie filtrowanie odbywa się na podstawie nazw domen. Włącz tę opcję, "
 "aby zamiast tego dopasowywać do adresów URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -75,59 +73,49 @@ msgstr ""
 "Domyślnie reguły filtrowania działają jako czarna lista. Zaznacz tę opcję, "
 "aby zezwalać wyłącznie na pasujące adresy URL lub nazwy domen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Może być adresem lub zakresem adresów IP, nazwą domeny lub \".\" dla "
-"dowolnego hosta bez domeny"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Limit czasu połączenia"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Domyślnie blokuj"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Włącz serwer Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Strona błędu"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Nieudane pobieranie statystyk z adresu URL:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtruj z użyciem RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtruj według adresów URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Filtr wrażliwy na wielkość liter"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Plik z filtrami"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtrowanie i listy kontroli dostępu (ACL)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Ustawienia główne"
 
@@ -135,79 +123,77 @@ msgstr "Ustawienia główne"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Przyznaj luci-app-tinyproxy dostęp do UCI"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grupa"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "Plik szablonu HTML używany do prezentacji statystyk"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Plik szablonu HTML używany do prezentacji komunikatów błędu"
 
 # Zgaduję, że to ma coś wspólnego z nagłówkami zapytań - stąd takie tłumaczenie.
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Biała lista nagłówków"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Lista adresów IP lub zakresów, które są dopuszczone do korzystania z serwera "
 "proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Lista dozwolonych portów dla metody CONNECT. Pojedyncza wartość „0” "
-"całkowicie wyłącza CONNECT, pusta lista zezwala na wszystkie porty"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Adres nasłuchiwania"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Port nasłuchiwania"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Plik dziennika"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Plik logowania zrzucanych wiadomości"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Poziom logowania"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Szczegółowość logowania procesów Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Maks. klientów"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Maks. żądań na serwer"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Maks. uruchomionych serwerów"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Maksymalna dopuszczalna liczba jednocześnie podłączonych klientów"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -215,54 +201,62 @@ msgstr ""
 "Maksymalna dopuszczalna liczba żądań na proces. Jeśli zostanie przekroczona, "
 "proces zostanie ponownie uruchomiony. Zero oznacza bez limitu."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Maksymalna liczba przygotowanych bezczynnych procesów"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Maksymalna liczba sekund dla podtrzymywania otwartego nieaktywnego połączenie"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. liczba zapasowych serwerów"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Minimalna liczba przygotowanych bezczynnych procesów"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 "Liczba bezczynnych procesów do włączenia podczas uruchamiania Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Plik tekstowy z adresami URL lub domenami do filtrowania. Jeden wpis na linię"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Polityka"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Ustawienia prywatności"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Odmów dostępu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Ustawienia serwera"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Limity serwera"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -270,30 +264,30 @@ msgstr ""
 "Określa nazwy nagłówków HTTP, które mogą zostać przesłane dalej. Pozostałe "
 "będą odrzucone. Pozostaw puste, aby wyłączyć filtrowanie nagłówków"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Określa port, na którym Tinyproxy będzie oczekiwać żądań HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "Określa nazwę hosta używaną przez Tinyproxy w nagłówku HTTP \"Via\""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Określa adres, z którym zostanie powiązany Tinyproxy dla wychodzących "
 "przekazywanych żądań"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Określa adresy, z których Tinyproxy oczekuje żądań"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Określa nazwę grupy, pod jaką będzie pracował proces Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -302,44 +296,44 @@ msgstr ""
 "dostępu do hosta docelowego. Format to <code>adres:port</code> lub "
 "<code>adres:port socks5</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Określa nazwę użytkownika, pod jaką będzie pracował proces Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Uruchamiane serwery zapasowe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Strona statystyk"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Host docelowy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Status serwera Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy to mały i szybki niebuforujący serwer proxy HTTP(S)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Serwery proxy typu upstream"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -347,32 +341,66 @@ msgstr ""
 "Reguły serwerów proxy typu upstream definiują serwery proxy, które mają "
 "zostać użyte w przypadku dostępu do określonych adresów IP lub domen."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Użyj dziennika systemowego"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Użytkownik"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Nazwa hosta \"Via\""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Przez proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Zapisuje komunikaty do dziennika systemowego zamiast pliku dziennika"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Nagłówek X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Dodaje nagłówek HTTP \"X-Tinyproxy\" z adresem IP klienta do "
+#~ "przekazywanych żądań"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Może być adresem lub zakresem adresów IP, nazwą domeny lub \".\" dla "
+#~ "dowolnego hosta bez domeny"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracja"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Nieudane pobieranie statystyk z adresu URL:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Lista dozwolonych portów dla metody CONNECT. Pojedyncza wartość „0” "
+#~ "całkowicie wyłącza CONNECT, pusta lista zezwala na wszystkie porty"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Status serwera Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po
index 400bbe66a4..c07f609e15 100644
--- a/applications/luci-app-tinyproxy/po/pt/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/pt/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,27 +24,25 @@ msgstr ""
 "proxy superior especificado, <em>Rejeitar acesso</em> desativa qualquer "
 "proxy superior para o alvo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Adiciona no cabeçalho do HTTP o campo \"X-Tinyproxy\" com o endereço IP do "
-"cliente para encaminhar a requisição"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clientes permitidos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Portas onde é permitido ligar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Endereço de ligação"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -52,7 +50,7 @@ msgstr ""
 "Por padrão, os filtros usam expressões POSIX básicas. Ative esta opção para "
 "usar expressões regulares extendidas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -60,7 +58,7 @@ msgstr ""
 "Por predefinição, as regras são tratadas como não sensíveis a maiúsculas e "
 "minúsculas. Ative esta opção para diferenciar maiúsculas e minúsculas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -68,7 +66,7 @@ msgstr ""
 "Por padrão, a filtragem é feita baseada nos domínios. Ative esta opção para, "
 "ao invés disto, casar com URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -76,59 +74,49 @@ msgstr ""
 "Por padrão, as regras de filtragem atuam como uma lista negra. Ative esta "
 "opção para somente permitir URLs ou domínios que casem"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Pode ser tanto um como uma faixa de endereços IP, um nome de dompínio ou \"."
-"\" para qualquer computador sem domínio"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configuração"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Tempo limite de conexão"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Nege por padrão"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Ativar servidor Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Página de erro"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Falhou ao tentar obter estatísticas da URL:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrar por Expressão Regular"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrar por URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Diferenciar maiúsculo/minúsculo no filtro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Ficheiro de filtro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtragem e ACLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Configurações gerais"
 
@@ -136,78 +124,76 @@ msgstr "Configurações gerais"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Conceder UCI acesso ao luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grupo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 "Modelo de ficheiro HTML para servir para requisições de estado do computador"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Modelo de ficheiro HTML para servir quando ocorrer error HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Lista branca do cabeçalho"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Lista ou faixa de endereços IP a quem é permitido o uso do servidor proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Lista de portas permitidas para o método CONNECT. Um único valor \"0\" "
-"desativa o CONNECT completamente, uma lista vazia permite todas as portas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Endereço de escuta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Porto de escuta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Ficheiro de log"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Ficheiro de registro usado para despejar as mensagens"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Nível de registo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Detalhamento dos registors do Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Quantidade máxima de clientes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Quantidade máxima de requisições por servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. servidores sobressalentes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Numero máximo permitido de cliente conectados concorrentemente"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -215,53 +201,61 @@ msgstr ""
 "Quantidade máxima de requisições permitidas por processo. Se este limite é "
 "excedido, o processo é redisparado. Zero significa ilimitado."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Número máximo de processos em espera preparados"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Quantidade máxima de segundos que uma conexão inativa é mantida aberta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. servidores sobressalentes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Número mínimo de processos em espera preparados"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Número de processos em espera iniciado quando o Tinyproxy é disparado"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Ficheiro de texto simples com as URLs ou os domínios para filtrar. Uma "
 "entrada por linha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Política"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Definições de Privacidade"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Rejeitar o acesso"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Limites do servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -269,33 +263,33 @@ msgstr ""
 "Especifica os nomes dos cabeçalhos HTTP que serão permitidos, todos outros "
 "serão descartados. Deixe em branco para desativar a filtragem de cabeçalho"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Especifica a porta na qual o Tinyproxy escutará pelas requisições"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Especifica o nome do computador que o Tinyproxy usará no cabeçalho HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Especifica o endereço que o Tinyproxy utilizará para encaminhar as "
 "requisições"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Especifica o endereço no qual o Tinyproxy escutará pelas requisições"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 "Especifica o nome do grupo que através do qual o processo do Tinyproxy é "
 "executado"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -303,45 +297,45 @@ msgstr ""
 "Especifica o proxy superior para usar quando acessar o alvo. Formato é "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 "Especifica o nome do utilizador com o qual o processo do Tinyproxy rodará"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Iniciar servidores suplentes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Página de estatística"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Estado"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Host de destino"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Estado do Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Proxies superiores"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -349,32 +343,66 @@ msgstr ""
 "As regras do proxy superior define os servidores de proxy para uso quando "
 "certos endereços IP ou domínios forem acessados."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Usar o syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Utilizador"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Via nome do computador"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Escreve as mensagens para o syslog ao invés do ficheiro de log"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Cabeçalho do X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Adiciona no cabeçalho do HTTP o campo \"X-Tinyproxy\" com o endereço IP "
+#~ "do cliente para encaminhar a requisição"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Pode ser tanto um como uma faixa de endereços IP, um nome de dompínio ou "
+#~ "\".\" para qualquer computador sem domínio"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuração"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Falhou ao tentar obter estatísticas da URL:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Lista de portas permitidas para o método CONNECT. Um único valor \"0\" "
+#~ "desativa o CONNECT completamente, uma lista vazia permite todas as portas"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Estado do Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po b/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po
index 66c7943dd7..049e2aef18 100644
--- a/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/pt_BR/tinyproxy.po
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -24,27 +24,25 @@ msgstr ""
 "proxy superior especificado, <em>Rejeitar acesso</em> desabilita qualquer "
 "proxy superior para o alvo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Adiciona no cabeçalho do HTTP o campo \"X-Tinyproxy\" com o endereço IP do "
-"cliente para encaminhar a requisição"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clientes permitidos"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Portas de conexão permitidas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Vincular endereço"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -52,7 +50,7 @@ msgstr ""
 "Por padrão, os filtros usam expressões POSIX básicas. Habilite esta opção "
 "para usar expressões regulares extendidas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -60,7 +58,7 @@ msgstr ""
 "Por padrão, as regras são tratadas como insensíveis a caixa. Habilite esta "
 "opção para diferenciar maiúsculas e minúsculas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -68,7 +66,7 @@ msgstr ""
 "Por padrão, a filtragem é feita baseada nos domínios. Habilite esta opção "
 "para, ao invés disto, casar com URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -76,59 +74,49 @@ msgstr ""
 "Por padrão, as regras de filtragem atuam como uma lista negra. Habilite esta "
 "opção para somente permitir URLs ou domínios que casem"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Pode ser tanto um como uma faixa de endereços IP, um nome de dompínio ou \"."
-"\" para qualquer computador sem domínio"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configuração"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Tempo limite de conexão"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Nege por padrão"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Habilitar o servidor Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Página de erro"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Falhou ao tentar obter estatísticas da URL:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrar por Expressão Regular"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrar por URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Diferenciar maiúsculo/minúsculo no filtro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Arquivo de filtro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtragem e ACLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Configurações gerais"
 
@@ -136,78 +124,76 @@ msgstr "Configurações gerais"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Conceda acesso UCI ao luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grupo"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 "Modelo de arquivo HTML para servir para requisições de estado do computador"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Modelo de arquivo HTML para servir quando ocorrer error HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Lista branca do cabeçalho"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Lista ou faixa de endereços IP a quem é permitido o uso do servidor proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Lista das portas permitidas com o método CONNECT. Um único valor \"0\" "
-"desativa totalmente o CONNECT, uma lista vazia permite todas as portas"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Endereço de escuta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Porta de escuta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Arquivo log"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Arquivo de registro usado para despejar as mensagens"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Nível do registro do log"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Detalhamento dos registors do Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Número máximo de clientes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Numero máximo de requisições por servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. servidores sobressalentes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Numero máximo permitido de cliente conectados concorrentemente"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -215,53 +201,61 @@ msgstr ""
 "Numero máximo de requisições permitidas por processo. Se este limite é "
 "excedido, o processo é redisparado. Zero significa ilimitado."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Número máximo de processos em espera preparados"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Número máximo de segundos que uma conexão inativa é mantida aberta"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Número mínimo de servidores sobressalentes"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Número mínimo de processos em espera preparados"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Número de processos em espera iniciado quando o Tinyproxy é disparado"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Arquivo de texto simples com as URLs ou os domínios para filtrar. Uma "
 "entrada por linha"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Política"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Configurações de privacidade"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Rejeitar acesso"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Limites do servidor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -270,31 +264,31 @@ msgstr ""
 "demais serão descartados. Deixe em branco para desabilitar a filtragem de "
 "cabeçalho"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Especifica a porta na qual o Tinyproxy escutará pelas requisições"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Especifica o nome do computador que o Tinyproxy usará no cabeçalho HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Especifica o endereço que o Tinyproxy utilizará para encaminhar as "
 "requisições"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Especifica o endereço no qual o Tinyproxy escutará pelas requisições"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Especifica o nome do grupo com o qual o processo do Tinyproxy rodará"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -302,44 +296,44 @@ msgstr ""
 "Especifica o proxy superior para usar quando acessar o alvo. Formato é "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Especifica o nome do usuário com o qual o processo do Tinyproxy rodará"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Dispare servidores de espera"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Página de estatística"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Host de destino"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Condição Geral do Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte a cache"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Proxies superiores"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -347,34 +341,68 @@ msgstr ""
 "As regras do proxy superior define os servidores de proxy para uso quando "
 "certos endereços IP ou domínios forem acessados."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Use o syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Usuário"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Via nome do computador"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Através de proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 "Escreve as mensagens de registros para o syslog ao invéz do arquivo de "
 "registro"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Cabeçalho do X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Adiciona no cabeçalho do HTTP o campo \"X-Tinyproxy\" com o endereço IP "
+#~ "do cliente para encaminhar a requisição"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Pode ser tanto um como uma faixa de endereços IP, um nome de dompínio ou "
+#~ "\".\" para qualquer computador sem domínio"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuração"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Falhou ao tentar obter estatísticas da URL:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Lista das portas permitidas com o método CONNECT. Um único valor \"0\" "
+#~ "desativa totalmente o CONNECT, uma lista vazia permite todas as portas"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Condição Geral do Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/ro/tinyproxy.po b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po
index b4e2ff8a7d..36d298fd37 100644
--- a/applications/luci-app-tinyproxy/po/ro/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ro/tinyproxy.po
@@ -13,7 +13,7 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -23,27 +23,25 @@ msgstr ""
 "proxy-ului din amonte specificat, <em>Reject access</em> dezactivează orice "
 "proxy din amonte pentru țintă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Adaugă un antet HTTP \"X-Tinyproxy\" cu adresa IP a clientului la cererile "
-"redirecționate"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clienți autorizați"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Porturi de conectare permise"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Adresa legată"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -51,7 +49,7 @@ msgstr ""
 "În mod implicit, pentru filtrare se utilizează expresii POSIX de bază. "
 "Activați această opțiune pentru a activa expresiile regulate extinse"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -60,7 +58,7 @@ msgstr ""
 "cont de majuscule și minuscule. Activați această opțiune pentru a face ca "
 "potrivirea să fie sensibilă la majuscule și minuscule"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -68,7 +66,7 @@ msgstr ""
 "În mod implicit, filtrarea se face pe baza numelor de domenii. Activați "
 "această opțiune pentru a se potrivi cu URL-urile"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -77,59 +75,49 @@ msgstr ""
 "această opțiune pentru a permite doar URL-urile sau numele de domenii "
 "corespunzătoare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Poate fi fie o adresă sau un interval IP, un nume de domeniu sau \".\" "
-"pentru orice gazdă fără domeniu"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Configurație"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Timeout de conectare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Refuz implicit"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Activați serverul Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Pagina de eroare"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Nu a reușit să recupereze statisticile din url:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrează după RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrare după URL-uri"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Filtrare sensitivă în funcție de majuscule și minuscule"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Fișier de filtrare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtrare și ACL-uri"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Setări generale"
 
@@ -137,78 +125,76 @@ msgstr "Setări generale"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Acordă acces la UCI pentru luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grup"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "Fișier de șablon HTML pentru a servi pentru cererile de stat gazdă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Fișier șablon HTML pentru a servi atunci când apar erori HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Lista albă a antetului"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Lista adreselor IP sau a intervalelor de adrese IP care au permisiunea de a "
 "utiliza serverul proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Lista de porturi permise pentru metoda CONNECT. O singură valoare \"0\" "
-"dezactivează complet CONNECT, o listă goală permite toate porturile"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Adresa de ascultare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Port de ascultare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Fișier jurnal"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Fișier jurnal de utilizat pentru descărcarea mesajelor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Nivel de jurnal"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Verbalizarea procesului de logare a Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Maxim de clienți"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Solicitări maxime pe server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Max. servere de rezervă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Numărul maxim permis de clienți conectați concomitent"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -216,53 +202,61 @@ msgstr ""
 "Numărul maxim permis de cereri pe proces. În cazul în care este depășit, "
 "procesul este repornit. Zero înseamnă nelimitat."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Numărul maxim de procese inactive pregătite"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Numărul maxim de secunde în care o conexiune inactivă este menținută deschisă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. servere de rezervă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Numărul minim de procese inactive pregătite"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Numărul de procese inactive care trebuie pornite la lansarea Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Fișier de text simplu cu URL-uri sau domenii de filtrat. O intrare pe linie"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politica"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Setări de confidențialitate"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Respingeți accesul"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Setări server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Limitele serverului"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -270,31 +264,31 @@ msgstr ""
 "Specifică numele antetului HTTP care pot fi transmise, toate celelalte sunt "
 "eliminate. Lăsați gol pentru a dezactiva filtrarea antetului"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Specifică portul HTTP pe care Tinyproxy îl ascultă pentru solicitări"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Specifică numele de gazdă Tinyproxy care trebuie utilizat în antetul Via HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Specifică adresa la care Tinyproxy se leagă pentru cererile de expediere "
 "către exterior"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Specifică adresele pe care Tinyproxy le ascultă pentru cereri"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Specifică numele grupului sub care se execută procesul Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -302,44 +296,44 @@ msgstr ""
 "Specifică proxy-ul din amonte care urmează să fie utilizat pentru accesarea "
 "gazdei țintă. Formatul este <code>adresa:port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Specifică numele de utilizator cu care se execută procesul Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Porniți serverele de rezervă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Pagina de statistici"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Stare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Gazda țintă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Starea Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy este un mic și rapid non-caching HTTP(S)-Proxy mic și rapid"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Proxies în amonte"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -347,32 +341,66 @@ msgstr ""
 "Regulile proxy în amonte definesc serverele proxy care trebuie utilizate la "
 "accesarea anumitor adrese IP sau domenii."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Utilizați syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Utilizator"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Prin numele de gazdă"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Prin proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Scrie mesajele de jurnal în syslog în loc de un fișier de jurnal"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy antet"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Adaugă un antet HTTP \"X-Tinyproxy\" cu adresa IP a clientului la "
+#~ "cererile redirecționate"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Poate fi fie o adresă sau un interval IP, un nume de domeniu sau \".\" "
+#~ "pentru orice gazdă fără domeniu"
+
+#~ msgid "Configuration"
+#~ msgstr "Configurație"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Nu a reușit să recupereze statisticile din url:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Lista de porturi permise pentru metoda CONNECT. O singură valoare \"0\" "
+#~ "dezactivează complet CONNECT, o listă goală permite toate porturile"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Starea Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po
index 70ff852cc0..e6282e8ea4 100644
--- a/applications/luci-app-tinyproxy/po/ru/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/ru/tinyproxy.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -26,27 +26,25 @@ msgstr ""
 "указанный внешний прокси-сервер, <em>'Отклонять доступ'</em> отключает "
 "использование внешних прокси-серверов для всех узлов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Добавляет HTTP-заголовок 'X-Tinyproxy' с IP-адресом клиента для "
-"перенаправленных запросов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Разрешённые клиенты"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Разрешенные<br />порты подключения"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Адрес сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -54,7 +52,7 @@ msgstr ""
 "По умолчанию для фильтрации используются базовые POSIX-выражения.<br /"
 ">Включить эту функцию для активации расширенных регулярных выражений"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -62,7 +60,7 @@ msgstr ""
 "По умолчанию строки фильтрации регистро-независимы.<br />Включите эту опцию, "
 "чтобы сделать сравнение регистро-зависимым"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -70,7 +68,7 @@ msgstr ""
 "По умолчанию фильтрация выполняется на основе доменных имен.<br />Включите "
 "это для сопоставления с URL-адресами"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -78,59 +76,49 @@ msgstr ""
 "По умолчанию правила фильтрации действуют как Черный список.<br />Включите "
 "эту опцию, чтобы разрешить только совпадающие URL-адреса или имена доменов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Может быть IP-адресом, диапазоном, именем домена или '.' для любого хоста "
-"без домена"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Конфигурация"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Время ожидания соединения"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Запретить по умолчанию"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Включить сервер Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Страница ошибки"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Не удалось получить статистику по URL-адресу:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Фильтровать по регулярным выражениям (RegExp)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Фильтровать<br /> по URL-адресам"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Фильтровать<br />с учетом регистра"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Файл фильтрации"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Фильтрация и списки ACL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Основные настройки"
 
@@ -138,77 +126,75 @@ msgstr "Основные настройки"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Предоставить UCI доступ для luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Группа"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "HTML-файл шаблона для вывода статистики запросов хоста"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTML-файл шаблона для вывода ошибок HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Белый список заголовков"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Список или диапазон IP-адресов, которым разрешено использовать прокси-сервер"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Список разрешённых портов для метода CONNECT. Значение \"0\" выключает "
-"CONNECT полностью. Пустой список разрешает для всех портов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Адрес сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Порт сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Файл журнала"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Задайте расположение файла журнала Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Уровень журналирования"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Настройка подробной записи в журнал процессов Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Максимальное кол-во<br />клиентов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Максимальное кол-во<br />запросов на сервер"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Максимальное кол-во<br />серверов ожидания"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Максимально допустимое число параллельно подключенных клиентов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -216,55 +202,63 @@ msgstr ""
 "Максимальное допустимое число запросов для каждого процесса.<br />Если "
 "превышено, процесс будет перезапущен. Ноль означает неограниченное."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Максимальное количество подготовленных бездействующих процессов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 "Максимальное количество секунд, в течение которых неактивное соединение "
 "удерживается открытым"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Минимальное кол-во<br />серверов ожидания"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Минимальное количество подготовленных бездействующих процессов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Количество бездействующих процессов, запускаемых при запуске Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Текстовый файл с URL-адресами или доменами для фильтрации. Одна запись - "
 "одна строка"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Политика"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Настройки конфиденциальности"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Отклонять доступ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Настройки сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Ограничения сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -272,31 +266,31 @@ msgstr ""
 "Задайте имена HTTP-заголовков, которые разрешено передавать, все остальные "
 "отбрасываются.<br />Оставьте пустым, чтобы отключить фильтрацию заголовков"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Задайте HTTP-порт Tinyproxy для входящих соединений"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "Задайте имя хоста Tinyproxy, которое будет использовано в HTTP-заголовке"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Задайте адрес, к которому привязывается Tinyproxy для отправки "
 "перенаправленных исходящих запросов"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Задайте адрес на котором Tinyproxy будет ожидать входящие соединения"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Задайте имя группы, в которой работает Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -304,44 +298,44 @@ msgstr ""
 "Указывает прокси-сервер, используемый для доступа к целевому хосту. Формат "
 "следующий <code>адрес:порт</code> или <code>socks5 адрес:порт</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Задайте пользователя, от имени которого работает Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Запустить запасные сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Страница статистики"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Статус"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Хост назначения"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Состояние Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy - небольшой и быстрый HTTP(S)-прокси, не использующий кэш"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Прокси внешней сети"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -349,34 +343,68 @@ msgstr ""
 "Правила трафика для внешних прокси-серверов, для использования при доступе к "
 "определенным IP-адресам или доменам."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Системный журнал"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Пользователь"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Имя хоста"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Через прокси"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 "Записывать сообщения журнала в общий системный журнал.<br />Вместо "
 "отдельного файла журнала Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Заголовок X-Tinyproxy"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Добавляет HTTP-заголовок 'X-Tinyproxy' с IP-адресом клиента для "
+#~ "перенаправленных запросов"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Может быть IP-адресом, диапазоном, именем домена или '.' для любого хоста "
+#~ "без домена"
+
+#~ msgid "Configuration"
+#~ msgstr "Конфигурация"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Не удалось получить статистику по URL-адресу:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Список разрешённых портов для метода CONNECT. Значение \"0\" выключает "
+#~ "CONNECT полностью. Пустой список разрешает для всех портов"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Состояние Tinyproxy"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po
index 35c143ec70..0c52070003 100644
--- a/applications/luci-app-tinyproxy/po/sk/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/sk/tinyproxy.po
@@ -12,106 +12,98 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.14.1\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Konfigurácia"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -119,220 +111,235 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Skupina"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Počúvajúci port"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Nastavenia servera"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Stav"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Používateľ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigurácia"
diff --git a/applications/luci-app-tinyproxy/po/sv/tinyproxy.po b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po
index 277ab24d73..d9a764030c 100644
--- a/applications/luci-app-tinyproxy/po/sv/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/sv/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -22,27 +22,25 @@ msgstr ""
 "angivna uppströmsproxyn, <em>Neka åtkomst</em> inaktiverar någon "
 "uppströmsproxy för det målet"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Lägger till en \"X-Tinyproxy\" HTTP-header med klientens IP-adress till "
-"vidarebefordrade förfrågningar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Tillåtna klienter"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Tillåtna portar för anslutning"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Bindningsadress"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -50,7 +48,7 @@ msgstr ""
 "Huvudsakliga POSIX-uttryck används för filtrering. Aktivera det här för att "
 "aktivera ordinarie förlängda uttryck"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -58,7 +56,7 @@ msgstr ""
 "Filtrens strängar behandlas som skriftlägeskänsliga. Aktivera det här för "
 "att göra matchningen skriftlägeskänslig"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -66,7 +64,7 @@ msgstr ""
 "Filtrering görs baserat på domännamn som standard. Aktivera det här för att "
 "matcha mot URL:er istället"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -74,59 +72,49 @@ msgstr ""
 "Filterreglerna agerar som en svartlista som standard. Aktivera det här "
 "alternativet för att endast tillåta matchade URL:er eller domännamn"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Kan antingen vara en IP-adress eller räckvidd, ett domännamn eller \".\" för "
-"någon värd utan en domän"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Tidsgräns för anslutning"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Neka som standard"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Aktivera Tinyproxy-server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Fel-sida"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Misslyckades med att ta emot statistik från url:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Filtrera efter RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Filtrera efter URL:er"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Filtrera skriftlägeskänslig"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Filtrera fil"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtrering och ACL:er"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Generella inställningar"
 
@@ -134,153 +122,161 @@ msgstr "Generella inställningar"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grupp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Lyssningsadress"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Lyssningsport"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Loggfil"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Loggfil som ska användas för dumpningsmeddelanden"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Logg-nivå"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Maximalt antalet klienter"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Maximalt antalet förfrågningar per server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Maximalt antalet reserv-servrar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Maximalt antal sekunder som en inaktiv anslutning hålls öppen"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Villkor"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Integritetsinställningar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Neka åtkomst"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Server-inställningar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Gräns för server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Anger HTTP-porten som Tinyproxy lyssnar med efter förfrågningar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Anger adressen som Tinyproxy binder till för utgående vidarebefordrade "
 "förfrågningar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Anger adresserna som Tinyproxy lyssnar på efter förfrågningar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Anger gruppnamnet som Tinyproxy-processen körs som"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -288,70 +284,97 @@ msgstr ""
 "Anger uppström-proxyn att använda för åtkomst till målvärden. Formatet är "
 "<code>adress:port</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Anger användarnamnet som Tinyproxy-processen körs som"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Starta reserv-servrar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Sida för statistik"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Målvärd"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Status för Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy är en liten och snabb icke-cachande HTTP(S)-proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Proxy-servrar uppströms"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Använd systemlogg"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Användare"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Via värdnamn"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Via proxy-server"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Skriver loggmeddelanden till systemloggen istället för en logg-fil"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "Header för X-Tinyproxy"
+
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Lägger till en \"X-Tinyproxy\" HTTP-header med klientens IP-adress till "
+#~ "vidarebefordrade förfrågningar"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Kan antingen vara en IP-adress eller räckvidd, ett domännamn eller \".\" "
+#~ "för någon värd utan en domän"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Misslyckades med att ta emot statistik från url:"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Status för Tinyproxy"
diff --git a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot
index a59048b730..ada9e78c1f 100644
--- a/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot
+++ b/applications/luci-app-tinyproxy/po/templates/tinyproxy.pot
@@ -1,106 +1,98 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr ""
 
@@ -108,220 +100,232 @@ msgstr ""
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/tr/tinyproxy.po b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po
index df8050d1c2..a5b4fe3f28 100644
--- a/applications/luci-app-tinyproxy/po/tr/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/tr/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -22,27 +22,25 @@ msgstr ""
 "aracılığıyla belirli hedefe yönlendirir, <em>Erişimi reddet</em>, hedef için "
 "herhangi bir yukarı akış proxy'sini devre dışı bırakır"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Yönlendirilen isteklere istemci IP adresini içeren bir \"X-Tinyproxy\" HTTP "
-"üstbilgisi ekler"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "İzin verilen istemciler"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "İzin verilen bağlantı noktaları"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Bağlantı adresi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -50,7 +48,7 @@ msgstr ""
 "Varsayılan olarak, filtreleme için temel POSIX ifadeleri kullanılır. "
 "Genişletilmiş normal ifadeleri etkinleştirmek için bunu etkinleştirin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -58,7 +56,7 @@ msgstr ""
 "Varsayılan olarak, filtre dizeleri büyük / küçük harfe duyarlı değildir. "
 "Eşleşmeyi büyük / küçük harfe duyarlı yapmak için bunu etkinleştirin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -66,7 +64,7 @@ msgstr ""
 "Varsayılan olarak filtreleme, alan adlarına göre yapılır. Bunun yerine "
 "URL'lerle eşleşmesi için bunu etkinleştirin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -75,59 +73,49 @@ msgstr ""
 "eşleşen URL'lere veya alan adlarına izin vermek için bu seçeneği "
 "etkinleştirin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Bir IP adresi veya aralığı, bir alan adı veya etki alanı olmayan herhangi "
-"bir ana bilgisayar için \".\" olabilir"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Yapılandırma"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Bağlantı zamanaşımı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Varsayılan reddet"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Tinyproxy sunucusunu etkinleştir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Hata sayfası"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Şu url'den istatistikler alınamadı:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "RegExp'e göre filtrele"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "URL'lere göre filtrele"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Büyük / küçük harfe duyarlı filtre"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Dosyayı filtrele"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Filtreleme ve ACL'ler"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Genel Ayarlar"
 
@@ -135,79 +123,76 @@ msgstr "Genel Ayarlar"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "luci-app-tinyproxy için UCI erişimi verin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Grup"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "İstatistik ana bilgisayar istekleri için sunulacak HTML şablon dosyası"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTTP hataları oluştuğunda sunulacak HTML şablon dosyası"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Üstbilgi beyaz listesi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 "Proxy sunucusunu kullanmasına izin verilen IP adreslerinin veya aralıkların "
 "listesi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"CONNECT yöntemi için izin verilen bağlantı noktalarının listesi. Tek bir \"0"
-"\" değeri CONNECT yöntemini tamamen devre dışı bırakır, boş bir liste tüm "
-"bağlantı noktalarına izin verir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Dinleme adresi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Dinleme bağlantı noktası"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Günlük kaydı dosyası"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "İletileri dökmek için kullanılacak günlük dosyası"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Tinyproxy sürecinin günlüğe kaydetme ayrıntı düzeyi"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Maks. istemci sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "Maks. sunucu başına istek sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Maks. yedek sunucu sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "İzin verilen maksimum eşzamanlı bağlı istemci sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -215,53 +200,61 @@ msgstr ""
 "İşlem başına izin verilen maksimum istek sayısı. Aşılırsa işlem yeniden "
 "başlatılır. Sıfır, sınırsız demektir."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Maksimum hazırlanan boşta işlem sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Etkin olmayan bir bağlantının açık tutulacağı maksimum saniye sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Min. yedek sunucu sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Minimum hazırlanan boşta işlem sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Tinyproxy başlatılırken başlatılacak boşta işlemlerinin sayısı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 "Filtrelenecek URL'ler veya alanlar içeren düz metin dosyası. Her satıra bir "
 "giriş"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Politika"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Gizlilik ayarları"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Erişimi reddet"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Sunucu Ayarları"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Sunucu sınırları"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -269,30 +262,30 @@ msgstr ""
 "Geçişine izin verilen HTTP başlık adlarını belirtir, diğerlerinin tümü "
 "atılır. Başlık filtrelemeyi devre dışı bırakmak için boş bırakın"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Tinyproxy'nin istekler için dinlediği HTTP bağlantı noktasını belirtir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 "HTTP aracılığıyla başlığında kullanılacak Tinyproxy ana bilgisayar adını "
 "belirtir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr "Tinyproxy'nin giden iletilen istekler için bağlandığı adresi belirtir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Tinyproxy'nin istekler için dinlediği adresleri belirtir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Tinyproxy işleminin çalıştığı grup adını belirtir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -300,44 +293,44 @@ msgstr ""
 "Hedef ana bilgisayara erişmek için kullanılacak yukarı akış proxy'sini "
 "belirtir. Biçim, <code>address:port</code> şeklindedir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Tinyproxy işleminin çalıştığı kullanıcı adını belirtir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Yedek sunucuları başlat"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "İstatistikler sayfası"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Durum"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Hedef ana bilgisayar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Tinyproxy Durumu"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy, küçük ve hızlı bir önbelleğe almayan HTTP(S) -Proxy'sidir"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Yukarı Akış Proxy'leri"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -345,32 +338,67 @@ msgstr ""
 "Yukarı akış proxy kuralları, belirli IP adreslerine veya etki alanlarına "
 "erişirken kullanılacak proxy sunucularını tanımlar."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Sistem günlüğü kullan"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Kullanıcı"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Ana bilgisayar adı aracılığıyla"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Proxy aracılığıyla"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Günlük mesajlarını bir günlük dosyası yerine syslog'a yazar"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy başlığı"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Yönlendirilen isteklere istemci IP adresini içeren bir \"X-Tinyproxy\" "
+#~ "HTTP üstbilgisi ekler"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Bir IP adresi veya aralığı, bir alan adı veya etki alanı olmayan herhangi "
+#~ "bir ana bilgisayar için \".\" olabilir"
+
+#~ msgid "Configuration"
+#~ msgstr "Yapılandırma"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Şu url'den istatistikler alınamadı:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "CONNECT yöntemi için izin verilen bağlantı noktalarının listesi. Tek bir "
+#~ "\"0\" değeri CONNECT yöntemini tamamen devre dışı bırakır, boş bir liste "
+#~ "tüm bağlantı noktalarına izin verir"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Tinyproxy Durumu"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr ""
diff --git a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po
index 3e7b7ad3d2..f8f7626335 100644
--- a/applications/luci-app-tinyproxy/po/uk/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/uk/tinyproxy.po
@@ -13,7 +13,7 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.8-rc\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -23,101 +23,91 @@ msgstr ""
 "вказаний зовнішній проксі-сервер, <em>'Відхиляти доступ'</em> відключає "
 "використання зовнішніх проксі-серверів для всіх вузлів"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Додає HTTP-заголовок \"X-Tinyproxy\" з IP-адресою клієнта до перенаправлених "
-"запитів"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Дозволені клієнти"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Конфігурація"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr ""
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Загальні параметри"
 
@@ -125,220 +115,242 @@ msgstr "Загальні параметри"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Група"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Адреса для прослуховування"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Порт для прослуховування"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Файл звіту"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Рівень журналу"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Політика"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Налаштування сервера"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Стан"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
-msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Користувач"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr ""
+
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Додає HTTP-заголовок \"X-Tinyproxy\" з IP-адресою клієнта до "
+#~ "перенаправлених запитів"
+
+#~ msgid "Configuration"
+#~ msgstr "Конфігурація"
diff --git a/applications/luci-app-tinyproxy/po/vi/tinyproxy.po b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po
index 32f45ba0d3..262762911d 100644
--- a/applications/luci-app-tinyproxy/po/vi/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/vi/tinyproxy.po
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.18.1\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -26,27 +26,25 @@ msgstr ""
 "proxy ngược dòng được chỉ định,<em>từ chối truy cập</em> vô hiệu hóa mọi "
 "proxy ngược dòng cho mục tiêu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
 msgstr ""
-"Thêm tiêu đề HTTP \"X-Tinyproxy\" với địa chỉ IP của máy khách vào các yêu "
-"cầu được chuyển tiếp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "Clients được phép"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "Cổng kết nối được phép"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "Địa chỉ ràng buộc (Bind address)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
@@ -54,7 +52,7 @@ msgstr ""
 "Theo mặc định, các biểu thức POSIX cơ bản được sử dụng để lọc. Kích hoạt "
 "tính năng này để kích hoạt các biểu thức chính quy mở rộng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
@@ -62,7 +60,7 @@ msgstr ""
 "Theo mặc định, các chuỗi bộ lọc được coi là không phân biệt chữ hoa chữ "
 "thường. Kích hoạt tính năng này để phân biệt chữ hoa chữ thường"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
@@ -70,7 +68,7 @@ msgstr ""
 "Theo mặc định, quá trình lọc được thực hiện dựa trên tên miền. Thay vào đó, "
 "hãy bật tính năng này để đối sánh với các URL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
@@ -78,59 +76,49 @@ msgstr ""
 "Theo mặc định, các quy tắc bộ lọc hoạt động như danh sách đen. Bật tùy chọn "
 "này để chỉ cho phép các URL hoặc tên miền phù hợp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
 msgstr ""
-"Có thể là địa chỉ hoặc dải IP, tên miền hoặc \".\" cho bất kỳ máy chủ nào "
-"không có tên miền"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "Cấu hình"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "Quá thời gian kết nối"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "Từ chối mặc định"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "Kích hoạt máy chủ Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "Error page"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "Không thể truy xuất số liệu thống kê từ url:"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "Lọc bởi RegExp"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "Lọc bởi URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "Lọc phân biệt chữ hoa chữ thường"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "Lọc tập tin"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "Lọc và ACL"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "Cài đặt chung"
 
@@ -138,77 +126,74 @@ msgstr "Cài đặt chung"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "Cấp quyền truy cập UCI cho luci-app-tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "Nhóm"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "Tệp mẫu HTML để phục vụ cho các yêu cầu máy chủ thống kê"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "Tệp mẫu HTML để phục vụ khi xảy ra lỗi HTTP"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "Danh sách trắng tiêu đề"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr "Danh sách địa chỉ IP hoặc dải được phép sử dụng máy chủ proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
 msgstr ""
-"Danh sách các cổng được phép cho phương thức CONNECT. Một giá trị duy nhất "
-"\"0\" vô hiệu hóa KẾT NỐI hoàn toàn, một danh sách trống cho phép tất cả các "
-"cổng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "Địa chỉ lắng nghe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "Cổng để lắng nghe"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "Tệp nhật ký"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "Tệp nhật ký để sử dụng để kết xuất thư"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "Cấp độ log"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Ghi nhật ký chi tiết của quy trình Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "Số lượng tối đa máy khách"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "tối đa, yêu cầu trên mỗi máy chủ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "Tối đa spare servers"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "Số lượng khách hàng được kết nối đồng thời tối đa"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
@@ -216,51 +201,59 @@ msgstr ""
 "Số lượng yêu cầu tối đa cho phép trên mỗi quy trình. Nếu vượt quá, quá trình "
 "sẽ được khởi động lại. Không có nghĩa là không giới hạn."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "Số lượng quá trình nhàn rỗi đã chuẩn bị tối đa"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "Số giây tối đa mà một kết nối không hoạt động được giữ mở"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "Tối thiểu spare servers"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "Số lượng quy trình đã chuẩn bị tối thiểu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "Số lượng quá trình nhàn rỗi để bắt đầu khi khởi chạy Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr "Tệp văn bản gốc có URL hoặc tên miền để lọc. Một mục trên mỗi dòng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "Chính sách"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "Thiết lập riêng tư"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "Từ chối truy cập"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "Cài đặt máy chủ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "Giới hạn máy chủ"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
@@ -268,29 +261,29 @@ msgstr ""
 "Chỉ định tên tiêu đề HTTP được phép đi qua, tất cả các tiêu đề khác sẽ bị "
 "loại bỏ. Để vô hiệu hóa bộ lọc tiêu đề, hãy để trống"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Chỉ định cổng HTTP mà Tinyproxy đang lắng nghe để nhận các yêu cầu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "Chỉ định tên máy chủ Tinyproxy để sử dụng trong tiêu đề HTTP \"Via\""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr ""
 "Chỉ định địa chỉ mà Tinyproxy ràng buộc để chuyển tiếp các yêu cầu đi ra"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "Chỉ định các địa chỉ mà Tinyproxy đang lắng nghe để nhận các yêu cầu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "Chỉ định tên nhóm mà quy trình Tinyproxy đang chạy dưới dạng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
@@ -298,44 +291,44 @@ msgstr ""
 "Chỉ định proxy upstream để sử dụng để truy cập vào máy chủ mục tiêu. Định "
 "dạng là <code>địa chỉ:cổng</code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "Chỉ định tên người dùng mà quy trình Tinyproxy đang chạy dưới dạng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "Bắt đầu các máy chủ dự phòng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "Trang thống kê"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "Trạng thái"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "Host mục tiêu"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Trạng thái của Tinyproxy"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy là một proxy nhỏ và nhanh không-cạc HTTP(S)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "Các proxy upstream"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
@@ -343,31 +336,66 @@ msgstr ""
 "Các quy tắc proxy upstream xác định các máy chủ proxy được sử dụng khi truy "
 "cập vào các địa chỉ IP hoặc tên miền cụ thể."
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "Sử dụng syslog"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "Người dùng"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "Qua tên máy chủ (hostname)"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "Qua proxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "Ghi các thông báo nhật ký vào syslog thay vì một tệp nhật ký"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy header"
 
+#~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr ""
+#~ "Thêm tiêu đề HTTP \"X-Tinyproxy\" với địa chỉ IP của máy khách vào các "
+#~ "yêu cầu được chuyển tiếp"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr ""
+#~ "Có thể là địa chỉ hoặc dải IP, tên miền hoặc \".\" cho bất kỳ máy chủ nào "
+#~ "không có tên miền"
+
+#~ msgid "Configuration"
+#~ msgstr "Cấu hình"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "Không thể truy xuất số liệu thống kê từ url:"
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "Danh sách các cổng được phép cho phương thức CONNECT. Một giá trị duy "
+#~ "nhất \"0\" vô hiệu hóa KẾT NỐI hoàn toàn, một danh sách trống cho phép "
+#~ "tất cả các cổng"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Trạng thái của Tinyproxy"
+
 #~ msgid "Allow access from"
 #~ msgstr "Cho phép truy cập từ"
 
diff --git a/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po
index 959e97ed24..5fa857180b 100644
--- a/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/zh_Hans/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -21,100 +21,92 @@ msgstr ""
 "<em>Via proxy</em> 通过指定的上游代理将请求路由到给定的目标，<em>Reject "
 "access</em> 禁用目标的任何上游代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
-msgstr "转发请求时增加了一个客户机IP地址和“X-Tinyproxy“HTTP头"
+msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "允许的客户端"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "允许的连接端口"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "绑定地址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
 "默认情况下，使用基本的POSIX表达式进行过滤。启用它来激活扩展的正则表达式"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr "默认情况下，过滤字符串是不区分大小写的。启用它转为区分大小写"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr "默认情况下，过滤是基于域名的。启用它以匹配URLs"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr "默认情况下，过滤规则以黑名单形式工作。启用此选项只允许匹配的URLs或域名"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
-msgstr "可以是IP地址或者范围，也可以是域名或者以\".\"代表任意主机"
-
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "配置"
+msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "连接超时时间"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "默认拒绝"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "启用Tinyproxy"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "错误页面"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "从 url 检索统计数据失败，该url为："
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "正则表达式过滤器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "基于URL的过滤器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "过滤器大小写敏感"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "过滤器文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "过滤规则和访问控制列表"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "常规设置"
 
@@ -122,225 +114,264 @@ msgstr "常规设置"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "授予UCI访问luci-app-tinyproxy的权限"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "组"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "为统计主机HTML模板文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTTP出错页面HTML模板"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "头白名单"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr "允许访问代理服务器的IP或IP段列表"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
-msgstr "CONNECT 方式允许的端口列表。单一值“0”完全禁用 CONNECT，空列表允许所有端口"
+msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "监听地址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "监听端口"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "日志文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "用于消息转储的日志文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "日志级别"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "冗长的Tinyproxy过程日志"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "最大客户端数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "单进程最大请求数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "最多备用服务器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "允许同时连接的最大客户端数量"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr "单个进程允许的最多请求数，超过这个值，进程将重启。0表示不限制。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "备用进程数的最大值"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "活动连接保持打开的最长秒数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "最少备用服务器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "备用进程数的最小值"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "启动Tinyproxy时开启的进程数"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr "带要过滤的URLs或域名的纯文本文件。每行一条"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "策略"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "策略设置"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "拒绝访问"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "服务器设置"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "服务器限制"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr "指定HTTP报头名称可直通的,其它将被丢弃。保留空，禁用头过滤"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "Tinyproxy正在侦听请求的指定HTTP端口"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "通过HTTP头使用指定Tinyproxy主机名"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr "指定服务器向外转发请求时所使用的地址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "指定服务器接收代理请求所使用的地址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "指定Tinyproxy进程所属组"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
-msgstr "指定上级代理. 格式 <code>IP地址:端口</code> 或 <code>socks5 IP地址:端口</code>"
+msgstr ""
+"指定上级代理. 格式 <code>IP地址:端口</code> 或 <code>socks5 IP地址:端口</"
+"code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "指定Tinyproxy进程所属用户"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "启动备用服务器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "统计页面"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "状态"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "目标主机"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy服务器"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Tinyproxy状态"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy是一个轻量级无缓存机制的高速HTTP(S)代理服务器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "上级代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr "当访问特定IP地址或域名时，使用外出代理规则定义的代理服务器。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "使用系统日志服务"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "用户"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "通过主机名"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "通过代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "将日志写入系统日志以代替指定的日志文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy头"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr "转发请求时增加了一个客户机IP地址和“X-Tinyproxy“HTTP头"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr "可以是IP地址或者范围，也可以是域名或者以\".\"代表任意主机"
+
+#~ msgid "Configuration"
+#~ msgstr "配置"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "从 url 检索统计数据失败，该url为："
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "CONNECT 方式允许的端口列表。单一值“0”完全禁用 CONNECT，空列表允许所有端口"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Tinyproxy状态"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr "值CONNECT方法允许的端口列表。单个值“0”代表允许所有端口"
diff --git a/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po b/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po
index 842d3ab152..dd7a5da73c 100644
--- a/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po
+++ b/applications/luci-app-tinyproxy/po/zh_Hant/tinyproxy.po
@@ -12,7 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:219
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:291
 msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specified "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
@@ -21,99 +21,91 @@ msgstr ""
 "<em>通過代理</em>通過指定的上游代理將請求路由到給定目標，<em>拒絕存取</em>為"
 "目標禁用任何上游代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:108
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:180
 msgid ""
-"Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
+"Adds an 'X-Tinyproxy' HTTP header with the client IP address to forwarded "
 "requests"
-msgstr "將帶有客戶端IP地址的“ X-Tinyproxy” HTTP標頭添加到轉發的請求中"
+msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:126
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:198
 msgid "Allowed clients"
 msgstr "允許的客戶端"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:133
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:205
 msgid "Allowed connect ports"
 msgstr "允許的連接埠號"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:47
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:119
 msgid "Bind address"
 msgstr "綁定位址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:149
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:221
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr "預設情況下，基本POSIX表達式用於過濾。啟用它以啟動擴展的正則表達式"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:153
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:225
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
 "make the matching case-sensitive"
 msgstr "預設情況下，過濾器字符串被視為不區分大小寫。啟用它以讓匹配區分大小寫"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:145
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:217
 msgid ""
 "By default, filtering is done based on domain names. Enable this to match "
 "against URLs instead"
 msgstr "預設情況下，過濾是基於網域名稱進行的。啟用它以匹配URL替代"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:157
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:229
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
 msgstr "預設情況下，過濾規則為黑名單。啟用此選項僅允許匹配的URL或網域名稱"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:226
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:298
 msgid ""
-"Can be either an IP address or range, a domain name or \".\" for any host "
+"Can be either an IP address or range, a domain name or '.' for any host "
 "without domain"
-msgstr "可以是IP地址或範圍，網域名稱或 “.\"對於任何沒有網域的主機"
-
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:23
-msgid "Configuration"
-msgstr "組態"
+msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:164
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:236
 msgid "Connection timeout"
 msgstr "連線逾時值"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:156
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:228
 msgid "Default deny"
 msgstr "預設拒絕"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:17
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:100
 msgid "Enable Tinyproxy server"
 msgstr "啟用Tinyproxy伺服器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:55
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:127
 msgid "Error page"
 msgstr "錯誤頁面"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:36
-msgid "Failed to retrieve statistics from url:"
-msgstr "無法從網址檢索統計信息："
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:148
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:220
 msgid "Filter by RegExp"
 msgstr "按RegExp篩選"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:144
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:216
 msgid "Filter by URLs"
 msgstr "按網址過濾"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:152
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:224
 msgid "Filter case-sensitive"
 msgstr "篩選器區分大小寫"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:140
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:212
 msgid "Filter file"
 msgstr "篩選檔案"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:13
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:96
 msgid "Filtering and ACLs"
 msgstr "過濾和存取過濾清單"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:11
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:94
 msgid "General settings"
 msgstr "一般設定值"
 
@@ -121,225 +113,264 @@ msgstr "一般設定值"
 msgid "Grant UCI access for luci-app-tinyproxy"
 msgstr "授予 luci-app-tinyproxy 擁有 UCI 存取的權限"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:97
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:169
 msgid "Group"
 msgstr "群組"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:63
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:135
 msgid "HTML template file to serve for stat host requests"
 msgstr "HTML模板文件可用於統計主機請求"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:56
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:128
 msgid "HTML template file to serve when HTTP errors occur"
 msgstr "HTML模板文件在HTTP錯誤發生時提供服務"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:118
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:190
 msgid "Header whitelist"
 msgstr "白名單標頭"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:127
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:199
 msgid ""
 "List of IP addresses or ranges which are allowed to use the proxy server"
 msgstr "允許使用代理伺服器的IP地址或範圍的列表"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:134
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:206
 msgid ""
-"List of allowed ports for the CONNECT method. A single value \"0\" disables "
+"List of allowed ports for the CONNECT method. A single value '0' disables "
 "CONNECT completely, an empty list allows all ports"
-msgstr "CONNECT 方法允許的端口列表。 單個值“0”完全禁用 CONNECT，空列表允許所有端口"
+msgstr ""
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:39
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:111
 msgid "Listen address"
 msgstr "監聽位址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:31
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:103
 msgid "Listen port"
 msgstr "監聽連接埠"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:73
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:145
 msgid "Log file"
 msgstr "日誌檔案"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:74
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:146
 msgid "Log file to use for dumping messages"
 msgstr "用於轉儲郵件的日誌文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:80
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:152
 msgid "Log level"
 msgstr "紀錄級別"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:81
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:153
 msgid "Logging verbosity of the Tinyproxy process"
 msgstr "Tinyproxy程序的詳細記錄"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:172
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:244
 msgid "Max. clients"
 msgstr "最大用戶數"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:200
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:272
 msgid "Max. requests per server"
 msgstr "每台伺服器最大請求"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:186
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:258
 msgid "Max. spare servers"
 msgstr "最大備用伺服器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:173
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:245
 msgid "Maximum allowed number of concurrently connected clients"
 msgstr "允許的最大同時連接客戶端數"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:201
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:273
 msgid ""
 "Maximum allowed number of requests per process. If it is exeeded, the "
 "process is restarted. Zero means unlimited."
 msgstr "每個程序允許的最大請求數。如果已執行，則重新啟動該過程。零表示無限。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:187
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:259
 msgid "Maximum number of prepared idle processes"
 msgstr "準備的最大空閒程序數"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:165
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:237
 msgid "Maximum number of seconds an inactive connection is held open"
 msgstr "無效連接保持打開狀態的最大秒數"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:179
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:251
 msgid "Min. spare servers"
 msgstr "最小備用伺服器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:180
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:252
 msgid "Minimum number of prepared idle processes"
 msgstr "準備的最小空閒程序數"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:194
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:266
 msgid "Number of idle processes to start when launching Tinyproxy"
 msgstr "啟動Tinyproxy時要啟動的空閒進程數"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:141
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:213
 msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr "具有要過濾的URL或域的純文本文件。每行一個條目"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:218
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:290
 msgid "Policy"
 msgstr "政策"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:12
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:95
 msgid "Privacy settings"
 msgstr "政策 設定值"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:222
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:294
 msgid "Reject access"
 msgstr "拒絕存取"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:8
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:35
+msgid "Reload settings into tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:26
+msgid "Restart tinyproxy"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:90
 msgid "Server Settings"
 msgstr "伺服器設定值"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:97
 msgid "Server limits"
 msgstr "伺服器限制"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:119
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:191
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
 "are discarded. Leave empty to disable header filtering"
 msgstr "指定允許傳遞的HTTP標頭名稱，所有其它標頭均被丟棄。留空以禁用標題過濾"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:32
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:104
 msgid "Specifies the HTTP port Tinyproxy is listening on for requests"
 msgstr "指定Tinyproxy正在監聽請求的HTTP埠號"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:112
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:184
 msgid "Specifies the Tinyproxy hostname to use in the Via HTTP header"
 msgstr "指定在Via HTTP標頭中使用的Tinyproxy主機名稱"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:48
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:120
 msgid ""
 "Specifies the address Tinyproxy binds to for outbound forwarded requests"
 msgstr "指定Tinyproxy綁定到外出轉發請求的位址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:40
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:112
 msgid "Specifies the addresses Tinyproxy is listening on for requests"
 msgstr "指定Tinyproxy正在監聽請求的位址"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:98
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:170
 msgid "Specifies the group name the Tinyproxy process is running as"
 msgstr "指定運行Tinyproxy程序的群組名稱"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:234
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:306
 msgid ""
 "Specifies the upstream proxy to use for accessing the target host. Format is "
 "<code>address:port</code> or <code>socks5 address:port</code>"
-msgstr "指定用於存取目標主機的上游代理。格式為<code>位址：埠號 </code> 或 <code>socks5 位址：埠號 </code>"
+msgstr ""
+"指定用於存取目標主機的上游代理。格式為<code>位址：埠號 </code> 或 "
+"<code>socks5 位址：埠號 </code>"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:92
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:164
 msgid "Specifies the user name the Tinyproxy process is running as"
 msgstr "指定Tinyproxy程序運行所使用的用戶名稱"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:193
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:265
 msgid "Start spare servers"
 msgstr "啟動備用伺服器"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:62
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:134
 msgid "Statistics page"
 msgstr "統計頁面"
 
-#: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:14
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:82
 msgid "Status"
 msgstr "狀態"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:225
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:297
 msgid "Target host"
 msgstr "目標主機"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:5
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 #: applications/luci-app-tinyproxy/root/usr/share/luci/menu.d/luci-app-tinyproxy.json:3
 msgid "Tinyproxy"
 msgstr "Tinyproxy伺服器"
 
-#: applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm:51
-msgid "Tinyproxy Status"
-msgstr "Tinyproxy狀態"
-
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:6
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:79
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy是一個小型且快速的非快取的HTTP(S)-代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:211
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:58
+msgid "Tinyproxy is disabled"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:283
 msgid "Upstream Proxies"
 msgstr "上游代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:212
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:284
 msgid ""
 "Upstream proxy rules define proxy servers to use when accessing certain IP "
 "addresses or domains."
 msgstr "上游代理規則定義存取某些IP位址或網域時要使用的代理伺服器。"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:69
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:141
 msgid "Use syslog"
 msgstr "使用系統日誌"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:91
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:163
 msgid "User"
 msgstr "用戶"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:111
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:183
 msgid "Via hostname"
 msgstr "透過主機名稱"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:221
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:233
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:293
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:305
 msgid "Via proxy"
 msgstr "透過代理"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:70
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:56
+msgid "Waiting for data from url:"
+msgstr ""
+
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:142
 msgid "Writes log messages to syslog instead of a log file"
 msgstr "將日誌消息寫入syslog而不是日誌文件"
 
-#: applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua:107
+#: applications/luci-app-tinyproxy/htdocs/luci-static/resources/view/tinyproxy/tinyproxy.js:179
 msgid "X-Tinyproxy header"
 msgstr "X-Tinyproxy標頭"
 
 #~ msgid ""
+#~ "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to "
+#~ "forwarded requests"
+#~ msgstr "將帶有客戶端IP地址的“ X-Tinyproxy” HTTP標頭添加到轉發的請求中"
+
+#~ msgid ""
+#~ "Can be either an IP address or range, a domain name or \".\" for any host "
+#~ "without domain"
+#~ msgstr "可以是IP地址或範圍，網域名稱或 “.\"對於任何沒有網域的主機"
+
+#~ msgid "Configuration"
+#~ msgstr "組態"
+
+#~ msgid "Failed to retrieve statistics from url:"
+#~ msgstr "無法從網址檢索統計信息："
+
+#~ msgid ""
+#~ "List of allowed ports for the CONNECT method. A single value \"0\" "
+#~ "disables CONNECT completely, an empty list allows all ports"
+#~ msgstr ""
+#~ "CONNECT 方法允許的端口列表。 單個值“0”完全禁用 CONNECT，空列表允許所有端口"
+
+#~ msgid "Tinyproxy Status"
+#~ msgstr "Tinyproxy狀態"
+
+#~ msgid ""
 #~ "List of allowed ports for the CONNECT method. A single value \"0\" allows "
 #~ "all ports"
 #~ msgstr "CONNECT方式允許的埠號列表。單個值“ 0”允許所有埠"
diff --git a/applications/luci-app-watchcat/po/ar/watchcat.po b/applications/luci-app-watchcat/po/ar/watchcat.po
index 2e29111c38..4b54007b4f 100644
--- a/applications/luci-app-watchcat/po/ar/watchcat.po
+++ b/applications/luci-app-watchcat/po/ar/watchcat.po
@@ -13,6 +13,22 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -27,22 +43,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"</i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"</i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/bg/watchcat.po b/applications/luci-app-watchcat/po/bg/watchcat.po
index ffab149dd6..2729699e83 100644
--- a/applications/luci-app-watchcat/po/bg/watchcat.po
+++ b/applications/luci-app-watchcat/po/bg/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/bn_BD/watchcat.po b/applications/luci-app-watchcat/po/bn_BD/watchcat.po
index 7c0fa79e6a..5c471bc9ef 100644
--- a/applications/luci-app-watchcat/po/bn_BD/watchcat.po
+++ b/applications/luci-app-watchcat/po/bn_BD/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.9-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/ca/watchcat.po b/applications/luci-app-watchcat/po/ca/watchcat.po
index 7a470e5845..cc2d5303da 100644
--- a/applications/luci-app-watchcat/po/ca/watchcat.po
+++ b/applications/luci-app-watchcat/po/ca/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.5.1\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/cs/watchcat.po b/applications/luci-app-watchcat/po/cs/watchcat.po
index dbb45e189a..8e086c85da 100644
--- a/applications/luci-app-watchcat/po/cs/watchcat.po
+++ b/applications/luci-app-watchcat/po/cs/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 "X-Generator: Weblate 5.7-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/da/watchcat.po b/applications/luci-app-watchcat/po/da/watchcat.po
index 52c120c37a..642e2d7108 100644
--- a/applications/luci-app-watchcat/po/da/watchcat.po
+++ b/applications/luci-app-watchcat/po/da/watchcat.po
@@ -12,30 +12,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.14.1-dev\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Gælder for Ping Reboot, Genstart Interface og Run Script-tilstande</i> "
-"<br /> Angiv den grænseflade, der skal overvåges og reagere, hvis et ping "
-"over det mislykkes."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr "Adressefamilie til pinging af værten"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "Gælder for Ping-genstart og periodisk genstart</i> <br /> Ved genstart af "
 "routeren vil tjenesten udløse en blød genstart. Indtastning af en værdi, der "
@@ -50,10 +33,27 @@ msgid ""
 "ModemManager, you can have Watchcat restart your ModemManager interface by "
 "specifying its name."
 msgstr ""
-"<i>Gælder for Ping Genstart og Genstart Interface-tilstande</i> <br /> Hvis du "
-"bruger ModemManager, kan du få Watchcat til at genstarte din ModemManager-"
+"<i>Gælder for Ping Genstart og Genstart Interface-tilstande</i> <br /> Hvis "
+"du bruger ModemManager, kan du få Watchcat til at genstarte din ModemManager-"
 "interface ved at angive dens navn."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Gælder for Ping Reboot, Genstart Interface og Run Script-tilstande</i> "
+"<br /> Angiv den grænseflade, der skal overvåges og reagere, hvis et ping "
+"over det mislykkes."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr "Adressefamilie til pinging af værten"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Stor: 248 bytes"
diff --git a/applications/luci-app-watchcat/po/de/watchcat.po b/applications/luci-app-watchcat/po/de/watchcat.po
index 8643f560aa..6b0de0629e 100644
--- a/applications/luci-app-watchcat/po/de/watchcat.po
+++ b/applications/luci-app-watchcat/po/de/watchcat.po
@@ -12,30 +12,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Trifft auf Ping Neustart, Reaktivieren der Schnittstelle und Skript "
-"ausführende Modi zu</i><br /> Nenne die zu überwachende Schnittstelle und "
-"reagiere, falls ein Ping darauf fehlschlägt."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr "Adressfamilie für pingen des Hosts"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr "Beliebig"
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "<i>Gilt für die Modi \"Ping Reboot und regelmäßiger Reboot\"</i> <br /> Wenn "
 "der Router neu gestartet wird, löst der Dienst einen Soft Reboot aus. Wenn "
@@ -51,10 +34,27 @@ msgid ""
 "ModemManager, you can have Watchcat restart your ModemManager interface by "
 "specifying its name."
 msgstr ""
-"<i>Gilt für die Modi \"Ping Reboot und Restart Schnittstelle\"</i> <br /> Wenn "
-"Sie den ModemManager verwenden, können Sie Watchcat veranlassen,um das "
+"<i>Gilt für die Modi \"Ping Reboot und Restart Schnittstelle\"</i> <br /> "
+"Wenn Sie den ModemManager verwenden, können Sie Watchcat veranlassen,um das "
 "ModemManager-Interface neu zu starten, indem Sie dessen Namen angeben."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Trifft auf Ping Neustart, Reaktivieren der Schnittstelle und Skript "
+"ausführende Modi zu</i><br /> Nenne die zu überwachende Schnittstelle und "
+"reagiere, falls ein Ping darauf fehlschlägt."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr "Adressfamilie für pingen des Hosts"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr "Beliebig"
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Groß: 248 Bytes"
diff --git a/applications/luci-app-watchcat/po/el/watchcat.po b/applications/luci-app-watchcat/po/el/watchcat.po
index c3aff10fe1..96b91e61cf 100644
--- a/applications/luci-app-watchcat/po/el/watchcat.po
+++ b/applications/luci-app-watchcat/po/el/watchcat.po
@@ -8,6 +8,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -22,22 +38,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/en/watchcat.po b/applications/luci-app-watchcat/po/en/watchcat.po
index 5bb116866e..31ef7e2e9d 100644
--- a/applications/luci-app-watchcat/po/en/watchcat.po
+++ b/applications/luci-app-watchcat/po/en/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.3-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/es/watchcat.po b/applications/luci-app-watchcat/po/es/watchcat.po
index 074dce6c4a..f178e14383 100644
--- a/applications/luci-app-watchcat/po/es/watchcat.po
+++ b/applications/luci-app-watchcat/po/es/watchcat.po
@@ -13,6 +13,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Se aplica a los modos de Reinicio por Ping y Reinicio periódico</i><br /> "
+"Al reiniciar el enrutador, el servicio desencadenará un reinicio suave. "
+"Poniendo un valor distinto de cero aquí, se desencadenará un reinicio "
+"completo retrasado si falla el reinicio suave. Ponga el número de segundos "
+"que hay que esperar a que el reinicio suave falle o use 0 para desactivar el "
+"retraso de reinicio forzado."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Se aplica a los modos Reinicio por Ping y Reiniciar interfaz</i> <br /> "
+"Si usa ModemManager, puede hacer que Watchcat reinicie su interfaz "
+"ModemManager especificando su nombre."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -30,31 +55,6 @@ msgstr "Familia de direcciones para hacer ping al host"
 msgid "Any"
 msgstr "Cualquiera"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Se aplica a los modos de Reinicio por Ping y Reinicio periódico</i><br /> Al "
-"reiniciar el enrutador, el servicio desencadenará un reinicio suave. "
-"Poniendo un valor distinto de cero aquí, se desencadenará un reinicio "
-"completo retrasado si falla el reinicio suave. Ponga el número de segundos "
-"que hay que esperar a que el reinicio suave falle o use 0 para desactivar el "
-"retraso de reinicio forzado."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Se aplica a los modos Reinicio por Ping y Reiniciar interfaz</i> <br /> Si "
-"usa ModemManager, puede hacer que Watchcat reinicie su interfaz ModemManager "
-"especificando su nombre."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Grande: 248 bytes"
diff --git a/applications/luci-app-watchcat/po/fi/watchcat.po b/applications/luci-app-watchcat/po/fi/watchcat.po
index 2aad6db211..ed2424b215 100644
--- a/applications/luci-app-watchcat/po/fi/watchcat.po
+++ b/applications/luci-app-watchcat/po/fi/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.12-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/fr/watchcat.po b/applications/luci-app-watchcat/po/fr/watchcat.po
index 732bd04df4..c0e1d81e59 100644
--- a/applications/luci-app-watchcat/po/fr/watchcat.po
+++ b/applications/luci-app-watchcat/po/fr/watchcat.po
@@ -12,6 +12,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>S'applique aux modes de redémarrage par ping et de redémarrage "
+"périodique</i> <br />Lorsque le service redémarre le routeur, il déclenche "
+"un redémarrage en douceur. La saisie d'une valeur non nulle ici déclenchera "
+"un redémarrage dur différé si le redémarrage progressif devait échouer. "
+"Entrez le nombre de secondes à attendre pour que le redémarrage progressif "
+"échoue ou utilisez 0 pour désactiver le délai de redémarrage forcé."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>S'applique aux modes d'interface Ping Reboot et Restart</i> <br />Si vous "
+"utilisez ModemManager, vous pouvez demander à Watchcat de redémarrer votre "
+"interface ModemManager en spécifiant son nom."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,31 +54,6 @@ msgstr "Famille d'adresses pour le ping de l'hôte"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>S'applique aux modes de redémarrage par ping et de redémarrage périodique</"
-"i> <br />Lorsque le service redémarre le routeur, il déclenche un "
-"redémarrage en douceur. La saisie d'une valeur non nulle ici déclenchera un "
-"redémarrage dur différé si le redémarrage progressif devait échouer. Entrez "
-"le nombre de secondes à attendre pour que le redémarrage progressif échoue "
-"ou utilisez 0 pour désactiver le délai de redémarrage forcé."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>S'applique aux modes d'interface Ping Reboot et Restart</i> <br />Si vous "
-"utilisez ModemManager, vous pouvez demander à Watchcat de redémarrer votre "
-"interface ModemManager en spécifiant son nom."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Grand : 248 octets"
diff --git a/applications/luci-app-watchcat/po/ga/watchcat.po b/applications/luci-app-watchcat/po/ga/watchcat.po
index 016d5d7bae..c047457a98 100644
--- a/applications/luci-app-watchcat/po/ga/watchcat.po
+++ b/applications/luci-app-watchcat/po/ga/watchcat.po
@@ -13,6 +13,31 @@ msgstr ""
 "n>6 && n<11) ? 3 : 4;\n"
 "X-Generator: Weblate 5.7.2-rc\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Baineann sé seo le modhanna Atosaigh Ping agus Atosaigh Tréimhsiúil</i> "
+"<br /> Nuair a atosófar an ródaire, cuirfear tús leis an tseirbhís atosaithe "
+"bog. Má iontrálann tú luach neamh-nialais anseo, spreagfar atosaithe crua "
+"moillithe dá dteipfeadh ar an atosaigh bog. Cuir isteach líon na soicind "
+"chun fanacht go dteipfidh ar an atosaigh bog nó bain úsáid as 0 chun an "
+"mhoill atosaithe éigean a dhíchumasú."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Baineann sé seo le modhanna Atosaigh Ping agus Comhéadain Atosaigh</i> "
+"<br /> Má tá ModemManager in úsáid agat, is féidir leat do chomhéadan "
+"ModemManager a atosú trí Watchcat a ainm a shonrú."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -30,31 +55,6 @@ msgstr "Seoladh an teaghlach chun an t-óstach a phinging"
 msgid "Any"
 msgstr "Aon"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Baineann sé seo le modhanna Atosaigh Ping agus Atosaigh Tréimhsiúil</i> <br /"
-"> Nuair a atosófar an ródaire, cuirfear tús leis an tseirbhís atosaithe bog. "
-"Má iontrálann tú luach neamh-nialais anseo, spreagfar atosaithe crua "
-"moillithe dá dteipfeadh ar an atosaigh bog. Cuir isteach líon na soicind "
-"chun fanacht go dteipfidh ar an atosaigh bog nó bain úsáid as 0 chun an "
-"mhoill atosaithe éigean a dhíchumasú."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Baineann sé seo le modhanna Atosaigh Ping agus Comhéadain Atosaigh</i> <br /"
-"> Má tá ModemManager in úsáid agat, is féidir leat do chomhéadan ModemManager "
-"a atosú trí Watchcat a ainm a shonrú."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Mór: 248 beart"
@@ -142,10 +142,10 @@ msgstr ""
 "freagra ón Óstach go Seiceáil sula ndéantar an comhéadan a atosú nó an "
 "script a rith. <br /><br />Is soicind é an t-aonad réamhshocraithe, gan "
 "iarmhír, ach is féidir leat an iarmhír <b>m</b> a úsáid ar feadh nóiméid, "
-"<b>h</b> ar feadh uaireanta nó <b>d </b> ar feadh laethanta. <br /><br "
-"/>Samplaí: Is é a bheadh i gceist le <ul><li>10 soicind: <b>10</b> nó "
-"<b>10s</b></li><li>5 nóiméad: <b>5m</b></li><li> Bheadh 1 uair an chloig: "
-"<b>1h</b></li><li>Seachtain 1: <b>7d</b></ li><ul>"
+"<b>h</b> ar feadh uaireanta nó <b>d </b> ar feadh laethanta. <br /><br /"
+">Samplaí: Is é a bheadh i gceist le <ul><li>10 soicind: <b>10</b> nó <b>10s</"
+"b></li><li>5 nóiméad: <b>5m</b></li><li> Bheadh 1 uair an chloig: <b>1h</b></"
+"li><li>Seachtain 1: <b>7d</b></ li><ul>"
 
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:102
 msgid "Interface"
diff --git a/applications/luci-app-watchcat/po/he/watchcat.po b/applications/luci-app-watchcat/po/he/watchcat.po
index c3aff10fe1..96b91e61cf 100644
--- a/applications/luci-app-watchcat/po/he/watchcat.po
+++ b/applications/luci-app-watchcat/po/he/watchcat.po
@@ -8,6 +8,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -22,22 +38,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/hi/watchcat.po b/applications/luci-app-watchcat/po/hi/watchcat.po
index d7c7095828..e942c3a6e2 100644
--- a/applications/luci-app-watchcat/po/hi/watchcat.po
+++ b/applications/luci-app-watchcat/po/hi/watchcat.po
@@ -9,6 +9,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -23,22 +39,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/hu/watchcat.po b/applications/luci-app-watchcat/po/hu/watchcat.po
index a60771cd70..2fcb2ccbc6 100644
--- a/applications/luci-app-watchcat/po/hu/watchcat.po
+++ b/applications/luci-app-watchcat/po/hu/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Nagy: 248 bájt"
diff --git a/applications/luci-app-watchcat/po/it/watchcat.po b/applications/luci-app-watchcat/po/it/watchcat.po
index fb547128fa..87a7cc3b9c 100644
--- a/applications/luci-app-watchcat/po/it/watchcat.po
+++ b/applications/luci-app-watchcat/po/it/watchcat.po
@@ -12,6 +12,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Si applica a Ping Reboot e Periodic Reboot</i> <br /> Durante il riavvio "
+"del router, il servizio avvierà un soft reboot. Inserendo qui un valore non "
+"zero scatterà un hard reboot ritardato se il soft reboot dovesse fallire. "
+"Inserire il numero di secondi per attendere il fallimento del soft reboot o "
+"usare 0 per disabilitare il ritardo del riavvio forzato."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Si applica alle modalità Riavvio Ping e Riavvia Interfaccia</i> <br /> Se "
+"si utilizza ModemManager, è possibile far riavviare a Watchcat l'interfaccia "
+"di ModemManager specificandone il nome."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,30 +53,6 @@ msgstr "Famiglia di indirizzi per il ping dell'host"
 msgid "Any"
 msgstr "Qualsiasi"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Si applica a Ping Reboot e Periodic Reboot</i> <br /> Durante il riavvio del "
-"router, il servizio avvierà un soft reboot. Inserendo qui un valore non zero "
-"scatterà un hard reboot ritardato se il soft reboot dovesse fallire. "
-"Inserire il numero di secondi per attendere il fallimento del soft reboot o "
-"usare 0 per disabilitare il ritardo del riavvio forzato."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Si applica alle modalità Riavvio Ping e Riavvia Interfaccia</i> <br /> Se si "
-"utilizza ModemManager, è possibile far riavviare a Watchcat l'interfaccia di "
-"ModemManager specificandone il nome."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Grande: 248 byte"
diff --git a/applications/luci-app-watchcat/po/ja/watchcat.po b/applications/luci-app-watchcat/po/ja/watchcat.po
index 22c7e5b0f8..55cb4651c8 100644
--- a/applications/luci-app-watchcat/po/ja/watchcat.po
+++ b/applications/luci-app-watchcat/po/ja/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,22 +45,6 @@ msgstr "ホストにPingを送信するためのアドレスファミリ"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/ko/watchcat.po b/applications/luci-app-watchcat/po/ko/watchcat.po
index 489c04a3a8..544670de38 100644
--- a/applications/luci-app-watchcat/po/ko/watchcat.po
+++ b/applications/luci-app-watchcat/po/ko/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.14-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/lt/watchcat.po b/applications/luci-app-watchcat/po/lt/watchcat.po
index 85d00f65a6..98366abcb5 100644
--- a/applications/luci-app-watchcat/po/lt/watchcat.po
+++ b/applications/luci-app-watchcat/po/lt/watchcat.po
@@ -13,31 +13,13 @@ msgstr ""
 "n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.8-rc\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Taikomi į – „Ryšio atsako perleidimas“, „Paleisti iš naujo sąsają ir/arba "
-"sietuvą“ ir „Paleisti/Vykdyti skriptą“ veiksenas</i> <br /> Nurodykite "
-"sąsają ir/arba sietuvą, kuris bus prižiūrimas/stebimas ir reaguojamas, jei "
-"ryšio atsakas per jį nepavyks."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr "Adresų „šeima“, skirta teigti delsos ryšių atsakus, skleidėjui/vedėjui"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr "Bet koks"
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "<i>Taikomi į – „Ryšio atsako paleidimas“ ir „Periodinis ryšio atsako "
 "paleidimas“ veiksenas</i> <br /> Perkraunant maršrutizatorių, tarnybą "
@@ -59,6 +41,24 @@ msgstr ""
 "galite leisti, kad „Watchcat“ paleistu iš naujo Jūsų – „ModemManager“ sąsają "
 "ir/arba sietuvą, nurodydami jos pavadinimą."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Taikomi į – „Ryšio atsako perleidimas“, „Paleisti iš naujo sąsają ir/arba "
+"sietuvą“ ir „Paleisti/Vykdyti skriptą“ veiksenas</i> <br /> Nurodykite "
+"sąsają ir/arba sietuvą, kuris bus prižiūrimas/stebimas ir reaguojamas, jei "
+"ryšio atsakas per jį nepavyks."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr "Adresų „šeima“, skirta teigti delsos ryšių atsakus, skleidėjui/vedėjui"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr "Bet koks"
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Didelis: 248-i baitai"
@@ -105,9 +105,9 @@ msgstr ""
 "Kaip dažnai siųsti ryšio atsakas, pirmiau nurodytu skleidėju/vedėju. <br /"
 "><br />Numatytasis vienetas yra – sekundės, be priesagos, bet galite naudoti "
 "priesaga –<b>m</b> minutėms, <b>h</b> valandoms arba <b>d</b> dienoms. <br /"
-"><br /> Pavyzdžiai:<ul><li>10-imt sekundžių būtų: <b>10</b> arba "
-"<b>10s</b></li><li>5-ios minutės būtų: <b>5 min.</b></li><li>1-a valanda "
-"būtų: <b>1 val.</b></li><li>1-a savaitė būtų: <b>7 d.</b></ li><ul>"
+"><br /> Pavyzdžiai:<ul><li>10-imt sekundžių būtų: <b>10</b> arba <b>10s</b></"
+"li><li>5-ios minutės būtų: <b>5 min.</b></li><li>1-a valanda būtų: <b>1 val."
+"</b></li><li>1-a savaitė būtų: <b>7 d.</b></ li><ul>"
 
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:85
 msgid "Huge: 1492 bytes"
@@ -145,8 +145,8 @@ msgstr ""
 "apibrėžia ilgiausią laikotarpį be atsakymo, iš – „Skleidėjo/Vedėjo "
 "patikrinimas, prieš paleidžiant iš naujo“. <br /> „Tinklo paleidimas iš "
 "naujo“ arba „Paleisti skriptą“ veiksena, jis apibrėžia ilgiausią laikotarpį, "
-"be atsakymo iš – „Skleidėjo/Vedėjo patikrinimas, prieš paleidžiant iš naujo“"
-", prieš paleidžiant iš naujo sąsają ir/arba sietuvą arba paleidžiant "
+"be atsakymo iš – „Skleidėjo/Vedėjo patikrinimas, prieš paleidžiant iš "
+"naujo“, prieš paleidžiant iš naujo sąsają ir/arba sietuvą arba paleidžiant "
 "skriptą. <br /><br />Numatytasis vienetas yra – sekundės, be priesagos, bet "
 "galite naudoti priesaga –<b>m</b> minutėms, <b>h</b> valandoms arba <b>d </"
 "b> dienomis. <br /><br />Pavyzdžiai:<ul><li>10-imt sekundžių būtų: <b>10</b> "
diff --git a/applications/luci-app-watchcat/po/mr/watchcat.po b/applications/luci-app-watchcat/po/mr/watchcat.po
index 81b1a08008..be9df577cb 100644
--- a/applications/luci-app-watchcat/po/mr/watchcat.po
+++ b/applications/luci-app-watchcat/po/mr/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/ms/watchcat.po b/applications/luci-app-watchcat/po/ms/watchcat.po
index f317646c11..cf97a42704 100644
--- a/applications/luci-app-watchcat/po/ms/watchcat.po
+++ b/applications/luci-app-watchcat/po/ms/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/nb_NO/watchcat.po b/applications/luci-app-watchcat/po/nb_NO/watchcat.po
index 69d50c1ae7..aed660641b 100644
--- a/applications/luci-app-watchcat/po/nb_NO/watchcat.po
+++ b/applications/luci-app-watchcat/po/nb_NO/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,22 +45,6 @@ msgstr "Adressefamilie til pinging av verten"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/nl/watchcat.po b/applications/luci-app-watchcat/po/nl/watchcat.po
index 792c8ef7a3..c963e823b4 100644
--- a/applications/luci-app-watchcat/po/nl/watchcat.po
+++ b/applications/luci-app-watchcat/po/nl/watchcat.po
@@ -9,6 +9,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -23,22 +39,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/pl/watchcat.po b/applications/luci-app-watchcat/po/pl/watchcat.po
index 002c993181..4dec287ae7 100644
--- a/applications/luci-app-watchcat/po/pl/watchcat.po
+++ b/applications/luci-app-watchcat/po/pl/watchcat.po
@@ -13,30 +13,13 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.8-rc\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Dotyczy trybów restartu na podstawie pingu, restartu interfejsu i "
-"uruchamiania skrytpu</i> <br /> Określ interfejs do monitorowania i "
-"reagowania w przypadku niepowodzenia pingowania."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr "Rodzina adresów do pingowania hosta"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr "Każdy"
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "<i>Dotyczy trybów restartu na podstawie pingu i okresowego ponownego "
 "uruchamiania</i> <br /> Po ponownym uruchomieniu routera usługa uruchomi "
@@ -55,6 +38,23 @@ msgstr ""
 "> Jeśli używasz ModemManager, program Watchcat może ponownie uruchomić "
 "interfejs ModemManager o określonej nazwie."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Dotyczy trybów restartu na podstawie pingu, restartu interfejsu i "
+"uruchamiania skrytpu</i> <br /> Określ interfejs do monitorowania i "
+"reagowania w przypadku niepowodzenia pingowania."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr "Rodzina adresów do pingowania hosta"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr "Każdy"
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Duży: 248 bajtów"
@@ -302,11 +302,11 @@ msgstr "Windows: 32 bajty"
 #~ "niepowodzenia polecenia ping."
 
 #~ msgid ""
-#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When rebooting "
-#~ "the router, the service will trigger a soft reboot. Entering a non-zero "
-#~ "value here will trigger a delayed hard reboot if the soft reboot were to "
-#~ "fail. Enter the number of seconds to wait for the soft reboot to fail or "
-#~ "use 0 to disable the forced reboot delay."
+#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When "
+#~ "rebooting the router, the service will trigger a soft reboot. Entering a "
+#~ "non-zero value here will trigger a delayed hard reboot if the soft reboot "
+#~ "were to fail. Enter the number of seconds to wait for the soft reboot to "
+#~ "fail or use 0 to disable the forced reboot delay."
 #~ msgstr ""
 #~ "Dotyczy trybów Ping Restart i Okresowy Restart.</i><br>Po ponownym "
 #~ "uruchomieniu routera usługa wyzwoli miękki restart. Wprowadzenie wartości "
@@ -317,8 +317,8 @@ msgstr "Windows: 32 bajty"
 
 #~ msgid ""
 #~ "Applies to Ping Reboot and Restart Interface modes</i> <br> If using "
-#~ "ModemManager, you can have Watchcat restart your ModemManager interface by "
-#~ "specifying its name."
+#~ "ModemManager, you can have Watchcat restart your ModemManager interface "
+#~ "by specifying its name."
 #~ msgstr ""
 #~ "Dotyczy trybów Ping Restart i Restartuj Interfejs</i><br>Jeśli używasz "
 #~ "ModemManager, możesz uruchomić program Watchcat z interfejsem "
diff --git a/applications/luci-app-watchcat/po/pt/watchcat.po b/applications/luci-app-watchcat/po/pt/watchcat.po
index 0df40c6d66..60970080de 100644
--- a/applications/luci-app-watchcat/po/pt/watchcat.po
+++ b/applications/luci-app-watchcat/po/pt/watchcat.po
@@ -12,6 +12,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Aplica-se aos modos de reinicialização de ping e reinicialização "
+"periódica</i> <br /> Ao reinicializar o roteador, o serviço acionará uma "
+"reinicialização suave. A inserção de um valor diferente a zero aqui acionará "
+"uma reinicialização forçada atrasada se a reinicialização suave falhar. "
+"Insira a quantidade de segundos para aguardar a falha da reinicialização "
+"suave ou use 0 para desativar o atraso da reinicialização forçada."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Se aplica aos modos ping reboot e os modos de reinicialização da "
+"interface</i> <br /> Caso esteja a usar o ModemManager, será possível fazer "
+"com que o Watchcat reinicie a sua interface ModemManager através da "
+"definição do seu nome."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,32 +55,6 @@ msgstr "Família de endereços para pingar o host"
 msgid "Any"
 msgstr "Qualquer"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Aplica-se aos modos de reinicialização de ping e reinicialização periódica</"
-"i> <br /> Ao reinicializar o roteador, o serviço acionará uma "
-"reinicialização suave. A inserção de um valor diferente a zero aqui acionará "
-"uma reinicialização forçada atrasada se a reinicialização suave falhar. "
-"Insira a quantidade de segundos para aguardar a falha da reinicialização "
-"suave ou use 0 para desativar o atraso da reinicialização forçada."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Se aplica aos modos ping reboot e os modos de reinicialização da interface</"
-"i> <br /> Caso esteja a usar o ModemManager, será possível fazer com que o "
-"Watchcat reinicie a sua interface ModemManager através da definição do seu "
-"nome."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Grande: 248 bytes"
diff --git a/applications/luci-app-watchcat/po/pt_BR/watchcat.po b/applications/luci-app-watchcat/po/pt_BR/watchcat.po
index 0facc75845..6cdbab8a6c 100644
--- a/applications/luci-app-watchcat/po/pt_BR/watchcat.po
+++ b/applications/luci-app-watchcat/po/pt_BR/watchcat.po
@@ -13,6 +13,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.14.1-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Se aplica aos modos ping reboot e a reinicialização periódica</i> <br /> "
+"Ao reiniciar o roteador o serviço acionará uma reinicialização suave. "
+"Inserindo um valor diferente de zero aqui desencadeará uma reinicialização "
+"completa com atraso caso a reinicialização suave falhe. Insira o número em "
+"segundos para esperar a falha da reinicialização suave ou use 0 para "
+"desativar o atraso de reinicialização forçada."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Se aplica aos modos ping reboot e os modos de reinicialização da "
+"interface</i> <br /> Caso esteja usando o ModemManager, será possível fazer "
+"com que o Watchcat reinicie a sua interface ModemManager através da "
+"definição do seu nome."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -30,32 +56,6 @@ msgstr "Família de endereços para pingar o host"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Se aplica aos modos ping reboot e a reinicialização periódica</i> <br /> Ao "
-"reiniciar o roteador o serviço acionará uma reinicialização suave. Inserindo "
-"um valor diferente de zero aqui desencadeará uma reinicialização completa "
-"com atraso caso a reinicialização suave falhe. Insira o número em segundos "
-"para esperar a falha da reinicialização suave ou use 0 para desativar o "
-"atraso de reinicialização forçada."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Se aplica aos modos ping reboot e os modos de reinicialização da interface</"
-"i> <br /> Caso esteja usando o ModemManager, será possível fazer com que o "
-"Watchcat reinicie a sua interface ModemManager através da definição do seu "
-"nome."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Grande: 248 bytes"
@@ -302,11 +302,11 @@ msgstr "Windows: 32 bytes"
 #~ "falhar."
 
 #~ msgid ""
-#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When rebooting "
-#~ "the router, the service will trigger a soft reboot. Entering a non-zero "
-#~ "value here will trigger a delayed hard reboot if the soft reboot were to "
-#~ "fail. Enter the number of seconds to wait for the soft reboot to fail or "
-#~ "use 0 to disable the forced reboot delay."
+#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When "
+#~ "rebooting the router, the service will trigger a soft reboot. Entering a "
+#~ "non-zero value here will trigger a delayed hard reboot if the soft reboot "
+#~ "were to fail. Enter the number of seconds to wait for the soft reboot to "
+#~ "fail or use 0 to disable the forced reboot delay."
 #~ msgstr ""
 #~ "Aplica-se aos modos Reiniciar com Ping e Reinicialização Periódica</i> "
 #~ "<br>Quando reiniciar o roteador, o serviço realizará uma reinicialização "
@@ -317,8 +317,8 @@ msgstr "Windows: 32 bytes"
 
 #~ msgid ""
 #~ "Applies to Ping Reboot and Restart Interface modes</i> <br> If using "
-#~ "ModemManager, you can have Watchcat restart your ModemManager interface by "
-#~ "specifying its name."
+#~ "ModemManager, you can have Watchcat restart your ModemManager interface "
+#~ "by specifying its name."
 #~ msgstr ""
 #~ "Aplica-se aos modos Reboot com Ping e da reinicialização da interface</i> "
 #~ "<br>Usando o ModemManager, você pode fazer com que o Watchcat reinicie a "
diff --git a/applications/luci-app-watchcat/po/ro/watchcat.po b/applications/luci-app-watchcat/po/ro/watchcat.po
index 8803790be3..79709b00bf 100644
--- a/applications/luci-app-watchcat/po/ro/watchcat.po
+++ b/applications/luci-app-watchcat/po/ro/watchcat.po
@@ -13,30 +13,13 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 4.14.1\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Se aplică în modurile Ping Reboot, Restart Interface și Run Script</i> "
-"<br /> Specificați interfața care trebuie monitorizată și reacționează în "
-"cazul în care un ping pe aceasta eșuează."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr "Familia de adrese pentru ping la gazdă"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "<i>Se aplică la modurile Ping Reboot și Reboot periodic</i> <br /> La "
 "repornirea routerului, serviciul va declanșa o repornire ușoară. "
@@ -55,6 +38,23 @@ msgstr ""
 "folosiți ModemManager, puteți face ca Watchcat să repornească interfața "
 "ModemManager prin specificarea numelui acesteia."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Se aplică în modurile Ping Reboot, Restart Interface și Run Script</i> "
+"<br /> Specificați interfața care trebuie monitorizată și reacționează în "
+"cazul în care un ping pe aceasta eșuează."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr "Familia de adrese pentru ping la gazdă"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Mare: 248 bytes"
diff --git a/applications/luci-app-watchcat/po/ru/watchcat.po b/applications/luci-app-watchcat/po/ru/watchcat.po
index ab1399bb0b..fa190fc370 100644
--- a/applications/luci-app-watchcat/po/ru/watchcat.po
+++ b/applications/luci-app-watchcat/po/ru/watchcat.po
@@ -16,30 +16,13 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Используется в режимах \"Перезагрузка на основе пинга\", \"Перезагрузка "
-"интерфейса\", и \"Запуск сценария\"</i> <br /> Выберите интерфейс, через "
-"который будет посылаться пинг."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr "Версия интернет-протокола для отправки пинга устройству"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr "Любой"
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "<i>Применимо к режимам \"Перезагрузка на основе пинга\" и \"Периодическая "
 "перезагрузка\"</i> <br /> Вначале будет инициирована корректная "
@@ -57,6 +40,23 @@ msgstr ""
 "интерфейса\"</i> <br /> При использовании ModemManager Watchcat может "
 "перезапускать его интерфейс, указанный по имени."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Используется в режимах \"Перезагрузка на основе пинга\", \"Перезагрузка "
+"интерфейса\", и \"Запуск сценария\"</i> <br /> Выберите интерфейс, через "
+"который будет посылаться пинг."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr "Версия интернет-протокола для отправки пинга устройству"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr "Любой"
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Большой: 248 байт"
diff --git a/applications/luci-app-watchcat/po/sk/watchcat.po b/applications/luci-app-watchcat/po/sk/watchcat.po
index 6bf11aa4e4..eb9bf620ba 100644
--- a/applications/luci-app-watchcat/po/sk/watchcat.po
+++ b/applications/luci-app-watchcat/po/sk/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.10-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/sv/watchcat.po b/applications/luci-app-watchcat/po/sv/watchcat.po
index beb1411c93..086d5d91a3 100644
--- a/applications/luci-app-watchcat/po/sv/watchcat.po
+++ b/applications/luci-app-watchcat/po/sv/watchcat.po
@@ -12,6 +12,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.14.1-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -26,22 +42,6 @@ msgstr "Adress-familjen för att pinga värden"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Stor: 248 bytes"
diff --git a/applications/luci-app-watchcat/po/templates/watchcat.pot b/applications/luci-app-watchcat/po/templates/watchcat.pot
index a356a00946..adb5f8821d 100644
--- a/applications/luci-app-watchcat/po/templates/watchcat.pot
+++ b/applications/luci-app-watchcat/po/templates/watchcat.pot
@@ -1,6 +1,22 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -15,22 +31,6 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr ""
diff --git a/applications/luci-app-watchcat/po/tr/watchcat.po b/applications/luci-app-watchcat/po/tr/watchcat.po
index 23b4d0ced4..830f17795b 100644
--- a/applications/luci-app-watchcat/po/tr/watchcat.po
+++ b/applications/luci-app-watchcat/po/tr/watchcat.po
@@ -12,6 +12,32 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Ping Yeniden Başlatma ve Periyodik Yeniden Başlatma modları için "
+"geçerlidir </i> <br /> Yönlendiriciyi yeniden başlatırken, hizmet yumuşak "
+"bir yeniden başlatmayı tetikleyecektir. Buraya sıfır olmayan bir değer "
+"girmek, yumuşak yeniden başlatma başarısız olursa, gecikmeli bir donanım "
+"yeniden başlatmayı tetikleyecektir. Yumuşak yeniden başlatmanın başarısız "
+"olması için beklenecek saniye sayısını girin veya zorunlu yeniden başlatma "
+"gecikmesini devre dışı bırakmak için 0'ı kullanın."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Ping Yeniden Başlatma ve Yeniden Başlatma Arayüzü modları için geçerlidir "
+"</i> <br /> ModemManager kullanıyorsanız, Watchcat'in adını belirterek "
+"ModemManager arayüzünüzü yeniden başlatmasını sağlayabilirsiniz."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,32 +55,6 @@ msgstr "Ana bilgisayara ping atmak için adres ailesi"
 msgid "Any"
 msgstr "Herhangi"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Ping Yeniden Başlatma ve Periyodik Yeniden Başlatma modları için geçerlidir "
-"</i> <br /> Yönlendiriciyi yeniden başlatırken, hizmet yumuşak bir yeniden "
-"başlatmayı tetikleyecektir. Buraya sıfır olmayan bir değer girmek, yumuşak "
-"yeniden başlatma başarısız olursa, gecikmeli bir donanım yeniden başlatmayı "
-"tetikleyecektir. Yumuşak yeniden başlatmanın başarısız olması için "
-"beklenecek saniye sayısını girin veya zorunlu yeniden başlatma gecikmesini "
-"devre dışı bırakmak için 0'ı kullanın."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Ping Yeniden Başlatma ve Yeniden Başlatma Arayüzü modları için geçerlidir </"
-"i> <br /> ModemManager kullanıyorsanız, Watchcat'in adını belirterek "
-"ModemManager arayüzünüzü yeniden başlatmasını sağlayabilirsiniz."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Büyük: 248 bayt"
diff --git a/applications/luci-app-watchcat/po/uk/watchcat.po b/applications/luci-app-watchcat/po/uk/watchcat.po
index 1e6f4c1e60..2a4933fffc 100644
--- a/applications/luci-app-watchcat/po/uk/watchcat.po
+++ b/applications/luci-app-watchcat/po/uk/watchcat.po
@@ -13,30 +13,13 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
-msgid ""
-"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
-"> Specify the interface to monitor and react if a ping over it fails."
-msgstr ""
-"<i>Застосовується до режимів Ping Reboot, Restart Interface та Run Script</"
-"i> <br /> Вкажіть інтерфейс, який моніторитиметься, та дії, які будуть "
-"виконані, якщо ping по ньому зазнає невдачі."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
-msgid "Address family for pinging the host"
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
-msgid "Any"
-msgstr ""
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
 msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
 msgstr ""
 "<i>Застосовується до режимів Ping-перезавантаження та Періодичного "
 "перезавантаження</i> <br /> Під час перезавантаження маршрутизатора служба "
@@ -52,10 +35,27 @@ msgid ""
 "ModemManager, you can have Watchcat restart your ModemManager interface by "
 "specifying its name."
 msgstr ""
-"<i>Застосовується до режимів Ping-перезавантаження та Перезапуску інтерфейсу </"
-"i> <br /> Якщо використовується ModemManager, ви можете попросити Watchcat "
+"<i>Застосовується до режимів Ping-перезавантаження та Перезапуску інтерфейсу "
+"</i> <br /> Якщо використовується ModemManager, ви можете попросити Watchcat "
 "перезапустити інтерфейс ModemManager, вказавши його назву."
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
+msgid ""
+"<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
+"> Specify the interface to monitor and react if a ping over it fails."
+msgstr ""
+"<i>Застосовується до режимів Ping Reboot, Restart Interface та Run Script</"
+"i> <br /> Вкажіть інтерфейс, який моніторитиметься, та дії, які будуть "
+"виконані, якщо ping по ньому зазнає невдачі."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+msgid "Address family for pinging the host"
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+msgid "Any"
+msgstr ""
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Великий: 248 байт"
diff --git a/applications/luci-app-watchcat/po/vi/watchcat.po b/applications/luci-app-watchcat/po/vi/watchcat.po
index 4b82294ea6..1d15650804 100644
--- a/applications/luci-app-watchcat/po/vi/watchcat.po
+++ b/applications/luci-app-watchcat/po/vi/watchcat.po
@@ -12,6 +12,31 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.18.1\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>Áp dụng cho chế độ Khởi động lại Ping và Khởi động lại định kỳ</i> <br /"
+">Khi khởi động lại bộ định tuyến, dịch vụ sẽ kích hoạt khởi động lại mềm. "
+"Nhập một giá trị khác không ở đây sẽ kích hoạt khởi động lại cứng bị trì "
+"hoãn nếu khởi động lại mềm không thành công. Nhập số giây để chờ khởi động "
+"lại mềm không thành công hoặc sử dụng 0 để vô hiệu hóa độ trễ khởi động lại "
+"bắt buộc."
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>Áp dụng cho chế độ Khởi động lại Ping và Khởi động lại giao diện</i> <br /"
+">Nếu sử dụng ModemManager, bạn có thể yêu cầu Watchcat khởi động lại giao "
+"diện ModemManager của mình bằng cách chỉ định tên của nó."
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -29,30 +54,6 @@ msgstr "Address family for pinging the host"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>Áp dụng cho chế độ Khởi động lại Ping và Khởi động lại định kỳ</i> <br />Khi "
-"khởi động lại bộ định tuyến, dịch vụ sẽ kích hoạt khởi động lại mềm. Nhập "
-"một giá trị khác không ở đây sẽ kích hoạt khởi động lại cứng bị trì hoãn nếu "
-"khởi động lại mềm không thành công. Nhập số giây để chờ khởi động lại mềm "
-"không thành công hoặc sử dụng 0 để vô hiệu hóa độ trễ khởi động lại bắt buộc."
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>Áp dụng cho chế độ Khởi động lại Ping và Khởi động lại giao diện</i> <br /"
-">Nếu sử dụng ModemManager, bạn có thể yêu cầu Watchcat khởi động lại giao "
-"diện ModemManager của mình bằng cách chỉ định tên của nó."
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "Big: 248 bytes"
diff --git a/applications/luci-app-watchcat/po/zh_Hans/watchcat.po b/applications/luci-app-watchcat/po/zh_Hans/watchcat.po
index 6cf5a019a8..8c7dcb8ed7 100644
--- a/applications/luci-app-watchcat/po/zh_Hans/watchcat.po
+++ b/applications/luci-app-watchcat/po/zh_Hans/watchcat.po
@@ -15,6 +15,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.15-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>应用于 Ping 重启 和 定时重启 模式</i> <br />当重新启动路由器时，该服务将触"
+"发软重启。如果软重启失败，在这里输入非零值将触发延迟的硬重启。输入等待软重启"
+"失败的秒数或使用 0 来禁用强制重启延迟。"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>应用于 Ping 重启 和 重启接口 模式</i> <br />如果使用 ModemManager，你可以"
+"通过指定名称让 Watchcat 重新启动你的 ModemManager 接口。"
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -31,27 +52,6 @@ msgstr "Ping 主机的地址簇"
 msgid "Any"
 msgstr "任何"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>应用于 Ping 重启 和 定时重启 模式</i> <br />当重新启动路由器时，该服务将触发"
-"软重启。如果软重启失败，在这里输入非零值将触发延迟的硬重启。输入等待软重启失"
-"败的秒数或使用 0 来禁用强制重启延迟。"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>应用于 Ping 重启 和 重启接口 模式</i> <br />如果使用 ModemManager，你可以通过"
-"指定名称让 Watchcat 重新启动你的 ModemManager 接口。"
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "大：248 字节"
@@ -280,11 +280,11 @@ msgstr "Windows：32 字节"
 #~ "败，要监控和重新开始的接口。"
 
 #~ msgid ""
-#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When rebooting "
-#~ "the router, the service will trigger a soft reboot. Entering a non-zero "
-#~ "value here will trigger a delayed hard reboot if the soft reboot were to "
-#~ "fail. Enter the number of seconds to wait for the soft reboot to fail or "
-#~ "use 0 to disable the forced reboot delay."
+#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When "
+#~ "rebooting the router, the service will trigger a soft reboot. Entering a "
+#~ "non-zero value here will trigger a delayed hard reboot if the soft reboot "
+#~ "were to fail. Enter the number of seconds to wait for the soft reboot to "
+#~ "fail or use 0 to disable the forced reboot delay."
 #~ msgstr ""
 #~ "适用于 Ping 重启和周期性重启模式</i> 重新启动路由器时，该服务将触发软重"
 #~ "启。 如果软重启失败，则在此处输入非零值将触发延迟的硬重启。 输入等待软重启"
@@ -292,8 +292,8 @@ msgstr "Windows：32 字节"
 
 #~ msgid ""
 #~ "Applies to Ping Reboot and Restart Interface modes</i> <br> If using "
-#~ "ModemManager, you can have Watchcat restart your ModemManager interface by "
-#~ "specifying its name."
+#~ "ModemManager, you can have Watchcat restart your ModemManager interface "
+#~ "by specifying its name."
 #~ msgstr ""
 #~ "适用于 Ping 重启和重新开始接口模式</i> <br> 如果使用 ModemManager，则可以"
 #~ "让Watchcat 通过指定其名称来重新启动ModemManager 接口。"
diff --git a/applications/luci-app-watchcat/po/zh_Hant/watchcat.po b/applications/luci-app-watchcat/po/zh_Hant/watchcat.po
index aed8d674c9..22e53e3eb5 100644
--- a/applications/luci-app-watchcat/po/zh_Hant/watchcat.po
+++ b/applications/luci-app-watchcat/po/zh_Hant/watchcat.po
@@ -15,6 +15,27 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+msgid ""
+"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When "
+"rebooting the router, the service will trigger a soft reboot. Entering a non-"
+"zero value here will trigger a delayed hard reboot if the soft reboot were "
+"to fail. Enter the number of seconds to wait for the soft reboot to fail or "
+"use 0 to disable the forced reboot delay."
+msgstr ""
+"<i>應用於 Ping 重新啟動 和 定時重新啟動 模式</i> <br />當重新啟動路由器時，該"
+"服務將觸發軟重新啟動。如果軟重新啟動失敗，在這裡輸入非零值將觸發延遲的硬重新"
+"啟動。輸入等待軟重新啟動失敗的秒數或使用 0 來停用強制重新啟動延遲。"
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
+msgid ""
+"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
+"ModemManager, you can have Watchcat restart your ModemManager interface by "
+"specifying its name."
+msgstr ""
+"<i>應用於 Ping Reboot 和 Restart 介面模式</i> <br />如果使用 ModemManager，您"
+"可以透過指定名稱讓 Watchcat 重新啟動您的 ModemManager 介面。"
+
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "<i>Applies to Ping Reboot, Restart Interface, and Run Script modes</i> <br /"
@@ -31,27 +52,6 @@ msgstr "Ping 主機的位址家族"
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
-msgid ""
-"<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
-"the router, the service will trigger a soft reboot. Entering a non-zero "
-"value here will trigger a delayed hard reboot if the soft reboot were to "
-"fail. Enter the number of seconds to wait for the soft reboot to fail or use "
-"0 to disable the forced reboot delay."
-msgstr ""
-"<i>應用於 Ping 重新啟動 和 定時重新啟動 模式</i> <br />當重新啟動路由器時，該服"
-"務將觸發軟重新啟動。如果軟重新啟動失敗，在這裡輸入非零值將觸發延遲的硬重新啟"
-"動。輸入等待軟重新啟動失敗的秒數或使用 0 來停用強制重新啟動延遲。"
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:111
-msgid ""
-"<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
-"ModemManager, you can have Watchcat restart your ModemManager interface by "
-"specifying its name."
-msgstr ""
-"<i>應用於 Ping Reboot 和 Restart 介面模式</i> <br />如果使用 ModemManager，您可"
-"以透過指定名稱讓 Watchcat 重新啟動您的 ModemManager 介面。"
-
 #: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:84
 msgid "Big: 248 bytes"
 msgstr "大：248 位元組"
@@ -279,11 +279,11 @@ msgstr "Windows：32 位元組"
 #~ "失敗，要監控和重新啟動的介面。"
 
 #~ msgid ""
-#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When rebooting "
-#~ "the router, the service will trigger a soft reboot. Entering a non-zero "
-#~ "value here will trigger a delayed hard reboot if the soft reboot were to "
-#~ "fail. Enter the number of seconds to wait for the soft reboot to fail or "
-#~ "use 0 to disable the forced reboot delay."
+#~ "<i>Applies to Ping Reboot and Periodic Reboot modes</i> <br> When "
+#~ "rebooting the router, the service will trigger a soft reboot. Entering a "
+#~ "non-zero value here will trigger a delayed hard reboot if the soft reboot "
+#~ "were to fail. Enter the number of seconds to wait for the soft reboot to "
+#~ "fail or use 0 to disable the forced reboot delay."
 #~ msgstr ""
 #~ "適用於 Ping 重新啟動和週期性重新啟動模式</i> 重新啟動路由器時，該服務將觸"
 #~ "發軟開機。 如果軟開機失敗，則在此處輸入非零值將觸發延遲的硬開機。輸入等待"
@@ -291,8 +291,8 @@ msgstr "Windows：32 位元組"
 
 #~ msgid ""
 #~ "Applies to Ping Reboot and Restart Interface modes</i> <br> If using "
-#~ "ModemManager, you can have Watchcat restart your ModemManager interface by "
-#~ "specifying its name."
+#~ "ModemManager, you can have Watchcat restart your ModemManager interface "
+#~ "by specifying its name."
 #~ msgstr ""
 #~ "適用於 Ping 重新啟動和重新啟動介面模式</i> <br> 如果使用 ModemManager，則"
 #~ "可以讓 Watchcat 透過指定其名稱來重新啟動 ModemManager 介面。"