luci-app-acme: convert to client side rendering

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>

38 files changed, 1842 insertions, 1178 deletions

diff --git a/applications/luci-app-acme/Makefile b/applications/luci-app-acme/Makefile
index 6849afb927..8f9bf8ec79 100644
--- a/applications/luci-app-acme/Makefile
+++ b/applications/luci-app-acme/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=ACME package - LuCI interface
-LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +acme
+LUCI_DEPENDS:=+luci-mod-admin-full +acme
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js
new file mode 100644
index 0000000000..9f9ff079e0
--- /dev/null
+++ b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js
@@ -0,0 +1,118 @@
+'use strict';
+'require form';
+'require fs';
+'require view';
+
+return view.extend({
+	load: function () {
+		return Promise.all([
+			L.resolveDefault(fs.stat('/usr/sbin/nginx'), {}),
+			L.resolveDefault(fs.stat('/usr/sbin/uhttpd'), {})
+		]);
+	},
+
+	render: function (stats) {
+		var m, s, o;
+
+		m = new form.Map("acme", _("ACME certificates"),
+			_("This configures ACME (Letsencrypt) automatic certificate installation. " +
+				"Simply fill out this to have the router configured with Letsencrypt-issued " +
+				"certificates for the web interface. " +
+				"Note that the domain names in the certificate must already be configured to " +
+				"point at the router's public IP address. " +
+				"Once configured, issuing certificates can take a while. " +
+				"Check the logs for progress and any errors."));
+
+		s = m.section(form.TypedSection, "acme", _("ACME global config"));
+		s.anonymous = true
+
+		o = s.option(form.Value, "state_dir", _("State directory"),
+			_("Where certs and other state files are kept."));
+		o.rmempty = false;
+		o.datatype = "directory";
+
+		o = s.option(form.Value, "account_email", _("Account email"),
+			_("Email address to associate with account key."))
+		o.rmempty = false;
+		o.datatype = "minlength(1)";
+
+		o = s.option(form.Flag, "debug", _("Enable debug logging"));
+		o.rmempty = false;
+
+		s = m.section(form.TypedSection, "cert", _("Certificate config"))
+		s.anonymous = false;
+		s.addremove = true;
+
+		o = s.option(form.Flag, "enabled", _("Enabled"));
+		o.rmempty = false;
+
+		o = s.option(form.Flag, "use_staging", _("Use staging server"),
+			_("Get certificate from the Letsencrypt staging server " +
+				"(use for testing; the certificate won't be valid)."));
+		o.rmempty = false;
+
+		o = s.option(form.ListValue, "keylength", _("Key size"),
+			_("Key size (and type) for the generated certificate."));
+		o.value("2048", _("RSA 2048 bits"));
+		o.value("3072", _("RSA 3072 bits"));
+		o.value("4096", _("RSA 4096 bits"));
+		o.value("ec-256", _("ECC 256 bits"));
+		o.value("ec-384", _("ECC 384 bits"));
+		o.default = "2048";
+		o.rmempty = false;
+
+		if (stats[1].type === 'file') {
+			o = s.option(form.Flag, "update_uhttpd", _("Use for uhttpd"),
+				_("Update the uhttpd config with this certificate once issued " +
+					"(only select this for one certificate). " +
+					"Is also available luci-app-uhttpd to configure uhttpd form the LuCI interface."));
+			o.rmempty = false;
+		}
+
+		if (stats[0].type === 'file') {
+			o = s.option(form.Flag, "update_nginx", _("Use for nginx"),
+				_("Update the nginx config with this certificate once issued " +
+					"(only select this for one certificate). " +
+					"Nginx must support ssl, if not it won't start as it needs to be " +
+					"compiled with ssl support to use cert options"));
+			o.rmempty = false;
+		}
+
+		o = s.option(form.Value, "webroot", _("Webroot directory"),
+			_("Webserver root directory. Set this to the webserver " +
+				"document root to run Acme in webroot mode. The web " +
+				"server must be accessible from the internet on port 80."));
+		o.optional = true;
+
+		o = s.option(form.DynamicList, "domains", _("Domain names"),
+			_("Domain names to include in the certificate. " +
+				"The first name will be the subject name, subsequent names will be alt names. " +
+				"Note that all domain names must point at the router in the global DNS."));
+		o.datatype = "list(string)";
+
+		s.option(form.Value, "dns", _("DNS API"),
+			_("To use DNS mode to issue certificates, set this to the name of a DNS API supported by acme.sh. " +
+				"See https://github.com/acmesh-official/acme.sh/wiki/dnsapi for the list of available APIs. " +
+				"In DNS mode, the domain name does not have to resolve to the router IP. " +
+				"DNS mode is also the only mode that supports wildcard certificates. " +
+				"Using this mode requires the acme-dnsapi package to be installed."));
+
+		o = s.option(form.DynamicList, "credentials", _("DNS API credentials"),
+			_("The credentials for the DNS API mode selected above. " +
+				"See https://github.com/acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required by each API. " +
+				"Add multiple entries here in KEY=VAL shell variable format to supply multiple credential variables."))
+		o.datatype = "list(string)";
+
+		s.option(form.Value, "calias", _("Challenge Alias"),
+			_("The challenge alias to use for ALL domains. " +
+				"See https://github.com/acmesh-official/acme.sh/wiki/DNS-alias-mode for the details of this process. " +
+				"LUCI only supports one challenge alias per certificate."));
+
+		s.option(form.Value, "dalias", _("Domain Alias"),
+			_("The domain alias to use for ALL domains. " +
+				"See https://github.com/acmesh-official/acme.sh/wiki/DNS-alias-mode for the details of this process. " +
+				"LUCI only supports one challenge domain per certificate."));
+
+		return m.render()
+	}
+})
diff --git a/applications/luci-app-acme/luasrc/model/cbi/acme.lua b/applications/luci-app-acme/luasrc/model/cbi/acme.lua
deleted file mode 100644
index a02250f4c8..0000000000
--- a/applications/luci-app-acme/luasrc/model/cbi/acme.lua
+++ /dev/null
@@ -1,117 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2016 Toke Høiland-Jørgensen <toke@toke.dk>
-
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
-
-]]--
-
-local fs = require "nixio.fs"
-
-local nginx_presence = fs.access("/usr/sbin/nginx") or false
-local uhttpd_presence = fs.access("/usr/sbin/uhttpd") or false
-
-m = Map("acme", translate("ACME certificates"),
-	translate("This configures ACME (Letsencrypt) automatic certificate installation. " ..
-                  "Simply fill out this to have the router configured with Letsencrypt-issued " ..
-                  "certificates for the web interface. " ..
-                  "Note that the domain names in the certificate must already be configured to " ..
-                  "point at the router's public IP address. " ..
-                  "Once configured, issuing certificates can take a while. " ..
-                  "Check the logs for progress and any errors."))
-
-s = m:section(TypedSection, "acme", translate("ACME global config"))
-s.anonymous = true
-
-st = s:option(Value, "state_dir", translate("State directory"),
-              translate("Where certs and other state files are kept."))
-st.rmempty = false
-st.datatype = "directory"
-
-ae = s:option(Value, "account_email", translate("Account email"),
-              translate("Email address to associate with account key."))
-ae.rmempty = false
-ae.datatype = "minlength(1)"
-
-d = s:option(Flag, "debug", translate("Enable debug logging"))
-d.rmempty = false
-
-cs = m:section(TypedSection, "cert", translate("Certificate config"))
-cs.anonymous = false
-cs.addremove = true
-
-e = cs:option(Flag, "enabled", translate("Enabled"))
-e.rmempty = false
-
-us = cs:option(Flag, "use_staging", translate("Use staging server"),
-               translate("Get certificate from the Letsencrypt staging server " ..
-                         "(use for testing; the certificate won't be valid)."))
-us.rmempty = false
-
-kl = cs:option(ListValue, "keylength", translate("Key size"),
-               translate("Key size (and type) for the generated certificate."))
-kl:value("2048", "RSA 2048 bits")
-kl:value("3072", "RSA 3072 bits")
-kl:value("4096", "RSA 4096 bits")
-kl:value("ec-256", "ECC 256 bits")
-kl:value("ec-384", "ECC 384 bits")
-kl.default = "2048"
-kl.rmempty = false
-
-if uhttpd_presence then
-u = cs:option(Flag, "update_uhttpd", translate("Use for uhttpd"),
-              translate("Update the uhttpd config with this certificate once issued " ..
-                        "(only select this for one certificate)." ..
-                        "Is also available luci-app-uhttpd to configure uhttpd form the LuCI interface."))
-u.rmempty = false
-end
-
-if nginx_presence then
-u = cs:option(Flag, "update_nginx", translate("Use for nginx"),
-              translate("Update the nginx config with this certificate once issued " ..
-                        "(only select this for one certificate)." ..
-                        "Nginx must support ssl, if not it won't start as it needs to be " ..
-                        "compiled with ssl support to use cert options"))
-u.rmempty = false
-end
-
-wr = cs:option(Value, "webroot", translate("Webroot directory"),
-               translate("Webserver root directory. Set this to the webserver " ..
-                         "document root to run Acme in webroot mode. The web " ..
-                         "server must be accessible from the internet on port 80."))
-wr.optional = true
-
-dom = cs:option(DynamicList, "domains", translate("Domain names"),
-                translate("Domain names to include in the certificate. " ..
-                          "The first name will be the subject name, subsequent names will be alt names. " ..
-                          "Note that all domain names must point at the router in the global DNS."))
-dom.datatype = "list(string)"
-
-dns = cs:option(Value, "dns", translate("DNS API"),
-                translate("To use DNS mode to issue certificates, set this to the name of a DNS API supported by acme.sh. " ..
-                          "See https://github.com/acmesh-official/acme.sh/wiki/dnsapi for the list of available APIs. " ..
-                          "In DNS mode, the domain name does not have to resolve to the router IP. " ..
-                          "DNS mode is also the only mode that supports wildcard certificates. " ..
-                          "Using this mode requires the acme-dnsapi package to be installed."))
-
-cred = cs:option(DynamicList, "credentials", translate("DNS API credentials"),
-                 translate("The credentials for the DNS API mode selected above. " ..
-                           "See https://github.com/acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required by each API. " ..
-                           "Add multiple entries here in KEY=VAL shell variable format to supply multiple credential variables."))
-cred.datatype = "list(string)"
-
-calias = cs:option(Value, "calias", translate("Challenge Alias"),
-                translate("The challenge alias to use for ALL domains. " ..
-                "See https://github.com/acmesh-official/acme.sh/wiki/DNS-alias-mode for the details of this process. " ..
-                "LUCI only supports one challenge alias per certificate."))
-
-dalias = cs:option(Value, "dalias", translate("Domain Alias"),
-                translate("The domain alias to use for ALL domains. " ..
-                "See https://github.com/acmesh-official/acme.sh/wiki/DNS-alias-mode for the details of this process. " ..
-                "LUCI only supports one challenge domain per certificate."))
-
-return m
diff --git a/applications/luci-app-acme/po/ar/acme.po b/applications/luci-app-acme/po/ar/acme.po
index ac08ba6529..4ba0cef1ce 100644
--- a/applications/luci-app-acme/po/ar/acme.po
+++ b/applications/luci-app-acme/po/ar/acme.po
@@ -11,7 +11,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "‍ شهادات بيئة إدارة الشهادات التلقائية"
 
