treewide: resync translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

29 files changed, 438 insertions, 1487 deletions

diff --git a/applications/luci-app-firewall/po/bg/firewall.po b/applications/luci-app-firewall/po/bg/firewall.po
index 2a1547d08c..9287568440 100644
--- a/applications/luci-app-firewall/po/bg/firewall.po
+++ b/applications/luci-app-firewall/po/bg/firewall.po
@@ -16,7 +16,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -25,12 +24,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -39,17 +36,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -115,6 +109,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -127,11 +125,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -150,22 +148,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -176,17 +167,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -196,7 +184,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -253,7 +240,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -326,17 +313,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -386,12 +370,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -506,17 +488,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -524,10 +503,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -545,14 +520,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -708,6 +675,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -794,12 +765,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -814,29 +783,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -847,7 +810,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -858,11 +820,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index ce7e4fe818..4219ff2e33 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -21,7 +21,6 @@ msgid "%s in %s"
 msgstr "%s en %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s amb %s"
 
@@ -30,12 +29,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s en %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paquets al <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -44,17 +41,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> i limita a %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -120,6 +114,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -132,11 +130,11 @@ msgstr "Xarxes cobertes"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Regles personalitzades"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -159,22 +157,15 @@ msgstr "Port de destí"
 msgid "Destination zone"
 msgstr "Zona de destí"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -185,17 +176,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -205,7 +193,6 @@ msgstr "Descarta els paquets invàlids"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activa"
 
@@ -258,7 +245,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Tallafocs"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Tallafocs - Regles personalitzades"
 
@@ -331,17 +318,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -391,12 +375,10 @@ msgid "Limit log messages"
 msgstr "Limita els missatges de registre"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -517,17 +499,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirigeix trànsit entrant coincidit al host intern especificat"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -535,10 +514,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringeix la mascarada a les subxarxes de destí donades"
@@ -556,14 +531,6 @@ msgstr "Restringeix a la família d'adreces"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Dissabte"
@@ -707,6 +674,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Dimarts"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -793,12 +764,10 @@ msgstr "qualsevol IP d'encaminador"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualsevol zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -813,29 +782,23 @@ msgid "drop"
 msgstr "descarta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -846,7 +809,6 @@ msgid "reject"
 msgstr "rebutja"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -857,12 +819,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index b465d137f7..0b001d6f7f 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -16,7 +16,6 @@ msgid "%s in %s"
 msgstr "%s v %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s s %s"
 
@@ -25,12 +24,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s v %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paketů za <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> paketů za <var>%s</var>, burst <var>%d</var> paketů."
 
@@ -39,17 +36,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> a omezit na %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -115,6 +109,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -127,11 +125,11 @@ msgstr "Pokryté sítě"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Vlastní pravidla"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -153,22 +151,15 @@ msgstr "Cílový port"
 msgid "Destination zone"
 msgstr "Cílová oblast"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -179,17 +170,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -199,7 +187,6 @@ msgstr "Zahazovat neplatné pakety"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Povolit"
 
@@ -252,7 +239,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Vlastní pravidla"
 
@@ -325,17 +312,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -385,12 +369,10 @@ msgid "Limit log messages"
 msgstr "Omezit logovací zprávy"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -513,17 +495,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Přesměrovat vybraný příchozí provoz na uvedeného vnitřního hostitele."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -531,10 +510,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Omezit maškarádování na uvedené cílové podsítě"
@@ -552,14 +527,6 @@ msgstr "Omezit na rodinu adres"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -702,6 +669,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -788,12 +759,10 @@ msgstr "libovolná IP routeru"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "libovolná zóna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -808,29 +777,23 @@ msgid "drop"
 msgstr "zahodit"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -841,7 +804,6 @@ msgid "reject"
 msgstr "odmítnout"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -852,12 +814,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index eb90e03a6f..498a10f69d 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -19,7 +19,6 @@ msgid "%s in %s"
 msgstr "%s in %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s mit %s"
 
@@ -28,12 +27,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s in %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> Pkte. pro <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> Pkte. pro <var>%s</var>, Häufung <var>%d</var> Pkte."
 
@@ -42,17 +39,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> und limitieren auf %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Erlaubte Weiterleitung"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -120,6 +114,10 @@ msgstr "Conntrack-Einstellungen"
 msgid "Conntrack helpers"
 msgstr "Conntrack-Helfer"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -132,11 +130,11 @@ msgstr "Abgedeckte Netzwerke"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Benutzerdefinierte Regeln"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -159,22 +157,15 @@ msgstr "Zielport"
 msgid "Destination zone"
 msgstr "Ziel-Zone"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Deaktivieren"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -185,17 +176,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -205,7 +193,6 @@ msgstr "Ungültige Pakete verwerfen"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -258,7 +245,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Benutzerdefinierte Regeln"
 
@@ -331,17 +318,14 @@ msgid "Hardware flow offloading"
 msgstr "Hardwarebeschleunigte Flusskontrolle"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -391,12 +375,10 @@ msgid "Limit log messages"
 msgstr "Protokollnachrichten limitieren"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -519,17 +501,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -538,10 +517,6 @@ msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Erfordert Hardware-NAT-Unterstützung. (Zumindest für mt7621 implementiert)"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Firewall neu starten"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
@@ -559,14 +534,6 @@ msgstr "Beschränke auf Adressfamilie"
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT-Beschleunigung"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "Regel ist deaktiviert"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "Regel ist aktiviert"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Samstag"
@@ -712,6 +679,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Dienstag"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -800,12 +771,10 @@ msgstr "beliebige Router-IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "beliebige Zone"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -820,29 +789,23 @@ msgid "drop"
 msgstr "verwerfen"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -853,7 +816,6 @@ msgid "reject"
 msgstr "zurückweisen"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -864,15 +826,25 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
