luci-app-rp-pppoe-server: convert to JS

Signed-off-by: Paul Donald <newtwen+github@gmail.com>

38 files changed, 6259 insertions, 1125 deletions

diff --git a/applications/luci-app-rp-pppoe-server/po/ar/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ar/rp-pppoe-server.po
index b8517ed0b0..87da1a56eb 100644
--- a/applications/luci-app-rp-pppoe-server/po/ar/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ar/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -25,83 +67,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "واجهه"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "اسم الخدمة"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "نفذ الوقت"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/bg/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/bg/rp-pppoe-server.po
index ec8b44de0b..a6aaa07eaa 100644
--- a/applications/luci-app-rp-pppoe-server/po/bg/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/bg/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Име на концентратора за достъп"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,168 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Интерфейс на който да слуша."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Сървърна Конфигурация"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Синхронизация"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid "Sync"
+#~ msgstr "Синхронизация"
diff --git a/applications/luci-app-rp-pppoe-server/po/bn_BD/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/bn_BD/rp-pppoe-server.po
index 9c31b3b304..23bd21ab1a 100644
--- a/applications/luci-app-rp-pppoe-server/po/bn_BD/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/bn_BD/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.9-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "ইন্টারফেস"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/ca/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ca/rp-pppoe-server.po
index b5130855f4..69ac63621e 100644
--- a/applications/luci-app-rp-pppoe-server/po/ca/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ca/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10.1\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nom del concentrador d'accés"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primera IP remota"
 
@@ -24,83 +66,168 @@ msgstr "Primera IP remota"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP del costat que escolta"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interfície"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Fitxer d'opcions"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Selecció de la sessió a l'atzar"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configuració del servidor"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nom del servei"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronització"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Temps d'espera"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unitat"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid "Sync"
+#~ msgstr "Sincronització"
diff --git a/applications/luci-app-rp-pppoe-server/po/cs/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/cs/rp-pppoe-server.po
index 0d997c450f..64a179d05a 100644
--- a/applications/luci-app-rp-pppoe-server/po/cs/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/cs/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 5.1-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Přístup k názvu koncentrátoru"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "První vzdálená IP adresa"
 
@@ -24,85 +66,184 @@ msgstr "První vzdálená IP adresa"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Udělit oprávnění k UCI pro luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP naslouchající strany"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Místo startu od začátku a pokračování až do konce, náhodně zamíchej číslo "
-"relace"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Rozhraní, na kterém naslouchat."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maximální počet relací"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maximální počet relací na peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Offset"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Soubor možností"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Číslo jednotky PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Konfigurace PPPoE serveru"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Náhodný výběr relace"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Konfigurace serveru"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Název služby"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Jednotka"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Místo startu od začátku a pokračování až do konce, náhodně zamíchej číslo "
+#~ "relace"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Číslo jednotky PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sync"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maximální počet relací"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP offset"
diff --git a/applications/luci-app-rp-pppoe-server/po/da/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/da/rp-pppoe-server.po
index 51880eb8a0..c0244b3ead 100644
--- a/applications/luci-app-rp-pppoe-server/po/da/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/da/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.9.1-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Navn på adgangskoncentrator"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Første eksterne IP"
 
@@ -24,85 +66,184 @@ msgstr "Første eksterne IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Giv UCI-adgang til luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP på lyttesiden"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"I stedet for at starte i begyndelsen og gå til slutningen, skal du "
-"tilfældigt vælge sessionens nummer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interface"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interface hvor der skal lyttes."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maksimalt antal sessioner"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maksimalt antal sessioner pr. peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Offset"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Indstillingsfil"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP-offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP-enhedsnummer"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Konfiguration af PPPoE-server"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Tilfældig udvælgelse af sessioner"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Tjenestenavn"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Timeout"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Enhed"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "I stedet for at starte i begyndelsen og gå til slutningen, skal du "
+#~ "tilfældigt vælge sessionens nummer"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP-enhedsnummer"
+
+#~ msgid "Sync"
+#~ msgstr "Sync"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maksimalt antal sessioner"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP-offset"
diff --git a/applications/luci-app-rp-pppoe-server/po/de/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/de/rp-pppoe-server.po
index a8b9cc0c22..c8458e1530 100644
--- a/applications/luci-app-rp-pppoe-server/po/de/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/de/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.0-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Access-Concentrator-Name"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Erste IP der Gegenstelle"
 