@@ -19,39 +19,39 @@ msgstr "‍ شهادات بيئة إدارة الشهادات التلقائية
 msgid "ACME certs"
 msgstr "شهادات بيئة إدارة الشهادات التلقائية"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "التكوين العالمي لبيئة إدارة الشهادات التلقائية"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "حساب البريد الإلكتروني"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "تكوين الشهادة"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "الاسم المستعار لاعتراض"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "واجهة برمجة تطبيقات لنظام أسماء النطاقات"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "مؤهلات واجهة برمجة تطبيقات لنظام أسماء النطاقات"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "اسم المستعار لنطاق إنترنت\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "أسماء النطاقات"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -61,19 +61,27 @@ msgstr ""
 "وستكون الأسماء اللاحقة أسماء بديلة. لاحظ أن جميع أسماء النطاقات يجب أن تشير "
 "إلى جهاز التوجيه في نظام أسماء النطاقات العام."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "عنوان البريد الإلكتروني لربطه بمفتاح الحساب."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "مكن السجل للتصحيح البرمجي"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "ممكّن"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -85,19 +93,31 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "منح الوصول فريد معرف العميل ل luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "حجم المفتاح"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "حجم المفتاح (والنوع) للشهادة التي تم إنشاؤها."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "دليل الدولة"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -107,7 +127,7 @@ msgstr ""
 ".com/acmesh-official/acme.sh/wiki/DNS-alias-mode للاطلاع على تفاصيل هذه "
 "العملية. يدعم LUCI اسمًا مستعارًا واحدًا فقط للاعتراض لكل شهادة."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -119,7 +139,7 @@ msgstr ""
 "الاعتماد التي تتطلبها كل واجهة برمجة تطبيقات.  أضف إدخالات متعددة هنا في "
 "تنسيق متغير shell \"KEY = VAL\" لتوفير متغيرات اعتماد متعددة."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -129,7 +149,7 @@ msgstr ""
 "acmesh-official/acme.sh/wiki/DNS-alias-mode عن تفاصيل هذه العملية. لوسي يدعم "
 "فقط واحد التحدي المجال لكل شهادة."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -144,7 +164,7 @@ msgstr ""
 "بروتوكول الإنترنت العام لجهاز التوجيه.  بمجرد التكوين ، يمكن أن يستغرق إصدار "
 "الشهادات بعض الوقت.  يمكنك التحقق من سجلات التقدم وأية أخطاء."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -159,42 +179,42 @@ msgstr ""
 "إلى IP الخاص بالموجه. وضع DNS هو أيضًا الوضع الوحيد الذي يدعم شهادات أحرف "
 "البدل. يتطلب استخدام هذا الوضع تثبيت حزمة acme-dnsapi."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 "قم بتحديث nginx config بهذه الشهادة بمجرد إصدارها (حدد هذا فقط لشهادة واحدة)"
 ". يجب أن يدعم nginx SSL ، إذا لم يكن كذلك ، فلن يبدأ لأنه يحتاج إلى تجميع مع "
 "دعم SSL لاستخدام خيارات الشهادة"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 "قم بتحديث تكوين uhttpd بهذه الشهادة بمجرد إصدارها (حدد هذا فقط لشهادة واحدة)"
 ". كما يتوفر luci-app-uhttpd لتكوين uhttpd من واجهة LuCI."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr "استخدم ل nginx"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr "استخدم ل uhttpd"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr "استخدم خادم الترحيل"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "دليل Webroot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -203,6 +223,6 @@ msgstr ""
 "الدليل الجذر لخادم الويب. اضبط هذا على جذر وثيقة خادم الويب لتشغيل Acme في "
 "وضع webroot. يجب الوصول إلى خادم الويب من الإنترنت على المنفذ 80."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr "حيث يتم حفظ شهادات وملفات الدولة الأخرى."