+#~ msgid "Disable"
+#~ msgstr "Deaktivieren"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "Firewall neu starten"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Regel ist deaktiviert"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Regel ist aktiviert"
+
 #~ msgid "Add"
 #~ msgstr "Hinzufügen"
 
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 04cb7c343e..1359c11774 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s με %s"
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> πκτ. ανά <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -41,17 +38,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -117,6 +111,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -129,11 +127,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Προσαρμοσμένοι Κανόνες"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -153,22 +151,15 @@ msgstr "Θύρα προορισμού"
 msgid "Destination zone"
 msgstr "Ζώνη προορισμού"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -179,17 +170,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -199,7 +187,6 @@ msgstr "Αγνόηση μη-έγκυρων πακετών"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
@@ -253,7 +240,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Τείχος προστασίας"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
 
@@ -326,17 +313,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -388,12 +372,10 @@ msgid "Limit log messages"
 msgstr "Περιορισμός καταγραφών συστήματος"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -509,17 +491,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -527,10 +506,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -548,14 +523,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -686,6 +653,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -772,12 +743,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -792,29 +761,23 @@ msgid "drop"
 msgstr "αγνόηση"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -825,7 +788,6 @@ msgid "reject"
 msgstr "απόρριψη"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -836,12 +798,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index e38a33d2a6..3c913d910e 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -16,7 +16,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -25,12 +24,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -39,17 +36,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -115,6 +109,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -127,11 +125,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -150,22 +148,15 @@ msgstr "Destination port"
 msgid "Destination zone"
 msgstr "Destination zone"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -176,17 +167,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -196,7 +184,6 @@ msgstr "Drop invalid packets"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -253,7 +240,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -326,17 +313,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -386,12 +370,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -509,17 +491,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirect matched incoming traffic to the specified internal host"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -527,10 +506,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -548,14 +523,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -713,6 +680,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -799,12 +770,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -819,29 +788,23 @@ msgid "drop"
 msgstr "drop"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -852,7 +815,6 @@ msgid "reject"
 msgstr "reject"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -863,11 +825,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index d319928147..9372ac2de4 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -19,7 +19,6 @@ msgid "%s in %s"
 msgstr "%s en %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s con %s"
 
@@ -28,12 +27,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s en %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paquetes por <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 "<var>%d</var> paquetes por <var>%s</var>, máximo <var>%d</var> paquetes."
@@ -43,17 +40,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> y limitar a %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Aceptar reenvío"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Aceptar entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Aceptar salida"
 
@@ -127,6 +121,10 @@ msgstr "Configuraciones de Conntrack"
 msgid "Conntrack helpers"
 msgstr "Ayudantes de Conntrack"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "Interfaces cubiertas"
@@ -139,11 +137,11 @@ msgstr "Redes cubiertas"
 msgid "Covered subnets"
 msgstr "Subredes cubiertas"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Reglas personalizadas"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -166,22 +164,15 @@ msgstr "Puerto de destino"
 msgid "Destination zone"
 msgstr "Zona de destino"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Desactivar"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Descartar reenvío"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Descartar entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Descartar salida"
 
@@ -195,17 +186,14 @@ msgstr ""
 "configuraciones complejas de rutas asimétricas."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "No seguir reenvío"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "No seguir entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "No seguir salida"
 
@@ -215,7 +203,6 @@ msgstr "Descartar paquetes inválidos"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activar"
 
@@ -270,7 +257,7 @@ msgstr "Argumentos fuente adicionales"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Reglas personalizadas"
 
@@ -343,17 +330,14 @@ msgid "Hardware flow offloading"
 msgstr "Descarga de flujo por hardware"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Rango de IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
@@ -403,12 +387,10 @@ msgid "Limit log messages"
 msgstr "Limitar registro de mensajes"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
@@ -540,17 +522,14 @@ msgstr ""
 "Redirigir el tráfico de entrada que coincida al host interno especificado"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Rechazar reenvío"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Rechazar entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Rechazar salida"
 
@@ -559,10 +538,6 @@ msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Requiere soporte de NAT por hardware. Implementado al menos para mt7621"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Reiniciar Firewall"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringir enmascaramiento a las subredes destino"
@@ -580,14 +555,6 @@ msgstr "Restringir a la familia de direcciones"
 msgid "Routing/NAT Offloading"
 msgstr "Enrutamiento/NAT Offloading"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "Regla desactivada"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "Regla activada"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Sábado"
@@ -731,6 +698,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Martes"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -821,12 +792,10 @@ msgstr "cualquier router IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "cualquier zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "Día"
 
@@ -841,29 +810,23 @@ msgid "drop"
 msgstr "Descartar"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "Hora"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "Minuto"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "No"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "puerto"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "puertos"
 
@@ -874,7 +837,6 @@ msgid "reject"
 msgstr "Rechazar"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "segundo"
 
@@ -885,15 +847,25 @@ msgid "this new zone"
 msgstr "Esta nueva zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "Tipo"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "Tipos"
 
+#~ msgid "Disable"
+#~ msgstr "Desactivar"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "Reiniciar Firewall"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Regla desactivada"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Regla activada"
+
 #~ msgid "Add"
 #~ msgstr "Añadir"
 
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 9bdfa9edc1..7097238a84 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -19,7 +19,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -28,12 +27,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -42,17 +39,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -118,6 +112,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -130,11 +128,11 @@ msgstr "Réseaux couverts"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Régles spécifiques"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -153,22 +151,15 @@ msgstr "Port de destination"
 msgid "Destination zone"
 msgstr "Zone de destination"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Désactiver"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -179,17 +170,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -199,7 +187,6 @@ msgstr "Supprimer les paquets invalides"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activer"
 
@@ -256,7 +243,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Pare-feu"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Pare-feu -- Règles personnalisées"
 