@@ -24,85 +66,184 @@ msgstr "Erste IP der Gegenstelle"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Gewähre UCI Zugriff auf luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP der Serverseite"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Randomisiere Session-Nummer, anstatt sukzessive von Anfang bis Ende zu "
-"inkrementieren"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Schnittstelle auf der gelauscht werden soll."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maximale Anzahl an Sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maximale Sessions pro Gegenstelle"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Offset"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Konfigurationsdatei"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP-Offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP-Unit-Nummer"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE-Serverkonfiguration"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP-PPPoE-Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Zufällige Sessionauswahl"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE-Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Service-Name"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Einheit"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Randomisiere Session-Nummer, anstatt sukzessive von Anfang bis Ende zu "
+#~ "inkrementieren"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP-Unit-Nummer"
+
+#~ msgid "Sync"
+#~ msgstr "Sync"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maximale Anzahl an Sessions"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP-Offset"
diff --git a/applications/luci-app-rp-pppoe-server/po/el/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/el/rp-pppoe-server.po
index f9c24932ed..7184323293 100644
--- a/applications/luci-app-rp-pppoe-server/po/el/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/el/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.11-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Τέλος χρόνου"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po
index 9d3805b201..296f84da08 100644
--- a/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po
@@ -10,11 +10,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Access Concentrator Name"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "First remote IP"
 
@@ -22,84 +64,184 @@ msgstr "First remote IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP of listening side"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Instead of starting at beginning and going to end, randomize session number"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interface"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interface on which to listen."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maximum sessions per peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Offset"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Options file"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE Server Configuration"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Random session selection"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Server Configuration"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Service Name"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Timeout"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unit"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP unit number"
+
+#~ msgid "Sync"
+#~ msgstr "Sync"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maximum sessions"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP offset"
diff --git a/applications/luci-app-rp-pppoe-server/po/es/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/es/rp-pppoe-server.po
index 650c69c0c6..75fa5f15a7 100644
--- a/applications/luci-app-rp-pppoe-server/po/es/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/es/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nombre del concentrador de acceso"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primera IP remota"
 
@@ -25,86 +67,185 @@ msgstr "Primera IP remota"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Conceder acceso UCI para luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP del lado que escucha"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"En lugar de comenzar por el principio y terminar, aleatorice el número de "
-"sesión"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interfaz"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interfaz en la que escuchar."
 
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
 # Manuscripts
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Sesiones maximas"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Sesiones máximas por par"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Compensar"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Opciones de archivo"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Desplazamiento PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Número de unidad de PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configuración del servidor PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Servidor RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Selección de sesión aleatoria"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Selección de sesión aleatoria"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nombre del servicio"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronizar"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Tiempo agotado"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unidad"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "En lugar de comenzar por el principio y terminar, aleatorice el número de "
+#~ "sesión"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Número de unidad de PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Sesiones maximas"
+
+#~ msgid "PPP offset"
+#~ msgstr "Desplazamiento PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/fi/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/fi/rp-pppoe-server.po
index 508801cb69..b587eb6e3e 100644
--- a/applications/luci-app-rp-pppoe-server/po/fi/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/fi/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Sovitin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Palvelun nimi"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Maksimiaika"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/fr/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/fr/rp-pppoe-server.po
index ecca378334..3bb1dc9549 100644
--- a/applications/luci-app-rp-pppoe-server/po/fr/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/fr/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nom du concentrateur d'accès"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Première adresse IP distante"
 
@@ -24,85 +66,184 @@ msgstr "Première adresse IP distante"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Accorder l'accès UCI à luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "Adresse IP to côté serveur"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Au lieu de commencer au début et d'aller jusqu'à la fin, prend un numéro de "
-"session aléatoire"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interface"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interface sur laquelle il faut écouter."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS (taille maximale de segment)"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Sessions maximales"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Sessions maximales par pair"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Décalage"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Fichier d'options"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Décalage PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Nombre d'unité PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configuration du serveuer PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Serveur RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Sélection de session aléatoire"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Serveur PPPoE Roaring Penguin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nom du service"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Synchronisation"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unité"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Au lieu de commencer au début et d'aller jusqu'à la fin, prend un numéro "
+#~ "de session aléatoire"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Nombre d'unité PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Synchronisation"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Sessions maximales"
+
+#~ msgid "PPP offset"
+#~ msgstr "Décalage PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/ga/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ga/rp-pppoe-server.po
index 94d6979c2c..82ad97860f 100644
--- a/applications/luci-app-rp-pppoe-server/po/ga/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ga/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "n>6 && n<11) ? 3 : 4;\n"
 "X-Generator: Weblate 5.7.2-rc\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Ainm an Tiúchantóra Rochtana"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "An chéad IP cianda"
 