diff --git a/applications/luci-app-acme/po/bg/acme.po b/applications/luci-app-acme/po/bg/acme.po
index d0280b0350..11c74a2d1d 100644
--- a/applications/luci-app-acme/po/bg/acme.po
+++ b/applications/luci-app-acme/po/bg/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/bn_BD/acme.po b/applications/luci-app-acme/po/bn_BD/acme.po
index 429fb256dc..b2cbf15232 100644
--- a/applications/luci-app-acme/po/bn_BD/acme.po
+++ b/applications/luci-app-acme/po/bn_BD/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/ca/acme.po b/applications/luci-app-acme/po/ca/acme.po
index 1d13422f29..3b75ed71f3 100644
--- a/applications/luci-app-acme/po/ca/acme.po
+++ b/applications/luci-app-acme/po/ca/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/cs/acme.po b/applications/luci-app-acme/po/cs/acme.po
index 0539c5c15c..a41fe9ac3c 100644
--- a/applications/luci-app-acme/po/cs/acme.po
+++ b/applications/luci-app-acme/po/cs/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/de/acme.po b/applications/luci-app-acme/po/de/acme.po
index 533a0e700f..c2b1cd7fc7 100644
--- a/applications/luci-app-acme/po/de/acme.po
+++ b/applications/luci-app-acme/po/de/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "ACME Zertifikate"
 