@@ -329,17 +316,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -389,12 +373,10 @@ msgid "Limit log messages"
 msgstr "Limiter les messages de journalisation"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -517,17 +499,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -535,10 +514,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -560,14 +535,6 @@ msgstr "Restreindre à cette famille d'adresses"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -739,6 +706,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -825,12 +796,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -845,29 +814,23 @@ msgid "drop"
 msgstr "ignorer"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -878,7 +841,6 @@ msgid "reject"
 msgstr "rejeter"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -889,15 +851,16 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
+#~ msgid "Disable"
+#~ msgstr "Désactiver"
+
 #~ msgid "External zone"
 #~ msgstr "Zone externe"
 
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index b5e2e9a8d4..f0799c6664 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -13,7 +13,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -22,12 +21,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -36,17 +33,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -112,6 +106,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -124,11 +122,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -147,22 +145,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -173,17 +164,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -193,7 +181,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -246,7 +233,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -319,17 +306,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -379,12 +363,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -499,17 +481,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -517,10 +496,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -538,14 +513,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -671,6 +638,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -757,12 +728,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -777,29 +746,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -810,7 +773,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -821,11 +783,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/hi/firewall.po b/applications/luci-app-firewall/po/hi/firewall.po
index acc2ce2cbd..bf4e771122 100644
--- a/applications/luci-app-firewall/po/hi/firewall.po
+++ b/applications/luci-app-firewall/po/hi/firewall.po
@@ -16,7 +16,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -25,12 +24,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -39,17 +36,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -115,6 +109,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -127,11 +125,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -150,22 +148,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -176,17 +167,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -196,7 +184,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -253,7 +240,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -326,17 +313,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -386,12 +370,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -506,17 +488,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -524,10 +503,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -545,14 +520,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -708,6 +675,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -794,12 +765,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -814,29 +783,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -847,7 +810,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -858,11 +820,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 000c19f3d0..d765692b9f 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -16,7 +16,6 @@ msgid "%s in %s"
 msgstr "%s %s-ban"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s %s-el"
 
@@ -25,12 +24,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s %s-ben"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> csomag/<var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> csom. <var>%s</var>-enként, burst <var>%d</var> csom."
 
@@ -39,17 +36,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> és korlátozás %s-re"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -115,6 +109,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -127,11 +125,11 @@ msgstr "Lefedett hálózatok"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Egyéni szabályok"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -154,22 +152,15 @@ msgstr "Cél port"
 msgid "Destination zone"
 msgstr "Cél zóna"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -180,17 +171,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -200,7 +188,6 @@ msgstr "Érvénytelen csomagok eldobása"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Engedélyezés"
 
@@ -253,7 +240,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Tűzfal"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Tűzfal - Egyéni szabályok"
 
@@ -326,17 +313,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -386,12 +370,10 @@ msgid "Limit log messages"
 msgstr "Napló üzenetek korlátozása"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -516,17 +498,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -534,10 +513,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
@@ -555,14 +530,6 @@ msgstr "Korlátozás cím családra"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -707,6 +674,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -793,12 +764,10 @@ msgstr "bármelyik router IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "bármelyik zóna"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -813,29 +782,23 @@ msgid "drop"
 msgstr "eldobás"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -846,7 +809,6 @@ msgid "reject"
 msgstr "visszautasítás"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -857,12 +819,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index aa522e2f24..af61fa7dbd 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s con %s"
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -41,17 +38,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> e limita a %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -117,6 +111,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -129,11 +127,11 @@ msgstr "Reti coperte"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Regole Personalizzate"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -156,22 +154,15 @@ msgstr "Porta di destinazione"
 msgid "Destination zone"
 msgstr "Zona di destinazione"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -182,17 +173,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -202,7 +190,6 @@ msgstr "Scarta pacchetti invalidi"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Attiva"
 
@@ -255,7 +242,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regole Personalizzate"
 
@@ -328,17 +315,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -388,12 +372,10 @@ msgid "Limit log messages"
 msgstr "Limita messaggi del registro"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -514,17 +496,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Reindirizza il traffico in entrata allo specifico host interno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -532,10 +511,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Riavvia Firewall"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Limita il Masquerading alle subnet di destinazione date"
@@ -553,14 +528,6 @@ msgstr "Limita agli indirizzi famiglia"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Sabato"
@@ -725,6 +692,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Martedì"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -811,12 +782,10 @@ msgstr "qualsiasi router IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualsiasi zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -831,29 +800,23 @@ msgid "drop"
 msgstr "scarta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -864,7 +827,6 @@ msgid "reject"
 msgstr "rifiuta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -875,15 +837,16 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
+#~ msgid "Restart Firewall"
+#~ msgstr "Riavvia Firewall"
+
 #~ msgid "Add"
 #~ msgstr "Aggiungi"
 
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 85702e60de..274d5c0c9d 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr "%s (%s)"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s ,%s"
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s (%s)"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> パケット / <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 "<var>%d</var> パケット / <var>%s</var>, バースト <var>%d</var> パケット"
@@ -42,17 +39,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var>, %s を上限に設定"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "転送を許可"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "入力を許可"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "出力を許可"
 
@@ -126,6 +120,10 @@ msgstr "Conntrack 設定"
 msgid "Conntrack helpers"
 msgstr "Conntrack ヘルパー"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "カバーされるデバイス"
@@ -138,11 +136,11 @@ msgstr "対象ネットワーク"
 msgid "Covered subnets"
 msgstr "カバーされるサブネット"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "手動設定ルール"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -165,22 +163,15 @@ msgstr "宛先ポート"
 msgid "Destination zone"
 msgstr "宛先ゾーン"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "無効"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "転送を破棄"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "入力を破棄"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "出力を破棄"
 
@@ -194,17 +185,14 @@ msgstr ""
 "に必要となることがあります。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "転送を追跡しない"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "入力を追跡しない"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "出力を追跡しない"
 
@@ -214,7 +202,6 @@ msgstr "無効なパケットを遮断する"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "有効"
 