@@ -25,84 +67,184 @@ msgstr "An chéad IP cianda"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Deonaigh rochtain UCI do luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP an taobh éisteachta"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"In ionad tosú ag tús agus ag dul go dtí deireadh, randamach uimhir seisiúin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Comhéadan"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Comhéadan chun éisteacht leis."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Uasmhéid seisiúin"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Uasmhéid seisiúin in aghaidh an phiara"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Fritháireamh"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Comhad roghanna"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Fritháireamh PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Uimhir aonaid PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Cumraíocht Freastalaí PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Freastalaí RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Roghnú seisiún randamach"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Freastalaí PPPoE roaring Penguin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Cumraíocht Freastalaí"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Ainm Seirbhíse"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sioncrónaigh"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Teorainn Ama"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Aonad"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "In ionad tosú ag tús agus ag dul go dtí deireadh, randamach uimhir "
+#~ "seisiúin"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Uimhir aonaid PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sioncrónaigh"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Uasmhéid seisiúin"
+
+#~ msgid "PPP offset"
+#~ msgstr "Fritháireamh PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/he/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/he/rp-pppoe-server.po
index c87e9c98b2..2bfd9325f7 100644
--- a/applications/luci-app-rp-pppoe-server/po/he/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/he/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "n % 10 == 0) ? 2 : 3));\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "שם מרכז גישה"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "IP מרוחק ראשון"
 
@@ -25,83 +67,182 @@ msgstr "IP מרוחק ראשון"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "הענקת גישת UCI ל־luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP של הצד המאזין"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "במקום להתחיל בהתחלה ולהתקדם לסוף, לבחור מספר הפעלה באופן אקראי"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "מנשק"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "מנשק להאזנה."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS (גודל מקטע מרבי)"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "כמות הפעלות מרבית"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "כמות הפעלות מרבית לעמית"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "היסט"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "קובץ אפשרויות"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "היסט PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "מספר יחידת PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "הגדרת שרת PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "שרת RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "בחירת הפעלה אקראית"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "שרת Roaring Penguin PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "הגדרת שרת"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "שם השירות"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "סנכרון"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "תום זמן קצוב"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "יחידה"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr "במקום להתחיל בהתחלה ולהתקדם לסוף, לבחור מספר הפעלה באופן אקראי"
+
+#~ msgid "PPP unit number"
+#~ msgstr "מספר יחידת PPP"
+
+#~ msgid "Sync"
+#~ msgstr "סנכרון"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "כמות הפעלות מרבית"
+
+#~ msgid "PPP offset"
+#~ msgstr "היסט PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/hi/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/hi/rp-pppoe-server.po
index 4d5dfa84dd..7391754637 100644
--- a/applications/luci-app-rp-pppoe-server/po/hi/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/hi/rp-pppoe-server.po
@@ -10,11 +10,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -22,83 +64,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po
index 467bddabf9..4ee84bef55 100644
--- a/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.7\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Elérési sűrítő neve"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Első távoli IP"
 
@@ -24,85 +66,184 @@ msgstr "Első távoli IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "A figyelő oldal IP-je"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Az elején kezdés és a vége felé léptetés helyett tegye véletlenszerűvé a "
-"munkamenetszámot"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Csatoló"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "A csatoló, amelyen figyelni kell."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Legtöbb munkamenet"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Partnerenkénti legtöbb munkamenet"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Eltolás"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Beállítások fájl"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP eltolás"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP egységszám"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE kiszolgáló beállításai"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE kiszolgáló"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Véletlenszerű munkamenet-kiválasztás"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE kiszolgáló"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Kiszolgáló beállításai"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Szolgáltatás neve"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Szinkronizálás"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Mértékegység"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Az elején kezdés és a vége felé léptetés helyett tegye véletlenszerűvé a "
+#~ "munkamenetszámot"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP egységszám"
+
+#~ msgid "Sync"
+#~ msgstr "Szinkronizálás"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Legtöbb munkamenet"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP eltolás"
diff --git a/applications/luci-app-rp-pppoe-server/po/it/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/it/rp-pppoe-server.po
index 990829f0e9..5958dd3f01 100644
--- a/applications/luci-app-rp-pppoe-server/po/it/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/it/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.0-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nome del concentratore di accesso"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primo IP remoto"
 
@@ -24,85 +66,184 @@ msgstr "Primo IP remoto"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Concedere l'accesso UCI per luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP del lato in ascolto"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Invece di cominciare dall'inizio e andare alla fine, rendi casuale il numero "
-"di sessione"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interfaccia su cui ascoltare."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Numero massimo di sessioni"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Numero massimo di sessioni per peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Scostamento"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "File delle opzioni"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Scostamento PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Numero unità PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configurazione del server PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Server RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Selezione casuale della sessione"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Server Roaring Penguin PPPoE (RP PPPoE)"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configurazione del server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nome del servizio"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronizzazione"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Scadenza"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unità"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Invece di cominciare dall'inizio e andare alla fine, rendi casuale il "
+#~ "numero di sessione"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Numero unità PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sincronizzazione"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Numero massimo di sessioni"
+
+#~ msgid "PPP offset"
+#~ msgstr "Scostamento PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/ja/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ja/rp-pppoe-server.po
index 10986c04a6..0b8b6d690f 100644
--- a/applications/luci-app-rp-pppoe-server/po/ja/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ja/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "アクセスコンセントレータ名"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "最初のリモートIP"
 