@@ -18,58 +18,66 @@ msgstr "ACME Zertifikate"
 msgid "ACME certs"
 msgstr "ACME Zertifikate"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Globale ACME Einstellungen"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Account E-Mail"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Zertifikateinstellungen"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "DNS API Zugangsdaten"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,26 +87,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Gewähre UCI Zugriff auf luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Schlüssellänge"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -106,14 +126,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -123,7 +143,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -133,43 +153,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/el/acme.po b/applications/luci-app-acme/po/el/acme.po
index 4fbce4004b..a04248ff31 100644
--- a/applications/luci-app-acme/po/el/acme.po
+++ b/applications/luci-app-acme/po/el/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/en/acme.po b/applications/luci-app-acme/po/en/acme.po
index 1233cea63a..23de92f402 100644
--- a/applications/luci-app-acme/po/en/acme.po
+++ b/applications/luci-app-acme/po/en/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "ACME certificates"
 
@@ -18,39 +18,39 @@ msgstr "ACME certificates"
 msgid "ACME certs"
 msgstr "ACME certs"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "ACME global config"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Account email"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Certificate config"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "Challenge Alias"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "DNS API credentials"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Domain Alias"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Domain names"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -60,19 +60,27 @@ msgstr ""
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "Email address to associate with account key."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Enable debug logging"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Enabled"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -84,26 +92,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -111,14 +131,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -128,7 +148,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -138,43 +158,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/es/acme.po b/applications/luci-app-acme/po/es/acme.po
index 1acf7352be..00a94422d6 100644
--- a/applications/luci-app-acme/po/es/acme.po
+++ b/applications/luci-app-acme/po/es/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "Certificados ACME"
 
@@ -18,39 +18,39 @@ msgstr "Certificados ACME"
 msgid "ACME certs"
 msgstr "Certificados ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Configuración global de ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Cuenta de email"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Configuración de certificado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "Alias de desafío"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "API de DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Credenciales de API de DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Alias de dominio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Nombres de dominio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -61,20 +61,28 @@ msgstr ""
 "en cuenta que todos los nombres de dominio deben apuntar al enrutador en el "
 "DNS global."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 "Dirección de correo electrónico para asociar con la clave de la cuenta."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Activar registro de depuración"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Activado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -86,19 +94,31 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Conceder acceso UCI para luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Tamaño de clave"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "Tamaño de clave (y tipo) para el certificado generado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "Directorio del estado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -108,7 +128,7 @@ msgstr ""
 "com/acmesh-official/acme.sh/wiki/DNS-alias-mode para obtener detalles sobre "
 "este proceso. LUCI solo admite un alias de desafío por certificado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -121,7 +141,7 @@ msgstr ""
 "en formato de variable de shell KEY=VAL para proporcionar múltiples "
 "variables de credenciales."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -132,7 +152,7 @@ msgstr ""
 "detalles sobre este proceso. LUCI solo admite un dominio de desafío por "
 "certificado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -149,7 +169,7 @@ msgstr ""
 "emisión de certificados puede demorar un tiempo. Verifique los registros de "
 "progreso y cualquier error."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -165,10 +185,10 @@ msgstr ""
 "del enrutador. El modo DNS también es el único modo que admite certificados "
 "comodín. El uso de este modo requiere que se instale el paquete acme-dnsapi."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 "Actualice la configuración de nginx con este certificado una vez emitido "
@@ -176,33 +196,33 @@ msgstr ""
 "SSL, de lo contrario no se iniciará, ya que debe compilarse con soporte SSL "
 "para usar opciones de certificado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 "Actualice la configuración de uhttpd con este certificado una vez emitido "
 "(solo seleccione esto para un certificado). También está disponible luci-app-"
 "uhttpd para configurar uhttpd desde la interfaz LuCI."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr "Usar para nginx"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr "Usar para uhttpd"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr "Usar servidor de ensayo"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "Directorio Webroot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -212,7 +232,7 @@ msgstr ""
 "del servidor web para ejecutar Acme en modo webroot. El servidor web debe "
 "ser accesible desde internet en el puerto 80."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr "Donde se mantienen los certificados y otros archivos de estado."
 
diff --git a/applications/luci-app-acme/po/fi/acme.po b/applications/luci-app-acme/po/fi/acme.po
index 804e871058..d46f0504a9 100644
--- a/applications/luci-app-acme/po/fi/acme.po
+++ b/applications/luci-app-acme/po/fi/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "ACME sertifikaatit"
 
@@ -18,39 +18,39 @@ msgstr "ACME sertifikaatit"
 msgid "ACME certs"
 msgstr "ACME sertifikaatit"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "ACME-yleisasetukset"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Sähköpostitili"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Sertifikaatin asetukset"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "Haaste - alias"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "DNS API kirjautumistiedot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Verkkonimen alias"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Verkkonimet"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -61,19 +61,27 @@ msgstr ""
 "kaikkien verkkotunnusten pitää osoittaa reitittimeen globaalissa DNS-"
 "järjestelmässä."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "Avaimeen liitettävä sähköpostiosoite."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Ota vieanetsintälokkaus käyttöön"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -83,26 +91,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Salli pääsy acme-asetuksiin"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Avaimen koko"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "Avaimen koko (ja tyyppi) luotavassa sertifikaatissa."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "Tilahakemisto"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -110,14 +130,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -127,7 +147,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -137,43 +157,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/fr/acme.po b/applications/luci-app-acme/po/fr/acme.po