@@ -267,7 +254,7 @@ msgstr "追加の送信元引数"
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "ファイアウォール - 手動設定ルール"
 
@@ -340,17 +327,14 @@ msgid "Hardware flow offloading"
 msgstr "ハードウェア フローオフロード"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "IP の範囲"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
@@ -400,12 +384,10 @@ msgid "Limit log messages"
 msgstr "ログメッセージを制限"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
@@ -539,17 +521,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "転送を拒否"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "入力を拒否"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "出力を拒否"
 
@@ -558,10 +537,6 @@ msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "ハードウェア NAT サポートが必要です。 mt7621 のみにおいて実装されています。"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "ファイアウォールの再起動"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "設定された宛先サブネットへのマスカレードを制限する"
@@ -579,14 +554,6 @@ msgstr "アドレスファミリの制限"
 msgid "Routing/NAT Offloading"
 msgstr "ルーティング/NAT オフロード"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "ルールは無効です"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "ルールは有効です"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "土曜日"
@@ -728,6 +695,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "火曜日"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -818,12 +789,10 @@ msgstr "全てのルーターIP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "全てのゾーン"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "日"
 
@@ -838,29 +807,23 @@ msgid "drop"
 msgstr "破棄"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "時間"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "分"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "ポート"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "ポート"
 
@@ -871,7 +834,6 @@ msgid "reject"
 msgstr "拒否"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "秒"
 
@@ -882,15 +844,25 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "タイプ"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "タイプ"
 
+#~ msgid "Disable"
+#~ msgstr "無効"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "ファイアウォールの再起動"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "ルールは無効です"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "ルールは有効です"
+
 #~ msgid "Add"
 #~ msgstr "追加"
 
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index c916d1122f..289f3a180b 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s ,%s"
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -41,17 +38,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -117,6 +111,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -129,11 +127,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Custom Rule"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -155,22 +153,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -181,17 +172,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -201,7 +189,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "활성화"
 
@@ -254,7 +241,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "방화벽"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "방화벽 - Custom Rules"
 
@@ -327,17 +314,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -387,12 +371,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -509,17 +491,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -527,10 +506,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "주어진 destination subnet 으로 Masquerading 제한"
@@ -548,14 +523,6 @@ msgstr "Address family 제한"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "토요일"
@@ -698,6 +665,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "화요일"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -784,12 +755,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -804,29 +773,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -837,7 +800,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -848,12 +810,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index 56a0f053ef..49461072d9 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -12,7 +12,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -21,12 +20,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -35,17 +32,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -111,6 +105,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -123,11 +121,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -146,22 +144,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -172,17 +163,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -192,7 +180,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -245,7 +232,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -318,17 +305,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -378,12 +362,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -498,17 +480,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -516,10 +495,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -537,14 +512,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -670,6 +637,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -756,12 +727,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -776,29 +745,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -809,7 +772,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -820,11 +782,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index 625a6a363b..52f0fb7a24 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -13,7 +13,6 @@ msgid "%s in %s"
 msgstr "%s i %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s med %s"
 
@@ -22,12 +21,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s i %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pakker per <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> pakker per <var>%s</var>, burst <var>%d</var>pakker."
 
@@ -36,17 +33,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> og begrens til %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -112,6 +106,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -124,11 +122,11 @@ msgstr "Gjeldene nettverk"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Egendefinerte Regler"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -150,22 +148,15 @@ msgstr "Destinasjon port"
 msgid "Destination zone"
 msgstr "Destinasjon sone"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -176,17 +167,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -196,7 +184,6 @@ msgstr "Forkast ugyldige pakker"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -249,7 +236,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Brannmur - Egendefinerte Regler"
 
@@ -323,17 +310,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -383,12 +367,10 @@ msgid "Limit log messages"
 msgstr "Begrens logging"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -511,17 +493,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -529,10 +508,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
@@ -550,14 +525,6 @@ msgstr "Begrens til adresse familie"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -701,6 +668,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -787,12 +758,10 @@ msgstr "enhver ruter IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "enhver sone"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -807,29 +776,23 @@ msgid "drop"
 msgstr "forkast"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -840,7 +803,6 @@ msgid "reject"
 msgstr "avslå"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -851,12 +813,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 5c96d57b79..fcb9a90918 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -19,7 +19,6 @@ msgid "%s in %s"
 msgstr "%s w %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s z %s"
 
@@ -28,12 +27,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s w %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pakiet. na <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 "<var>%d</var> pakiet. na <var>%s</var>, popsutych <var>%d</var> pakiet."
@@ -43,17 +40,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> i ograniczone do %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -119,6 +113,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -131,11 +129,11 @@ msgstr "Objęte sieci"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Własne reguły"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -157,22 +155,15 @@ msgstr "Port docelowy"
 msgid "Destination zone"
 msgstr "Strefa docelowa"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -183,17 +174,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -203,7 +191,6 @@ msgstr "Porzuć wadliwe pakiety"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Włącz"
 
@@ -259,7 +246,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Zapora"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Zapora - Reguły własne"
 
@@ -332,17 +319,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -392,12 +376,10 @@ msgid "Limit log messages"
 msgstr "Ograniczenie logowania"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -521,17 +503,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -539,10 +518,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
@@ -562,14 +537,6 @@ msgstr "Ogranicz do rodziny adresów"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -712,6 +679,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -798,12 +769,10 @@ msgstr "dowolne IP routera"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "dowolna strefa"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -818,29 +787,23 @@ msgid "drop"
 msgstr "porzucaj"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -851,7 +814,6 @@ msgid "reject"
 msgstr "odrzucaj"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -862,12 +824,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 6926402548..03e7cdd5d6 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr "%s in %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s com %s"
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s em %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pcts. por <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> pcts. por <var>%s</var>, pico <var>%d</var> pcts."
 
@@ -41,17 +38,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> e limite a %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Aceitar o encaminhamento"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Aceitar a entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Aceitar a saída"
 