@@ -24,83 +66,174 @@ msgstr "最初のリモートIP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "luci-app-rp-pppoe-serverにUCIアクセスを許可"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "インターフェース"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "最大セッション"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "オフセット"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP オフセット"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE サーバー構成"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "サーバー構成"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "サービス名"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "同期"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid "Sync"
+#~ msgstr "同期"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "最大セッション"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP オフセット"
diff --git a/applications/luci-app-rp-pppoe-server/po/ko/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ko/rp-pppoe-server.po
index cee6c88ffd..903d2a84b2 100644
--- a/applications/luci-app-rp-pppoe-server/po/ko/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ko/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.14-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "인터페이스"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "서비스 이름"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "시간초과"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/lt/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/lt/rp-pppoe-server.po
index 2ee1a8aaca..efb04b459d 100644
--- a/applications/luci-app-rp-pppoe-server/po/lt/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/lt/rp-pppoe-server.po
@@ -14,11 +14,53 @@ msgstr ""
 "1 : 2);\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Prieigą prie telktuvo pavadinimo"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Pirmas nuotolinis IP"
 
@@ -26,85 +68,184 @@ msgstr "Pirmas nuotolinis IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Suteikti „UCI“ prieigą – „luci-app-rp-pppoe-server“"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "Laukiamo prisijungimo/jungties ryšio pusės IP"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Vietoj pradedant nuo pradžios ir einant iki pabaigos, atsitiktinai nustatyti "
-"seanso numerį"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Sąsaja ir/arba Sietuvas"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Sąsaja/Sietuvas, ant kurio laukti prisijungimo/jungties ryšio."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "„MSS“"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maksimalus seansų skaičius"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maksimalus seansų skaičius vienam lygiarangiui"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Poslinkis"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Parinkčių failas"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "„PPP“ poslinkis"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "„PPP“ vieneto skaičius"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "„PPPoE“ serverio konfigūracija"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "„RP PPPoE“ serveris"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Atsitiktinis sesijos pasirinkimas"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "„Roaring Penguin“ – „PPPoE“ serveris"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Serverio konfigūracija"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Tarnybos pavadinimas"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sinchronizuoti"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Pasibaigė užklausos laikas"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Vienetas"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Vietoj pradedant nuo pradžios ir einant iki pabaigos, atsitiktinai "
+#~ "nustatyti seanso numerį"
+
+#~ msgid "PPP unit number"
+#~ msgstr "„PPP“ vieneto skaičius"
+
+#~ msgid "Sync"
+#~ msgstr "Sinchronizuoti"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maksimalus seansų skaičius"
+
+#~ msgid "PPP offset"
+#~ msgstr "„PPP“ poslinkis"
diff --git a/applications/luci-app-rp-pppoe-server/po/mr/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/mr/rp-pppoe-server.po
index e626c6e7e8..cb08bdec2a 100644
--- a/applications/luci-app-rp-pppoe-server/po/mr/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/mr/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "प्रवेश केंद्राचे नाव"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "प्रथम रिमोट आयपी"
 
@@ -24,83 +66,177 @@ msgstr "प्रथम रिमोट आयपी"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "ऐकण्याचा बाजूचा आयपी"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "इंटरफेस"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "ऐकण्यासाठी इंटरफेस."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "एमएसएस"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "जास्तीत जास्त सत्रे"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "ऑफसेट"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "पर्याय फाइल"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "पीपीपी ऑफसेट"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "पीपीपी युनिट क्रमांक"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "पीपीपीओ सर्व्हर कॉन्फिगरेशन"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "आरपी PPPoE सर्व्हर"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "यादृच्छिक सत्र निवड"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "रोअरिंग पेंग्विन पीपीपीओई सर्व्हर"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "सर्व्हर कॉन्फिगरेशन"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "सेवेचे नाव"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "समक्रमित करा"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "वेळ संपला"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "युनिट"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid "PPP unit number"
+#~ msgstr "पीपीपी युनिट क्रमांक"
+
+#~ msgid "Sync"
+#~ msgstr "समक्रमित करा"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "जास्तीत जास्त सत्रे"
+
+#~ msgid "PPP offset"
+#~ msgstr "पीपीपी ऑफसेट"
diff --git a/applications/luci-app-rp-pppoe-server/po/ms/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ms/rp-pppoe-server.po
index a1f094f0fc..84ad6b0e85 100644
--- a/applications/luci-app-rp-pppoe-server/po/ms/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ms/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.4-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Antara muka"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/nb_NO/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/nb_NO/rp-pppoe-server.po
index f6dbaf2176..03a0eaf265 100644
--- a/applications/luci-app-rp-pppoe-server/po/nb_NO/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/nb_NO/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.2-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Grensesnitt å lytte til."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/nl/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/nl/rp-pppoe-server.po
index 97d69477fd..e96d92389c 100644
--- a/applications/luci-app-rp-pppoe-server/po/nl/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/nl/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Naam van toegangsconcentrator"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Eerste externe IP"
 