index c04f4c40f1..41fda4fb54 100644
--- a/applications/luci-app-acme/po/fr/acme.po
+++ b/applications/luci-app-acme/po/fr/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -18,58 +18,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Activé"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,26 +87,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -106,14 +126,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -123,7 +143,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -133,43 +153,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/he/acme.po b/applications/luci-app-acme/po/he/acme.po
index ee1ff38658..7495081830 100644
--- a/applications/luci-app-acme/po/he/acme.po
+++ b/applications/luci-app-acme/po/he/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/hi/acme.po b/applications/luci-app-acme/po/hi/acme.po
index 1585839466..5b27cdc461 100644
--- a/applications/luci-app-acme/po/hi/acme.po
+++ b/applications/luci-app-acme/po/hi/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/hu/acme.po b/applications/luci-app-acme/po/hu/acme.po
index 4a8b820b24..3ae7403123 100644
--- a/applications/luci-app-acme/po/hu/acme.po
+++ b/applications/luci-app-acme/po/hu/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/it/acme.po b/applications/luci-app-acme/po/it/acme.po
index 0e2f82f32a..b24df858d7 100644
--- a/applications/luci-app-acme/po/it/acme.po
+++ b/applications/luci-app-acme/po/it/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "Certificati ACME"
 
@@ -18,39 +18,39 @@ msgstr "Certificati ACME"
 msgid "ACME certs"
 msgstr "Certificati ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Configurazione globale ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "E-mail dell'account"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Configurazione certificato"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "API DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Credenziali API DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Alias di dominio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Nomi di dominio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -60,19 +60,27 @@ msgstr ""
 "soggetto, i successivi saranno nomi alternativi. Nota che tutti i nomi di "
 "dominio devono puntare al router nel DNS globale."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "Indirizzo e-mail da associare alla chiave dell'account."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Abilita il logging esteso"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -84,26 +92,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Concedi l'accesso UCI a luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -111,14 +131,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -128,7 +148,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -138,43 +158,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/ja/acme.po b/applications/luci-app-acme/po/ja/acme.po
index 041204e0a1..35612d4274 100644
--- a/applications/luci-app-acme/po/ja/acme.po
+++ b/applications/luci-app-acme/po/ja/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -18,58 +18,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "有効"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,26 +87,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -106,14 +126,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -123,7 +143,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -133,43 +153,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/ko/acme.po b/applications/luci-app-acme/po/ko/acme.po
index 7721397fc3..b6a80cefcb 100644
--- a/applications/luci-app-acme/po/ko/acme.po
+++ b/applications/luci-app-acme/po/ko/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/mr/acme.po b/applications/luci-app-acme/po/mr/acme.po
index eafccaafa7..7972f8ca68 100644
--- a/applications/luci-app-acme/po/mr/acme.po
+++ b/applications/luci-app-acme/po/mr/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -18,58 +18,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "सक्षम केले"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,26 +87,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -106,14 +126,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -123,7 +143,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -133,43 +153,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/ms/acme.po b/applications/luci-app-acme/po/ms/acme.po
index f211ddbc88..cf5e8d0955 100644
--- a/applications/luci-app-acme/po/ms/acme.po
+++ b/applications/luci-app-acme/po/ms/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/nb_NO/acme.po b/applications/luci-app-acme/po/nb_NO/acme.po
index 12fb12db14..286dbd14fb 100644
--- a/applications/luci-app-acme/po/nb_NO/acme.po
+++ b/applications/luci-app-acme/po/nb_NO/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -18,58 +18,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Domenenavn"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,26 +87,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Nøkkelstørrelse"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -106,14 +126,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -123,7 +143,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -133,43 +153,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/pl/acme.po b/applications/luci-app-acme/po/pl/acme.po
index fe1c7ae771..1115edb95a 100644
--- a/applications/luci-app-acme/po/pl/acme.po
+++ b/applications/luci-app-acme/po/pl/acme.po
@@ -11,7 +11,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.1.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "Certyfikaty ACME"
 
@@ -19,39 +19,39 @@ msgstr "Certyfikaty ACME"
 msgid "ACME certs"
 msgstr "Certyfikaty ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Konfiguracja globalna ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Konto email"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Konfiguracja certyfikatu"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "Alias wyzwania"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Poświadczenia interfejsu API DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Alias Domeny"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Nazwy domen"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -61,19 +61,27 @@ msgstr ""
 "podmiotu, kolejne imiona będą imionami alternatywnymi. Pamiętaj, że "
 "wszystkie nazwy domen muszą wskazywać na router w globalnym DNS."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "Adres email do powiązania z kluczem konta."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Włącz rejestrowanie debugowania"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Włączone"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -85,19 +93,31 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Udziel dostępu UCI dla luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Rozmiar klucza"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "Rozmiar klucza (i typ) dla wygenerowanego certyfikatu."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "Katalog stanu"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -108,7 +128,7 @@ msgstr ""
 "informacje na temat tego procesu. LUCI obsługuje tylko jeden alias wyzwania "
 "na certyfikat."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -120,7 +140,7 @@ msgstr ""
 "poświadczeń wymaganych przez każdy interfejs API. Dodaj tutaj wiele wpisów w "
 "formacie zmiennej powłoki KEY=VAL, aby podać wiele zmiennych referencji."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -131,7 +151,7 @@ msgstr ""
 "informacje na temat tego procesu. LUCI obsługuje tylko jedną domenę wyzwania "
 "na certyfikat."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -147,7 +167,7 @@ msgstr ""
 "adres IP routera. Po skonfigurowaniu wydawanie certyfikatów może chwilę "
 "potrwać. Sprawdź dzienniki pod kątem postępu i ewentualnych błędów."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -164,10 +184,10 @@ msgstr ""
 "wieloznaczne. Korzystanie z tego trybu wymaga zainstalowania pakietu acme-"
 "dnsapi."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 "Zaktualizuj konfigurację nginx przy użyciu tego certyfikatu (wybierz to "