@@ -117,6 +111,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -129,11 +127,11 @@ msgstr "Redes cobertas"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -155,22 +153,15 @@ msgstr "Porta de destino"
 msgid "Destination zone"
 msgstr "Zona de destino"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Desabilitar"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Descartar o encaminhamento"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Descartar a entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Descartar a saída"
 
@@ -181,17 +172,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "Não rastrear o encaminhamento"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "Não rastrear a entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "Não rastrear a saída"
 
@@ -201,7 +189,6 @@ msgstr "Descartar pacotes inválidos"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilitar"
 
@@ -255,7 +242,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regras personalizadas"
 
@@ -328,17 +315,14 @@ msgid "Hardware flow offloading"
 msgstr "Aceleração de fluxo de dados via Hardware"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Faixa IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IPs"
 
@@ -388,12 +372,10 @@ msgid "Limit log messages"
 msgstr "Limita as mensagens de registro"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MACs"
 
@@ -516,17 +498,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redireciona tráfego entrante para o computador interno especificado"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Recusar encaminhamento"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Recusar entrada"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Recusar saída"
 
@@ -534,10 +513,6 @@ msgstr "Recusar saída"
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Reiniciar o Firewall"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringe o mascaramento para uma subrede de destino específica"
@@ -555,14 +530,6 @@ msgstr "Restringe para uma família de endereços"
 msgid "Routing/NAT Offloading"
 msgstr "Aceleração de Roteamento/NAT"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "A regra está desabilitada"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "A regra está habilitada"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Sábado"
@@ -705,6 +672,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Terça-feira"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -791,12 +762,10 @@ msgstr "qualquer endereço IP do roteador"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualquer zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "dia"
 
@@ -811,29 +780,23 @@ msgid "drop"
 msgstr "descartar"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "hora"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "minuto"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "não"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "porta"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "portas"
 
@@ -844,7 +807,6 @@ msgid "reject"
 msgstr "rejeitar"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "segundo"
 
@@ -855,15 +817,25 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "tipo"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "tipos"
 
+#~ msgid "Disable"
+#~ msgstr "Desabilitar"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "Reiniciar o Firewall"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "A regra está desabilitada"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "A regra está habilitada"
+
 #~ msgid "Add"
 #~ msgstr "Adicionar"
 
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 969df4ec66..2d4db3c34b 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -19,7 +19,6 @@ msgid "%s in %s"
 msgstr "%s em %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s with %s"
 
@@ -28,12 +27,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s em %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pkts. por <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -42,17 +39,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -118,6 +112,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -130,11 +128,11 @@ msgstr "Redes abrangidas"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -157,22 +155,15 @@ msgstr "Porta de destino"
 msgid "Destination zone"
 msgstr "Zona de destino"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Desativar"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -183,17 +174,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -203,7 +191,6 @@ msgstr "Cancelar pacotes inválidos"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Ativar"
 
@@ -256,7 +243,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regras Personalizadas"
 
@@ -329,17 +316,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -389,12 +373,10 @@ msgid "Limit log messages"
 msgstr "Limitar registo de mensagens"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -518,17 +500,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirecionar o tráfego de entrada correspondente para o host interno"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -536,10 +515,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -557,14 +532,6 @@ msgstr "Restringir a família de endereços"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -695,6 +662,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -781,12 +752,10 @@ msgstr "qualquer IP do router"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualquer zona"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -801,29 +770,23 @@ msgid "drop"
 msgstr "drop"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -834,7 +797,6 @@ msgid "reject"
 msgstr "rejeitar"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -845,15 +807,16 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
+#~ msgid "Disable"
+#~ msgstr "Desativar"
+
 #~ msgid "Add"
 #~ msgstr "Adicionar"
 
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 30d3d89e5d..61badd8668 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -17,7 +17,6 @@ msgid "%s in %s"
 msgstr "%s în %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s cu %s"
 
@@ -26,12 +25,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s în %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -40,17 +37,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -116,6 +110,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -128,11 +126,11 @@ msgstr "Retele acoperite"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Reguli suplimentare"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -151,22 +149,15 @@ msgstr "Portul destinatie"
 msgid "Destination zone"
 msgstr "Zona destinatie"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -177,17 +168,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -197,7 +185,6 @@ msgstr "Descarcă pachetele invalide"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activează"
 
@@ -250,7 +237,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Reguli particularizate"
 
@@ -323,17 +310,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -383,12 +367,10 @@ msgid "Limit log messages"
 msgstr "Limitează mesaje în log"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -503,17 +485,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -521,10 +500,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -542,14 +517,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -675,6 +642,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -761,12 +732,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -781,29 +750,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -814,7 +777,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -825,12 +787,10 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index ebadc2fdf5..59a6ede0e1 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -21,7 +21,6 @@ msgid "%s in %s"
 msgstr "%s в %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s с %s"
 
@@ -30,12 +29,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s в %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> пакетов за <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> пакетов за <var>%s</var>, подряд <var>%d</var> пакетов"
 
@@ -44,17 +41,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> с пределом в %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Принимать перенаправляемый трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Принимать входящий трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Принимать исходящий трафик"
 
@@ -128,6 +122,10 @@ msgstr "Отслеживание соединений (conntrack)"
 msgid "Conntrack helpers"
 msgstr "Помощники отслеживания соединений"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "Охватываемые устройства"
@@ -140,11 +138,11 @@ msgstr "Охватываемые сети"
 msgid "Covered subnets"
 msgstr "Охватываемые подсети"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Пользовательские правила"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -167,22 +165,15 @@ msgstr "Порт назначения"
 msgid "Destination zone"
 msgstr "Зона назначения"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Отключить"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Отклонять перенаправляемый трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Отклонять входящий трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Отклонять исходящий трафик"
 
@@ -196,17 +187,14 @@ msgstr ""
 "потребоваться для сложных настроек асимметричной маршрутизации."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "Не отслеживать перенаправляемый трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "Не отслеживать входящий трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "Не отслеживать исходящий трафик"
 