@@ -24,85 +66,184 @@ msgstr "Eerste externe IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Verleen UCI-toegang voor luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP van luisterzijde"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"In plaats van te beginnen bij het begin en te eindigen, maakt u het "
-"sessienummer willekeurig"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interface"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interface waarop te luisteren."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maximale sessies"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maximum aantal sessies per peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Verschuiving"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Opties bestand"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP-offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP-eenheidsnummer"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE-serverconfiguratie"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Willekeurige sessieselectie"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Servicenaam"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Time-out"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Eenheid"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "In plaats van te beginnen bij het begin en te eindigen, maakt u het "
+#~ "sessienummer willekeurig"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP-eenheidsnummer"
+
+#~ msgid "Sync"
+#~ msgstr "Sync"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maximale sessies"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP-offset"
diff --git a/applications/luci-app-rp-pppoe-server/po/pl/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/pl/rp-pppoe-server.po
index 97fd21df64..33b9189f90 100644
--- a/applications/luci-app-rp-pppoe-server/po/pl/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/pl/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.6-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nazwa koncentratora dostępu"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Pierwszy zdalny IP"
 
@@ -25,83 +67,182 @@ msgstr "Pierwszy zdalny IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Przyznaj luci-app-rp-pppoe-server dostęp do UCI"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP strony odsłuchowej"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "Losuj numer sesji, zamiast iść od początku do końca"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interfejs"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interfejs do nasłuchu."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maksymalna liczba sesji"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maksymalna liczba sesji na użytkownika"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Przesunięcie"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Opcjonalne pliki"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Przesunięcie PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Numer jednostki PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Konfiguracja serwera PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Serwer RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Losowy wybór sesji"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Krzyczący pingwin PPPoE Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nazwa usługi"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Synchronizuj"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Limit czasu"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Jednostka"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr "Losuj numer sesji, zamiast iść od początku do końca"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Numer jednostki PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Synchronizuj"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maksymalna liczba sesji"
+
+#~ msgid "PPP offset"
+#~ msgstr "Przesunięcie PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/pt/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/pt/rp-pppoe-server.po
index 75aa0d1898..8380d27f60 100644
--- a/applications/luci-app-rp-pppoe-server/po/pt/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/pt/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 5.7-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nome do Concentrador de Acesso"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primeiro IP remoto"
 
@@ -24,83 +66,182 @@ msgstr "Primeiro IP remoto"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Conceder UCI acesso ao luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP do lado de escuta"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "Em vez de começar do início ao fim, randomize o número da sessão"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interface"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interface sobre a qual ouvir."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Sessões máximas"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Máximo de sessões por par"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Deslocamento"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Ficheiro de opções"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Deslocamento PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Número da unidade PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configuração do Servidor PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Servidor RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Seleção de sessão aleatória"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Servidor Roaring Penguin PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configuração do Servidor"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nome do Serviço"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronizar"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unidade"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr "Em vez de começar do início ao fim, randomize o número da sessão"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Número da unidade PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Sessões máximas"
+
+#~ msgid "PPP offset"
+#~ msgstr "Deslocamento PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po
index 398eab2cfb..b4e138351b 100644
--- a/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nome do Concentrador de Acesso"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primeiro IP remoto"
 
@@ -24,83 +66,182 @@ msgstr "Primeiro IP remoto"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Conceda acesso UCI ao luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP do lado da escuta"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "Em vez de começar do início ao fim, randomize o número da sessão"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interface"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interface para ouvir."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Quantidade Máxima de Sessões"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Quantidade máxima de pares por sessão"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Compensação"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Arquivo de Opções"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Compensação PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Número da unidade PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configuração do Servidor PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Servidor RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Seleção aleatória de sessão"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Servidor Roaring Penguin PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configuração do Servidor"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nome do Serviço"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronizar"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unidade"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr "Em vez de começar do início ao fim, randomize o número da sessão"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Número da unidade PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Quantidade Máxima de Sessões"
+
+#~ msgid "PPP offset"
+#~ msgstr "Compensação PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/ro/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ro/rp-pppoe-server.po
index 7bdc88604c..2d07fc0544 100644
--- a/applications/luci-app-rp-pppoe-server/po/ro/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ro/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 4.18-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Numele concentratorului de acces"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primul IP la distanță"
 