@@ -175,33 +195,33 @@ msgstr ""
 "uruchomi się, ponieważ należy go skompilować z obsługą ssl, aby użyć opcji "
 "certyfikatu"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 "Zaktualizuj konfigurację uhttpd z tym certyfikatem po wystawieniu (wybierz "
 "to tylko dla jednego certyfikatu). Jest również dostępna luci-app-uhttpd do "
 "konfiguracji uhttpd z interfejsu LuCI."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr "Użyj dla nginx"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr "Użyj dla uhttpd"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr "Użyj serwera pomostowego"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "Katalog Webroot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -211,6 +231,6 @@ msgstr ""
 "uruchomić Acme w trybie webroot. Serwer WWW musi być dostępny z Internetu na "
 "porcie 80."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr "Gdzie przechowywane są certyfikaty i inne pliki stanu."
diff --git a/applications/luci-app-acme/po/pt/acme.po b/applications/luci-app-acme/po/pt/acme.po
index 804481ff71..7c040701a7 100644
--- a/applications/luci-app-acme/po/pt/acme.po
+++ b/applications/luci-app-acme/po/pt/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "Certificados ACME"
 
@@ -18,39 +18,39 @@ msgstr "Certificados ACME"
 msgid "ACME certs"
 msgstr "Certificados ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Configuração global de ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Conta de e-mail"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Configuração do certificado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "Aliás do Desafio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "API do DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Credenciais do API do DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Aliás do Domínio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Nomes de domínio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -60,19 +60,27 @@ msgstr ""
 "assunto, os nomes subsequentes serão nomes alternativos. Note que todos os "
 "nomes de domínio devem apontar para o roteador no DNS global."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "O endereço de email para associar à chave da conta."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Ativar o registo de depuração"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Ativado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -84,19 +92,31 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Conceder acesso UCI ao luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Tamanho da chave"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "Tamanho (e tipo) da chave para o certificado gerado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "Diretório do estado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -107,7 +127,7 @@ msgstr ""
 "este processo. O LUCI é compatível apenas com um desafio aliás por "
 "certificado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -120,7 +140,7 @@ msgstr ""
 "formato como variável da shell KEY=VAL suprindo múltiplas variáveis para as "
 "credenciais."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -131,7 +151,7 @@ msgstr ""
 "este processo. O LUCI é compatível apenas com um desafio aliás por "
 "certificado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -148,7 +168,7 @@ msgstr ""
 "demorar um pouco. Verifique os registos log para ver o progresso e quaisquer "
 "erros."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -164,44 +184,44 @@ msgstr ""
 "O modo DNS é também o único modo que suporta certificados curinga. A "
 "utilização deste modo requer a instalação do pacote acme-dnsapi."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 "Atualize a configuração nginx com este certificado depois de ser emitido ("
-"selecione isto apenas para um certificado).Nginx deve suportar ssl, caso "
+"selecione isto apenas para um certificado). Nginx deve suportar ssl, caso "
 "contrário não será iniciado precisa ser compilado com o suporte ssl para "
 "usar as opções do cert"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 "Atualize a configuração uhttpd com este certificado depouis de ser emitido ("
 "selecione isto apenas para um certificado). Também está disponível o luci-"
 "app-uhttpd para configurar uhttpd a partir da interface LuCI."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr "Uso para nginx"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr "Use para uhttpd"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr "Use o servidor de estágio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "Diretório webroot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -211,6 +231,6 @@ msgstr ""
 "para executar o Acme em modo webroot. O servidor web deve estar acessível da "
 "Internet na porta 80."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr "Onde os certificados e outros ficheiros de estado são mantidos."
diff --git a/applications/luci-app-acme/po/pt_BR/acme.po b/applications/luci-app-acme/po/pt_BR/acme.po
index 4302c0d06d..91e4e2a3e9 100644
--- a/applications/luci-app-acme/po/pt_BR/acme.po
+++ b/applications/luci-app-acme/po/pt_BR/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "Certificados ACME"
 