@@ -216,7 +204,6 @@ msgstr "Отбрасывать некорректные пакеты"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Включить"
 
@@ -271,7 +258,7 @@ msgstr "Дополнительные аргументы для источник�
 msgid "Firewall"
 msgstr "Межсетевой экран"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Межсетевой экран - Пользовательские правила"
 
@@ -344,17 +331,14 @@ msgid "Hardware flow offloading"
 msgstr "Аппаратный flow offloading"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP-адрес"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Диапазон IP-адресов"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP-адреса"
 
@@ -404,12 +388,10 @@ msgid "Limit log messages"
 msgstr "Ограничить журнал сообщений"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC-адреса"
 
@@ -544,17 +526,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Перенаправлять трафик на указанный IP-адрес"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Сбрасывать перенаправляемый трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Сбрасывать входящий трафик"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Сбрасывать исходящий трафик"
 
@@ -563,10 +542,6 @@ msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Перезапустить межсетевой экран"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
@@ -584,14 +559,6 @@ msgstr "Использовать протокол"
 msgid "Routing/NAT Offloading"
 msgstr "Маршрутизация/NAT offloading"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "Правило отключено"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "Правило включено"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Суббота"
@@ -733,6 +700,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Вторник"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -823,12 +794,10 @@ msgstr "любой IP-адрес маршрутизатора"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "любой зоны"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "день"
 
@@ -843,29 +812,23 @@ msgid "drop"
 msgstr "не обрабатывать"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "час"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "минута"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "нет"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "порт"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "порты"
 
@@ -876,7 +839,6 @@ msgid "reject"
 msgstr "отвергать"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "секунда"
 
@@ -887,15 +849,25 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "тип"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "типы"
 
+#~ msgid "Disable"
+#~ msgstr "Отключить"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "Перезапустить межсетевой экран"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Правило отключено"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Правило включено"
+
 #~ msgid "Add"
 #~ msgstr "Добавить"
 
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index 40ea67f271..e1366fe561 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -13,7 +13,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -22,12 +21,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -36,17 +33,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -112,6 +106,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -124,11 +122,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -147,22 +145,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -173,17 +164,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -193,7 +181,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -246,7 +233,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -319,17 +306,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -379,12 +363,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -499,17 +481,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -517,10 +496,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -538,14 +513,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -671,6 +638,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -757,12 +728,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -777,29 +746,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -810,7 +773,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -821,11 +783,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index b95fe43f47..f68f8ef6f7 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -17,7 +17,6 @@ msgid "%s in %s"
 msgstr "%s i %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s med %s"
 
@@ -26,12 +25,10 @@ msgid "%s, %s in %s"
 msgstr "%2, %s i %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pkt. per <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> pkt. per <var>%s</var>, brustna <var>%d</var> pkt."
 
@@ -40,17 +37,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> och gränsen till %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -116,6 +110,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -128,11 +126,11 @@ msgstr "Nätverk som omfattas"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Anpassade regler"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -151,22 +149,15 @@ msgstr "Destinationsport"
 msgid "Destination zone"
 msgstr "Destinationens zon"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Inaktivera"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -177,17 +168,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -197,7 +185,6 @@ msgstr "Släpp ogiltiga paket"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -250,7 +237,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Brandvägg"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Brandvägg - Anpassade regler"
 
@@ -323,17 +310,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -383,12 +367,10 @@ msgid "Limit log messages"
 msgstr "Begränsa loggmeddelanden"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -506,17 +488,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -524,10 +503,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Starta om brandvägg"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -545,14 +520,6 @@ msgstr "Begränsa till adressfamilj"
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Lördag"
@@ -678,6 +645,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Tisdag"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -764,12 +735,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "alla zoner"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -784,29 +753,23 @@ msgid "drop"
 msgstr "släpp"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "port"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "portar"
 
@@ -817,7 +780,6 @@ msgid "reject"
 msgstr "neka"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -828,15 +790,19 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "typ"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
 
+#~ msgid "Disable"
+#~ msgstr "Inaktivera"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "Starta om brandvägg"
+
 #~ msgid "Add"
 #~ msgstr "Lägg till"
 
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 492d8aa8e4..d511fb41a7 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -6,7 +6,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -15,12 +14,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -29,17 +26,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -105,6 +99,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -117,11 +115,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -140,22 +138,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -166,17 +157,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -186,7 +174,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -239,7 +226,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -312,17 +299,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -372,12 +356,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -492,17 +474,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -510,10 +489,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -531,14 +506,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -664,6 +631,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -750,12 +721,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -770,29 +739,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -803,7 +766,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -814,11 +776,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 1113306375..d6db85b0ae 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -13,7 +13,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -22,12 +21,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -36,17 +33,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -112,6 +106,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -124,11 +122,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -147,22 +145,15 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -173,17 +164,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -193,7 +181,6 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -246,7 +233,7 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -319,17 +306,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -379,12 +363,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -499,17 +481,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -517,10 +496,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -538,14 +513,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -671,6 +638,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -757,12 +728,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -777,29 +746,23 @@ msgid "drop"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -810,7 +773,6 @@ msgid "reject"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -821,11 +783,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index ac1d29b381..426edfda65 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr "%s у %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s із %s"
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s у %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> пакетів за <var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> пакетів за <var>%s</var>, підряд <var>%d</var> пакетів"
 
@@ -41,17 +38,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> з лімітом %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Приймати переспрямовування"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Приймати вхідний"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Приймати вихідний"
 
@@ -130,6 +124,10 @@ msgstr ""
 "Помічники відслідковування з'єднань (<abbr title=\"Connection tracking"
 "\">Conntrack</abbr>)"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "Охоплені пристрої"