@@ -25,85 +67,184 @@ msgstr "Primul IP la distanță"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Acordarea accesului UCI pentru luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP al părții de ascultare"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"În loc să începeți de la început și să mergeți la sfârșit, randomizați "
-"numărul sesiunii"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interfață"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interfața pe care se ascultă."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Numărul maxim de sesiuni"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Numărul maxim de sesiuni pe peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Decalaj"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Fișier de opțiuni"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Compensare PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Numărul unității PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configurarea serverului PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Server RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Selecție aleatorie a sesiunii"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Server PPPoE Roaring Penguin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configurația serverului"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Numele serviciului"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronizare"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Pauză"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unitatea"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "În loc să începeți de la început și să mergeți la sfârșit, randomizați "
+#~ "numărul sesiunii"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Numărul unității PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sincronizare"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Numărul maxim de sesiuni"
+
+#~ msgid "PPP offset"
+#~ msgstr "Compensare PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po
index 45f8976348..f15f4c2f34 100644
--- a/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Имя концентратора доступа"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "1-ый удаленный IP"
 
@@ -25,84 +67,184 @@ msgstr "1-ый удаленный IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Предоставить UCI доступ для luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP слушающей стороны"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Вместо того, чтобы начинать с начала и до конца, рандомизируйте номер сессии"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Интерфейс для прослушивания."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Максимальное количество сессий"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Максимальное количество сеансов на одного пира"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "смещение"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Файл опций"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "смещение PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "номер блока PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Конфигурация сервера PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE Cервер"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Случайный выбор сессии"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE Сервер"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Конфигурация сервера"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Имя службы"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Синхронизация"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Тайм-аут"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "узел"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Вместо того, чтобы начинать с начала и до конца, рандомизируйте номер "
+#~ "сессии"
+
+#~ msgid "PPP unit number"
+#~ msgstr "номер блока PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Синхронизация"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Максимальное количество сессий"
+
+#~ msgid "PPP offset"
+#~ msgstr "смещение PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/sk/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/sk/rp-pppoe-server.po
index bd8f4267d1..c4b447e6b5 100644
--- a/applications/luci-app-rp-pppoe-server/po/sk/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/sk/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,83 +66,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Názov služby"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/sv/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/sv/rp-pppoe-server.po
index af39c3a143..109248b34c 100644
--- a/applications/luci-app-rp-pppoe-server/po/sv/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/sv/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.15-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -24,85 +66,184 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Godkänn UCI-åtkomst för luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP på lyssnarsidan"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Slumpa fram sessionsnummer istället för att starta i början och gå till "
-"slutet"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Gränssnitt att lyssna på."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maximalt antal sessioner"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Maximalt antal session per jämlike"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Offset"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Offset för PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Enhetsnummer för PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Namn på tjänst"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Synk"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Timeout"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Enhet"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Slumpa fram sessionsnummer istället för att starta i början och gå till "
+#~ "slutet"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Enhetsnummer för PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Synk"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maximalt antal sessioner"
+
+#~ msgid "PPP offset"
+#~ msgstr "Offset för PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot b/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot
index 3b66f2ba7a..e265de4fd3 100644
--- a/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot
+++ b/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot
@@ -1,11 +1,53 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr ""
 
@@ -13,83 +55,165 @@ msgstr ""
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/tr/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/tr/rp-pppoe-server.po
index 8c00d73a77..f0db606595 100644
--- a/applications/luci-app-rp-pppoe-server/po/tr/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/tr/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.7-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Erişim Yoğunlaştırıcı Adı"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "İlk uzak IP"
 
@@ -24,83 +66,183 @@ msgstr "İlk uzak IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "luci-app-rp-pppoe-server için UCI erişimi verin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "Dinleme tarafı için olan IP"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "Baştan başlayıp sona gitmek yerine, oturum numarasını rastgele seçin"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Arayüz"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Dinlenecek arayüz."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Maksimum oturum"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Eş başına maksimum oturum"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Ofset"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Seçenekler dosyası"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP ofseti"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP birim numarası"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE Sunucu Yapılandırması"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE Sunucusu"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Rastgele oturum seçimi"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE Sunucusu"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Hizmet adı"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Senkronize et"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Birim"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Baştan başlayıp sona gitmek yerine, oturum numarasını rastgele seçin"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP birim numarası"
+
+#~ msgid "Sync"
+#~ msgstr "Senkronize et"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Maksimum oturum"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP ofseti"
diff --git a/applications/luci-app-rp-pppoe-server/po/uk/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/uk/rp-pppoe-server.po
index 4399eacbab..880a270103 100644
--- a/applications/luci-app-rp-pppoe-server/po/uk/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/uk/rp-pppoe-server.po
@@ -13,11 +13,53 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.5-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Ім'я концентратора доступу"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Перший віддалений IP"
 