@@ -18,39 +18,39 @@ msgstr "Certificados ACME"
 msgid "ACME certs"
 msgstr "certificados ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Configuração global ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "E-mail da conta"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Configuração do certificado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "Aliás do Desafio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "API do DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Credenciais do API DNS"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Aliás do Domínio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Nomes de domínio"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -60,19 +60,27 @@ msgstr ""
 "do assunto, os nomes subsequentes serão nomes alternativos. Observe que "
 "todos os nomes de domínio devem apontar para o roteador no DNS global."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "O endereço de email para associar à chave da conta."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Habilitar o registro de depuração"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Ativado"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -84,19 +92,31 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Conceda acesso UCI para o luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Tamanho da chave"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "Tamanho (e tipo) da chave para o certificado gerado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "Condição do diretório"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -107,7 +127,7 @@ msgstr ""
 "este processo. O LUCI é compatível apenas com um desafio aliás por "
 "certificado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -120,7 +140,7 @@ msgstr ""
 "formato como variável da shell KEY=VAL suprindo múltiplas variáveis para as "
 "credenciais."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -131,7 +151,7 @@ msgstr ""
 "este processo. O LUCI é compatível apenas com um desafio aliás por "
 "certificado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -148,7 +168,7 @@ msgstr ""
 "demorar um pouco. Verifique os registros log para ver os progressos e "
 "quaisquer outros erros."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -164,10 +184,10 @@ msgstr ""
 "O modo DNS também é o único modo que é compatível com certificados curinga. "
 "O uso desse modo requer que o pacote acme-dnsapi esteja instalado."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 "Uma vez emitido, atualize a configuração nginx com este certificado "
@@ -175,33 +195,33 @@ msgstr ""
 "ssl, caso contrário ele não vai iniciar pois para usar as opções cert ele "
 "precisa ser compilado com ssl"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 "Uma vez emitido, atualize a configuração uhttpd com este certificado "
 "(selecione-o apenas para um certificado). Também está disponível o luci-app-"
 "uhttpd para configurar o uhttpd através da interface LuCI."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr "Uso para o nginx"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr "Use para o uhttpd"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr "Use o servidor de encenação"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "Diretório Webroot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -211,7 +231,7 @@ msgstr ""
 "servidor da web para executar o Acme em modo webroot. O servidor web deve "
 "estar acessível na internet na porta 80."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr "Onde os certificados e os outros arquivos de estado são mantidos."
 
diff --git a/applications/luci-app-acme/po/ro/acme.po b/applications/luci-app-acme/po/ro/acme.po
index b74a7cfeff..4a11d0a572 100644
--- a/applications/luci-app-acme/po/ro/acme.po
+++ b/applications/luci-app-acme/po/ro/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/ru/acme.po b/applications/luci-app-acme/po/ru/acme.po
index 16f55579b2..7a7455bcca 100644
--- a/applications/luci-app-acme/po/ru/acme.po
+++ b/applications/luci-app-acme/po/ru/acme.po
@@ -11,7 +11,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.1.1\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "Сертификаты ACME"
 
@@ -19,58 +19,66 @@ msgstr "Сертификаты ACME"
 msgid "ACME certs"
 msgstr "Сертификаты ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "Глобальная конфигурация ACME"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "Адрес электронной почты"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Конфигурация сертификата"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Данные для доступа к DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Доменный алиас"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Доменные имена"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Включено"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -80,26 +88,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Предоставить UCI доступ для luci-app-acme"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Размер ключа"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -107,14 +127,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -124,7 +144,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -134,43 +154,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "Каталог Webroot"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/sk/acme.po b/applications/luci-app-acme/po/sk/acme.po
index f21ed215ca..4731963a5f 100644
--- a/applications/luci-app-acme/po/sk/acme.po
+++ b/applications/luci-app-acme/po/sk/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "ACME certifikáty"
 
@@ -18,39 +18,39 @@ msgstr "ACME certifikáty"
 msgid "ACME certs"
 msgstr "ACME certifikáty"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "ACME globálna konfigurácia"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "E-mail účtu"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "Konfigurácia certifikátov"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "Prihlasovacie údaje DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "Alias domény"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "Domény"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -59,19 +59,27 @@ msgstr ""
 "Domény v certifikáte. Prvá bude názov subjektu, ďalšie budú alternatívne "
 "názvy. Všetky domény musia smerovať na router v globálnom DNS."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "E-mailová adresa k účtu."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "Povoliť detailné záznamy"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Povolené"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 #, fuzzy
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
@@ -84,26 +92,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr "Povoliť luci-app-acme prístup k UCI"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "Dĺžka kľúča"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "Dĺžka (a typ) kľúča pre generovaný certifikát."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 #, fuzzy
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
@@ -115,14 +135,14 @@ msgstr ""
 "acmesh-official/acme.sh/wiki/dnsapi pre formát údajov požadovaný každým API. "
 "Pre zadanie viacerých údajov tu pridaj hodnoty v tvare KĽÚČ=HODNOTA."
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -132,7 +152,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -142,43 +162,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/sv/acme.po b/applications/luci-app-acme/po/sv/acme.po
index d4d9883c4b..3072afea52 100644
--- a/applications/luci-app-acme/po/sv/acme.po
+++ b/applications/luci-app-acme/po/sv/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/templates/acme.pot b/applications/luci-app-acme/po/templates/acme.pot
index c47530dfb8..b9beb9855a 100644
--- a/applications/luci-app-acme/po/templates/acme.pot
+++ b/applications/luci-app-acme/po/templates/acme.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -9,58 +9,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -70,26 +78,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -97,14 +117,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -114,7 +134,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -124,43 +144,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/tr/acme.po b/applications/luci-app-acme/po/tr/acme.po
index 2ada2b5985..c91094284e 100644
--- a/applications/luci-app-acme/po/tr/acme.po
+++ b/applications/luci-app-acme/po/tr/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/uk/acme.po b/applications/luci-app-acme/po/uk/acme.po
index d08a79d0da..3b535eee5e 100644
--- a/applications/luci-app-acme/po/uk/acme.po
+++ b/applications/luci-app-acme/po/uk/acme.po
@@ -11,7 +11,7 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -19,58 +19,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -80,26 +88,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -107,14 +127,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -124,7 +144,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -134,43 +154,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/vi/acme.po b/applications/luci-app-acme/po/vi/acme.po
index b8ff9cc093..11bf344b60 100644
--- a/applications/luci-app-acme/po/vi/acme.po
+++ b/applications/luci-app-acme/po/vi/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/po/zh_Hans/acme.po b/applications/luci-app-acme/po/zh_Hans/acme.po
index a384d8856e..9b796c7365 100644
--- a/applications/luci-app-acme/po/zh_Hans/acme.po
+++ b/applications/luci-app-acme/po/zh_Hans/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr "ACME 证书"
 