@@ -142,11 +140,11 @@ msgstr "Охоплені мережі"
 msgid "Covered subnets"
 msgstr "Охоплені підмережі"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "Настроювані правила"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -169,22 +167,15 @@ msgstr "Порт призначення"
 msgid "Destination zone"
 msgstr "Зона призначення"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "Вимкнути"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Відкидати переспрямовування"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Відкидати вхідний"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Відкидати вихідний"
 
@@ -198,17 +189,14 @@ msgstr ""
 "для складних налаштувань асиметричного маршруту."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "Не відслідковувати переспрямовування"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "Не відслідковувати вхідний"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "Не відслідковувати вихідний"
 
@@ -218,7 +206,6 @@ msgstr "Відкидати помилкові пакети"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Увімкнути"
 
@@ -273,7 +260,7 @@ msgstr "Додаткові аргументи для джерела"
 msgid "Firewall"
 msgstr "Брандмауер"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "Брандмауер — Настроювані правила"
 
@@ -346,17 +333,14 @@ msgid "Hardware flow offloading"
 msgstr "Апаратні засоби розвантаження потоку"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP-адреса"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Діапазон IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP-адреси"
 
@@ -406,12 +390,10 @@ msgid "Limit log messages"
 msgstr "Обмеження повідомлень журналу"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC-адреса"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC-адреси"
 
@@ -541,17 +523,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Відхиляти переспрямовування"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Відхиляти вхідний"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Відхиляти вихідний"
 
@@ -559,10 +538,6 @@ msgstr "Відхиляти вихідний"
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "Перезавантажити брандмауер"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Обмежити підміну заданими підмережами призначення"
@@ -580,14 +555,6 @@ msgstr "Обмежити сімейство протоколів"
 msgid "Routing/NAT Offloading"
 msgstr "Розвантаження маршрутизації/NAT"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "Правило вимкнено"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "Правило ввімкнено"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Субота"
@@ -730,6 +697,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Вівторок"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -820,12 +791,10 @@ msgstr "будь-який IP роутера"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "будь-якій зоні"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "день"
 
@@ -840,29 +809,23 @@ msgid "drop"
 msgstr "опускати"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "година"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "хвилина"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "не"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "порт"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "порти"
 
@@ -873,7 +836,6 @@ msgid "reject"
 msgstr "відкидати"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "секунду"
 
@@ -884,11 +846,21 @@ msgid "this new zone"
 msgstr "ця нова зона"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "типом"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "типами"
+
+#~ msgid "Disable"
+#~ msgstr "Вимкнути"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "Перезавантажити брандмауер"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "Правило вимкнено"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "Правило ввімкнено"
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 31868bac62..1165553a3a 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -18,7 +18,6 @@ msgid "%s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
@@ -27,12 +26,10 @@ msgid "%s, %s in %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
@@ -41,17 +38,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
@@ -117,6 +111,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -129,11 +127,11 @@ msgstr ""
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -153,22 +151,15 @@ msgstr "Cổng điểm đến"
 msgid "Destination zone"
 msgstr "Điểm đến"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
@@ -179,17 +170,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
@@ -199,7 +187,6 @@ msgstr "Bỏ qua nhưng gói không hợp lý"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
@@ -253,7 +240,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr ""
 
@@ -326,17 +313,14 @@ msgid "Hardware flow offloading"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
@@ -388,12 +372,10 @@ msgid "Limit log messages"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
@@ -509,17 +491,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
@@ -527,10 +506,6 @@ msgstr ""
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -548,14 +523,6 @@ msgstr ""
 msgid "Routing/NAT Offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
@@ -686,6 +653,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -772,12 +743,10 @@ msgstr ""
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
@@ -792,29 +761,23 @@ msgid "drop"
 msgstr "drop"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
@@ -825,7 +788,6 @@ msgid "reject"
 msgstr "Không chấp nhận"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
@@ -836,11 +798,9 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index a47a68b251..f0a2d7fae6 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -21,7 +21,6 @@ msgid "%s in %s"
 msgstr "%s 位于 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s 和 %s"
 
@@ -30,12 +29,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s 位于 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> 数据包/<var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> 数据包/<var>%s</var>，突发 <var>%d</var> 数据包。"
 
@@ -44,17 +41,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> 并限制到 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "接受转发"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "接受入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "接受出站"
 
@@ -69,16 +63,16 @@ msgid ""
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
-"附加 <em>iptables</em> 参数对区域出流量分类。如：<code>-p tcp --dport 443</code> 仅匹配出站 "
-"HTTPS 流量。"
+"附加 <em>iptables</em> 参数对区域出流量分类。如：<code>-p tcp --dport 443</"
+"code> 仅匹配出站 HTTPS 流量。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
-"附加 <em>iptables</em> 参数对区域入流量分类。如：<code>-p tcp --sport 443</code> 仅匹配入站 "
-"HTTPS 流量。"
+"附加 <em>iptables</em> 参数对区域入流量分类。如：<code>-p tcp --sport 443</"
+"code> 仅匹配入站 HTTPS 流量。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
@@ -124,6 +118,10 @@ msgstr "Conntrack 设置"
 msgid "Conntrack helpers"
 msgstr "Conntrack 助手"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "涵盖的设备"
@@ -136,11 +134,11 @@ msgstr "涵盖的网络"
 msgid "Covered subnets"
 msgstr "涵盖的子网"
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "自定义规则"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -161,22 +159,15 @@ msgstr "目标端口"
 msgid "Destination zone"
 msgstr "目标区域"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "禁用"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "丢弃转发"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "丢弃入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "丢弃出站"
 
@@ -189,17 +180,14 @@ msgstr ""
 "称路由这可能是必需的设置。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "不跟踪转发"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "不跟踪入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "不跟踪出站"
 
@@ -209,7 +197,6 @@ msgstr "丢弃无效数据包"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "启用"
 
@@ -262,7 +249,7 @@ msgstr "额外的源参数"
 msgid "Firewall"
 msgstr "防火墙"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "防火墙 - 自定义规则"
 