@@ -25,83 +67,165 @@ msgstr "Перший віддалений IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr ""
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Назва сервісу"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
 msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Часове обмеження"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Одиниця"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
diff --git a/applications/luci-app-rp-pppoe-server/po/vi/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/vi/rp-pppoe-server.po
index f27d2db33c..31d8feb144 100644
--- a/applications/luci-app-rp-pppoe-server/po/vi/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/vi/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.18.1\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Truy cập tên tập trung"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "IP từ xa đầu tiên"
 
@@ -24,85 +66,184 @@ msgstr "IP từ xa đầu tiên"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Cấp quyền truy cập UCI cho luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "Địa chỉ IP của bên lắng nghe (listening side)"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"Thay vì bắt đầu từ đầu và kết thúc ở cuối, ngẫu nhiên hóa số phiên (session "
-"number)"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Giao diện"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Giao diện để lắng nghe."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Số phiên tối đa"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Số phiên tối đa cho mỗi peer"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Offset (Khoảng cách)"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Tệp tùy chọn"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Khoảng cách (offset) PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Đơn vị PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Cấu hình máy chủ PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE Server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Lựa chọn phiên ngẫu nhiên"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Máy chủ PPPoE Roaring Penguin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Cấu hình máy chủ"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Tên dịch vụ"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Đồng bộ"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Quá thời gian"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Đơn vị"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "Thay vì bắt đầu từ đầu và kết thúc ở cuối, ngẫu nhiên hóa số phiên "
+#~ "(session number)"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Đơn vị PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Đồng bộ"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Số phiên tối đa"
+
+#~ msgid "PPP offset"
+#~ msgstr "Khoảng cách (offset) PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/yua/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/yua/rp-pppoe-server.po
index 1bb8e03c2d..29075e5c34 100644
--- a/applications/luci-app-rp-pppoe-server/po/yua/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/yua/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.8-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "Nombre del concentrador de acceso"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "Primera IP remota"
 
@@ -24,85 +66,184 @@ msgstr "Primera IP remota"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "Conceder acceso UCI para luci-app-rp-pppoe-server"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "IP del lado que escucha"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
+msgid ""
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
 msgstr ""
-"En lugar de comenzar por el principio y terminar, aleatorice el número de "
-"sesión"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "Interfaz"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "Interfaz en la que escuchar."
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "Sesiones maximas"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "Sesiones máximas por par"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "Compensar"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "Opciones de archivo"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "Desplazamiento PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "Número de unidad de PPP"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "Configuración del servidor PPPoE"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "Servidor RP PPPoE"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "Selección de sesión aleatoria"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Servidor PPPoE Roaring Penguin"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "Nombre del servicio"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "Sincronizar"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "Tiempo agotado"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "Unidad"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr ""
+#~ "En lugar de comenzar por el principio y terminar, aleatorice el número de "
+#~ "sesión"
+
+#~ msgid "PPP unit number"
+#~ msgstr "Número de unidad de PPP"
+
+#~ msgid "Sync"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "Sesiones maximas"
+
+#~ msgid "PPP offset"
+#~ msgstr "Desplazamiento PPP"
diff --git a/applications/luci-app-rp-pppoe-server/po/zh_Hans/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/zh_Hans/rp-pppoe-server.po
index 2d2d55ef43..5dd3d8b4ed 100644
--- a/applications/luci-app-rp-pppoe-server/po/zh_Hans/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/zh_Hans/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.5.4\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "访问集中器名称"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "第一个远程 IP"
 
@@ -24,83 +66,182 @@ msgstr "第一个远程 IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "授予UCI访问luci-app-rp-pppoe-server的权限"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "监听侧 IP"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "随机分配会话号，而不是按顺序分配"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "接口"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "要监听的接口。"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "最大会话数"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "每个对等节点的最大会话数"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "偏移量"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "配置文件"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP 偏移量"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP 单元编号"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE 服务器配置"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE 服务器"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "随机会话选择"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE 服务器"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "服务器配置"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "服务名称"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "同步"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "超时"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "单元"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr "随机分配会话号，而不是按顺序分配"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP 单元编号"
+
+#~ msgid "Sync"
+#~ msgstr "同步"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "最大会话数"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP 偏移量"
diff --git a/applications/luci-app-rp-pppoe-server/po/zh_Hant/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/zh_Hant/rp-pppoe-server.po
index 253bbcb8b2..95c4bf52da 100644
--- a/applications/luci-app-rp-pppoe-server/po/zh_Hant/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/zh_Hant/rp-pppoe-server.po
@@ -12,11 +12,53 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.12-dev\n"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:48
 msgid "Access Concentrator Name"
 msgstr "存取集訊器名稱"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid "Both Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