@@ -18,58 +18,66 @@ msgstr "ACME 证书"
 msgid "ACME certs"
 msgstr "ACME 证书"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr "ACME 全局配置"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr "电子邮件帐户"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr "证书配置"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr "质询别名"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr "DNS API 凭证"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr "域名别名"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr "域名"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr "证书中要包含的域名。第一个名字将是主题名，后面的名字将是主题备用名称。请注意，所有域名都必须在路由中指向全局 DNS。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr "与帐户密钥关联的电子邮件地址。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr "启用调试日志记录"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "已启用"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,19 +87,31 @@ msgstr "从 Letsencrypt 临时服务器获取证书(用于测试;证书无效)�
 msgid "Grant UCI access for luci-app-acme"
 msgstr "授予 UCI 访问 luci-app-acme 的权限"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr "密钥长度"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr "生成的证书的密钥长度(和类型)。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr "状态文件夹"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -100,7 +120,7 @@ msgstr ""
 "用于所有域名的质询别名(challenge alias)。有关此过程的详细信息，请参阅 https://github.com/"
 "acmesh-official/acme.sh/wiki/DNS-alias-mode。LUCI 每个证书只支持一个质询别名。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -110,7 +130,7 @@ msgstr ""
 "上面选择的 DNS API 模式的凭据。请参阅 https://github.com/acmesh-official/acme.sh/wiki/"
 "dnsapi 以了解每个 API 所需的凭据格式。在此处以 KEY=VAL shell 变量格式添加多个条目，以提供多个凭据变量。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -119,7 +139,7 @@ msgstr ""
 "用于所有域名的别名(domain alias)。有关此过程的详细信息，请参阅 https://github.com/acmesh-official/"
 "acme.sh/wiki/DNS-alias-mode。LUCI 每个证书只支持一个质询别名。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -131,7 +151,7 @@ msgstr ""
 "这将配置 ACME (Letsencrypt) 自动证书安装。只需填写此内容即可为路由器配置由 Letsencrypt 颁发的 Web 界面证书。请注意，"
 "证书中的域名必须已经配置为指向路由器的公网 IP 地址。配置完成后，颁发证书可能需要一段时间。从日志中查看签署进度和错误。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -144,41 +164,41 @@ msgstr ""
 "https://github.com/acmesh-official/acme.sh/wiki/dnsapi。在 DNS "
 "模式下，域名不必解析为路由器IP。DNS 模式也是唯一支持通配符证书的模式。使用此模式需要安装 acme-dnsapi 包。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 "颁发此证书后，用该证书更新 nginx 配置（只能有一个证书配置选中该选项）。Nginx 必须支持 "
 "ssl，如果无法启动，则必须使用ssl支持进行编译才能使用证书选项"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 "签发此证书后，使用此证书更新 uhttpd 配置（只能有一个证书配置选中该选项）。也可通过 LuCI 界面的 luci-app-uhttpd 来配置 "
 "uhttpd。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr "用于 Nginx"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr "用于 uhttpd"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr "使用临时服务器"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr "Webroot 文件夹"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -186,7 +206,7 @@ msgid ""
 msgstr ""
 "Webserver 根目录。设置为 Web 服务器文档根目录，在 webroot 模式下运行 Acme。Web 服务器必须允许从互联网上使用80端口访问。"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr "存放证书和其他状态文件的位置。"
 
diff --git a/applications/luci-app-acme/po/zh_Hant/acme.po b/applications/luci-app-acme/po/zh_Hant/acme.po
index e3371c95fd..6210b9a5e7 100644
--- a/applications/luci-app-acme/po/zh_Hant/acme.po
+++ b/applications/luci-app-acme/po/zh_Hant/acme.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -18,58 +18,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr "啟用"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -79,26 +87,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -106,14 +126,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -123,7 +143,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -133,43 +153,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""
diff --git a/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json
index 5f1f95e127..0026905a48 100644
--- a/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json
+++ b/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json
@@ -3,9 +3,8 @@
 		"title": "ACME certs",
 		"order": 50,
 		"action": {
-			"type": "cbi",
-			"path": "acme",
-			"post": { "cbi.submit": true }
+			"type": "view",
+			"path": "acme"
 		},
 		"depends": {
 			"acl": [ "luci-app-acme" ]
diff --git a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
index a87529528a..110f9c5451 100644
--- a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
+++ b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
@@ -2,6 +2,10 @@
         "luci-app-acme": {
                 "description": "Grant UCI access for luci-app-acme",
                 "read": {
+                        "file": {
+                                "/usr/sbin/nginx": [ "read" ],
+                                "/usr/sbin/uhttpd": [ "read" ]
+                        },
                         "uci": [ "acme" ]
                 },
                 "write": {