@@ -335,17 +322,14 @@ msgid "Hardware flow offloading"
 msgstr "硬件流量分载"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "IP 范围"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
@@ -395,12 +379,10 @@ msgid "Limit log messages"
 msgstr "限制日志信息"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
@@ -519,17 +501,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的内部主机"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "拒绝转发"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "拒绝入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "拒绝出站"
 
@@ -537,10 +516,6 @@ msgstr "拒绝出站"
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "重启防火墙"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 动态伪装的目标子网"
@@ -558,14 +533,6 @@ msgstr "限制地址"
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT 分载"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "规则已禁用"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "规则已启用"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "星期六"
@@ -637,10 +604,10 @@ msgid ""
 "rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
-"以下选项控制此区域（%s）和其它区域间的转发策略。<em>目标区域</em>接收<strong>源自 %q</strong> "
-"的转发流量。<em>源区域</em>匹配的转发流量来自<strong>目标为 %q</strong> "
-"的其它区域。转发规则的作用是<em>单向</em>的，例如：转发从 lan 到 wan 的流量并<em>不</em>意味着允许反向转发从 wan 到 "
-"lan 的流量。"
+"以下选项控制此区域（%s）和其它区域间的转发策略。<em>目标区域</em>接收<strong>"
+"源自 %q</strong> 的转发流量。<em>源区域</em>匹配的转发流量来自<strong>目标为 "
+"%q</strong> 的其它区域。转发规则的作用是<em>单向</em>的，例如：转发从 lan 到 "
+"wan 的流量并<em>不</em>意味着允许反向转发从 wan 到 lan 的流量。"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
@@ -700,6 +667,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "星期二"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -786,12 +757,10 @@ msgstr "所有路由 IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "所有区域"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "日"
 
@@ -806,29 +775,23 @@ msgid "drop"
 msgstr "丢弃"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "小时"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "分钟"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "非"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "端口"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "端口"
 
@@ -839,7 +802,6 @@ msgid "reject"
 msgstr "拒绝"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "秒"
 
@@ -850,15 +812,25 @@ msgid "this new zone"
 msgstr "此新区域"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "类型"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "类型"
 
+#~ msgid "Disable"
+#~ msgstr "禁用"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "重启防火墙"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "规则已禁用"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "规则已启用"
+
 #~ msgid "Add"
 #~ msgstr "添加"
 
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 9754bc7a57..16421610d9 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -16,7 +16,6 @@ msgid "%s in %s"
 msgstr "%s 位於 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s 和 %s"
 
@@ -25,12 +24,10 @@ msgid "%s, %s in %s"
 msgstr "%s, %s 位於 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> 資料包/<var>%s</var>"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> 資料包/<var>%s</var>，突發 <var>%d</var> 資料包。"
 
@@ -39,17 +36,14 @@ msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> 並限制到 %s"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "接受轉發"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "接受入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "接受出站"
 
@@ -115,6 +109,10 @@ msgstr ""
 msgid "Conntrack helpers"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:15
+msgid "Contents have been saved."
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
@@ -127,11 +125,11 @@ msgstr "覆蓋網路"
 msgid "Covered subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
 msgid "Custom Rules"
 msgstr "自訂規則"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:8
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:25
 msgid ""
 "Custom rules allow you to execute arbitrary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -152,22 +150,15 @@ msgstr "目標埠"
 msgid "Destination zone"
 msgstr "目標區域"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:242
-msgid "Disable"
-msgstr "禁用"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "丟棄轉發"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "丟棄入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "丟棄出站"
 
@@ -178,17 +169,14 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "不跟蹤轉發"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "不跟蹤入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "不跟蹤出站"
 
@@ -198,7 +186,6 @@ msgstr "丟棄無效資料包"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "啟用"
 
@@ -251,7 +238,7 @@ msgstr ""
 msgid "Firewall"
 msgstr "防火牆"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:7
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:24
 msgid "Firewall - Custom Rules"
 msgstr "防火牆 - 自訂規則"
 
@@ -324,17 +311,14 @@ msgid "Hardware flow offloading"
 msgstr "硬體流量分載"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "IP 範圍"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
@@ -384,12 +368,10 @@ msgid "Limit log messages"
 msgstr "限制日誌資訊"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
@@ -504,17 +486,14 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的內部主機"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "拒絕轉發"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "拒絕入站"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "拒絕出站"
 
@@ -522,10 +501,6 @@ msgstr "拒絕出站"
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
 
-#: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
-msgid "Restart Firewall"
-msgstr "重啟防火牆"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 動態偽裝的目標子網"
@@ -543,14 +518,6 @@ msgstr "限制位址"
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT 分載"
 
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
-msgid "Rule is disabled"
-msgstr "規則已禁用"
-
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
-msgid "Rule is enabled"
-msgstr "規則已啟用"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "星期六"
@@ -685,6 +652,10 @@ msgstr ""
 msgid "Tuesday"
 msgstr "星期二"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js:18
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
@@ -771,12 +742,10 @@ msgstr "所有路由 IP"
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "所有區域"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "日"
 
@@ -791,29 +760,23 @@ msgid "drop"
 msgstr "丟棄"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "小時"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "分鐘"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "非"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "埠"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "埠"
 
@@ -824,7 +787,6 @@ msgid "reject"
 msgstr "拒絕"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "秒"
 
@@ -835,15 +797,25 @@ msgid "this new zone"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "型別"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
-#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "型別"
 
+#~ msgid "Disable"
+#~ msgstr "禁用"
+
+#~ msgid "Restart Firewall"
+#~ msgstr "重啟防火牆"
+
+#~ msgid "Rule is disabled"
+#~ msgstr "規則已禁用"
+
+#~ msgid "Rule is enabled"
+#~ msgstr "規則已啟用"
+
 #~ msgid "Add"
 #~ msgstr "新增"