+msgid ""
+"Causes <code>pppoe</code> to exit if no session traffic is detected for %s "
+"seconds."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid "Client Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:56
+msgid "Default: 5000"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:66
+msgid "Default: 600"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:61
+msgid "Default: 64"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:50
+msgid "Default: hostname"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
+msgid ""
+"Each one causes the named service to be advertised in a Service-Name tag in "
+"the PADO frame. The first one specifies the default service, and is used if "
+"the PPPoE client requests a Service-Name of length zero."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:25
+msgid "Enabled"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
 msgid "First remote IP"
 msgstr "第一個遠端 IP"
 
@@ -24,83 +66,182 @@ msgstr "第一個遠端 IP"
 msgid "Grant UCI access for luci-app-rp-pppoe-server"
 msgstr "授予 luci-app-rp-pppoe-server 擁有 UCI 存取的權限"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid "IP of listening side"
 msgstr "監聽側 IP"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:40
+msgid ""
+"If specified as <code>0.0.0.0</code> remote IP allocation will be delegated "
+"to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:33
 msgid ""
-"Instead of starting at beginning and going to end, randomize session number"
-msgstr "隨機分配工作階段號碼，而不是按順序分配"
+"If specified as <code>0.0.0.0</code> the selection of local IP address is "
+"delegated to <code>pppd</code>"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid ""
+"Instead of numbering PPPoE sessions starting at 1, numbering starts at %s"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface"
 msgstr "介面"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:34
+msgid ""
+"Interface from which to relay. Only PPPoE clients may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:27
 msgid "Interface on which to listen."
 msgstr "要監聽的介面。"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid ""
+"Interface on which to listen. Only PPPoE servers may be connected to this "
+"interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:41
+msgid ""
+"Interface upon which to listen and to relay. Both PPPoE clients and servers "
+"may be connected to this interface."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
+msgid "Invokes <code>pppd</code> with the unit flag"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
 msgid "MSS"
 msgstr "MSS"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
-msgid "Maximum sessions"
-msgstr "最大工作階段數"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:115
+msgid "Max Segment Size"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:53
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum Sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:58
+msgid "Maximum concurrent sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:66
 msgid "Maximum sessions per peer"
 msgstr "每個 peer 的最大工作階段數"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:70
+msgid "No limit"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:65
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:110
+msgid "No timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
 msgid "Offset"
 msgstr "位移"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:81
 msgid "Options file"
 msgstr "設定檔案"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
-msgid "PPP offset"
-msgstr "PPP 位移"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:99
+msgid "PPP Offset"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
-msgid "PPP unit number"
-msgstr "PPP 單元編號"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:19
+msgid "PPPoE Relay Configuration"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:19
 msgid "PPPoE Server Configuration"
 msgstr "PPPoE 伺服器設定"
 
+#: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:14
+msgid "RP PPPoE Relay"
+msgstr ""
+
 #: applications/luci-app-rp-pppoe-server/root/usr/share/luci/menu.d/luci-app-rp-pppoe-server.json:3
 msgid "RP PPPoE Server"
 msgstr "RP PPPoE 伺服器"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
 msgid "Random session selection"
 msgstr "隨機工作階段選擇"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Reduces CPU usage, but may cause a race condition on slow CPUs"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:21
+msgid "Relay Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:18
+msgid "Roaring Penguin PPPoE Relay"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:18
 msgid "Roaring Penguin PPPoE Server"
 msgstr "Roaring Penguin PPPoE 伺服器"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:21
 msgid "Server Configuration"
 msgstr "伺服器設定"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:27
+msgid "Server Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:53
 msgid "Service Name"
 msgstr "服務名稱"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
-msgid "Sync"
-msgstr "同步"
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:124
+msgid "Synchronous PPP encapsulation"
+msgstr ""
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:89
+msgid "Tells the PPPoE server to randomly permute session numbers."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:61
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:106
 msgid "Timeout"
 msgstr "逾時"
 
-#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:94
 msgid "Unit"
 msgstr "單元"
+
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-relay.js:48
+#: applications/luci-app-rp-pppoe-server/htdocs/luci-static/resources/view/pppoe/rp-pppoe-server.js:76
+msgid "Use Non-UCI Config"
+msgstr ""
+
+#~ msgid ""
+#~ "Instead of starting at beginning and going to end, randomize session "
+#~ "number"
+#~ msgstr "隨機分配工作階段號碼，而不是按順序分配"
+
+#~ msgid "PPP unit number"
+#~ msgstr "PPP 單元編號"
+
+#~ msgid "Sync"
+#~ msgstr "同步"
+
+#~ msgid "Maximum sessions"
+#~ msgstr "最大工作階段數"
+
+#~ msgid "PPP offset"
+#~ msgstr "PPP 位移"