luci-app-acme: Split Challenge Validation tab into two

The validation_method is now set to webroot by default.
This is the most used option.

The webroot option is now empty by default.
Into the description added that by default will be used /var/run/acme/challenge/
Webservers should serve the folder under /.well-known/acme-challenge/ url.
The folder is automatically created by the acmesh service on renewal.

The Challenge Validation Tab is split to Webroot and DNS and the validation method moved to general tab.
So ideally a user won't see the webroot folder option from other tab.
And a user can basically enable the webroot just in the general tab without leaving it.
The DNS validation needs too many options to it needs for own tab.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>

38 files changed, 182 insertions, 85 deletions

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
index 7587047bbb..5542c7858d 100644
--- a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js
+++ b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js
@@ -36,7 +36,8 @@ return view.extend({
 		s.nodescriptions = true;
 
 		o = s.tab("general", _("General Settings"));
-		o = s.tab("challenge", _("Challenge Validation"));
+		o = s.tab('challenge_webroot', _('Webroot Challenge Validation'));
+		o = s.tab('challenge_dns', _('DNS Challenge Validation'));
 		o = s.tab("advanced", _('Advanced Settings'));
 
 		o = s.taboption('general', form.Flag, "enabled", _("Enabled"));
@@ -48,24 +49,26 @@ return view.extend({
 				"Note that all domain names must point at the router in the global DNS."));
 		o.datatype = "list(string)";
 
-		o = s.taboption('challenge', form.ListValue, "validation_method", _("Validation method"),
+		o = s.taboption('general', form.ListValue, 'validation_method', _('Validation method'),
 			_("Standalone mode will use the built-in webserver of acme.sh to issue a certificate. " +
 			"Webroot mode will use an existing webserver to issue a certificate. " +
 			"DNS mode will allow you to use the DNS API of your DNS provider to issue a certificate."));
 		o.value("standalone", _("Standalone"));
 		o.value("webroot", _("Webroot"));
 		o.value("dns", _("DNS"));
-		o.default = "standalone";
+		o.default = 'webroot';
 
-		o = s.taboption('challenge', form.Value, "webroot", _("Webroot directory"),
+		o = s.taboption('challenge_webroot', 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."));
+				"server must be accessible from the internet on port 80.") + '<br/>' +
+			_("Default") + " <em>/var/run/acme/challenge/</em>"
+		);
 		o.optional = true;
 		o.depends("validation_method", "webroot");
 		o.modalonly = true;
 
-		o = s.taboption('challenge', form.Value, "dns", _("DNS API"),
+		o = s.taboption('challenge_dns', 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. " +
@@ -74,7 +77,7 @@ return view.extend({
 		o.depends("validation_method", "dns");
 		o.modalonly = true;
 
-		o = s.taboption('challenge', form.DynamicList, "credentials", _("DNS API credentials"),
+		o = s.taboption('challenge_dns', 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."))
@@ -82,14 +85,14 @@ return view.extend({
 		o.depends("validation_method", "dns");
 		o.modalonly = true;
 
-		o = s.taboption('challenge', form.Value, "calias", _("Challenge Alias"),
+		o = s.taboption('challenge_dns', 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."));
 		o.depends("validation_method", "dns");
 		o.modalonly = true;
 
-		o = s.taboption('challenge', form.Value, "dalias", _("Domain Alias"),
+		o = s.taboption('challenge_dns', 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."));
diff --git a/applications/luci-app-acme/po/ar/acme.po b/applications/luci-app-acme/po/ar/acme.po
index b1b06f65b2..c3fcf0f48b 100644
--- a/applications/luci-app-acme/po/ar/acme.po
+++ b/applications/luci-app-acme/po/ar/acme.po
@@ -44,8 +44,11 @@ msgid "Challenge Alias"
 msgstr "الاسم المستعار لاعتراض"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "التحقق من صحة التحدي"
+msgid "DNS Challenge Validation"
+msgstr "DNS التحقق من صحة التحدي"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot التحقق من صحة التحدي"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/bg/acme.po b/applications/luci-app-acme/po/bg/acme.po
index 70db5903e8..a87efd3763 100644
--- a/applications/luci-app-acme/po/bg/acme.po
+++ b/applications/luci-app-acme/po/bg/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Проверка на предизвикателство"
+msgid "DNS Challenge Validation"
+msgstr "DNS Проверка на предизвикателство"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Проверка на предизвикателство"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/bn_BD/acme.po b/applications/luci-app-acme/po/bn_BD/acme.po
index dd11f93958..c4a315142a 100644
--- a/applications/luci-app-acme/po/bn_BD/acme.po
+++ b/applications/luci-app-acme/po/bn_BD/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "চ্যালেঞ্জ উপনাম"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "চ্যালেঞ্জ বৈধতা"
+msgid "DNS Challenge Validation"
+msgstr "DNS চ্যালেঞ্জ বৈধতা"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot চ্যালেঞ্জ বৈধতা"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/ca/acme.po b/applications/luci-app-acme/po/ca/acme.po
index ea8f19f021..472acd5c0a 100644
--- a/applications/luci-app-acme/po/ca/acme.po
+++ b/applications/luci-app-acme/po/ca/acme.po
@@ -42,8 +42,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/cs/acme.po b/applications/luci-app-acme/po/cs/acme.po
index f67ffb4185..402c952cb7 100644
--- a/applications/luci-app-acme/po/cs/acme.po
+++ b/applications/luci-app-acme/po/cs/acme.po
@@ -42,9 +42,11 @@ msgstr "Konfigurace certifikátu"
 msgid "Challenge Alias"
 msgstr "Aliasy"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validace"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validace"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validace"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/da/acme.po b/applications/luci-app-acme/po/da/acme.po
index 530ae43eca..5e748fd535 100644
--- a/applications/luci-app-acme/po/da/acme.po
+++ b/applications/luci-app-acme/po/da/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Udfordr Alias"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Udfordringsvalidering"
+msgid "DNS Challenge Validation"
+msgstr "DNS Udfordringsvalidering"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Udfordringsvalidering"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/de/acme.po b/applications/luci-app-acme/po/de/acme.po
index dc1ea54cef..16a994c7bc 100644
--- a/applications/luci-app-acme/po/de/acme.po
+++ b/applications/luci-app-acme/po/de/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Challenge-Alias"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Challenge-Verifizierung"
+msgid "DNS Challenge Validation"
+msgstr "DNS Challenge-Verifizierung"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Challenge-Verifizierung"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/el/acme.po b/applications/luci-app-acme/po/el/acme.po
index eee6718b84..13b36d4f02 100644
--- a/applications/luci-app-acme/po/el/acme.po
+++ b/applications/luci-app-acme/po/el/acme.po
@@ -42,8 +42,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/en/acme.po b/applications/luci-app-acme/po/en/acme.po
index 4d5fb2ff2c..96b497cb8e 100644
--- a/applications/luci-app-acme/po/en/acme.po
+++ b/applications/luci-app-acme/po/en/acme.po
@@ -42,8 +42,10 @@ msgstr "Certificate config"
 msgid "Challenge Alias"
 msgstr "Challenge Alias"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/es/acme.po b/applications/luci-app-acme/po/es/acme.po
index b651d17ffb..10c27c2c22 100644
--- a/applications/luci-app-acme/po/es/acme.po
+++ b/applications/luci-app-acme/po/es/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Alias de desafío"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validación de desafío"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validación de desafío"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validación de desafío"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/fi/acme.po b/applications/luci-app-acme/po/fi/acme.po
index abe6b618c3..c3895e1d97 100644
--- a/applications/luci-app-acme/po/fi/acme.po
+++ b/applications/luci-app-acme/po/fi/acme.po
@@ -42,8 +42,10 @@ msgstr "Sertifikaatin asetukset"
 msgid "Challenge Alias"
 msgstr "Haaste - alias"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/fr/acme.po b/applications/luci-app-acme/po/fr/acme.po
index c0e80bd98e..b21422bffe 100644
--- a/applications/luci-app-acme/po/fr/acme.po
+++ b/applications/luci-app-acme/po/fr/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Alias du challenge"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validation du challenge"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validation du challenge"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validation du challenge"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/he/acme.po b/applications/luci-app-acme/po/he/acme.po
index 07020b8964..ab22f99199 100644
--- a/applications/luci-app-acme/po/he/acme.po
+++ b/applications/luci-app-acme/po/he/acme.po
@@ -43,8 +43,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/hi/acme.po b/applications/luci-app-acme/po/hi/acme.po
index 8f9298e959..55e6de2faa 100644
--- a/applications/luci-app-acme/po/hi/acme.po
+++ b/applications/luci-app-acme/po/hi/acme.po
@@ -36,8 +36,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/hu/acme.po b/applications/luci-app-acme/po/hu/acme.po
index 1271ba73d6..fb9360164a 100644
--- a/applications/luci-app-acme/po/hu/acme.po
+++ b/applications/luci-app-acme/po/hu/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Kihívás álneve"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Kihívás érvényesítése"
+msgid "DNS Challenge Validation"
+msgstr "DNS Kihívás érvényesítése"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Kihívás érvényesítése"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/id/acme.po b/applications/luci-app-acme/po/id/acme.po
index ea70240afa..d30dae8dfb 100644
--- a/applications/luci-app-acme/po/id/acme.po
+++ b/applications/luci-app-acme/po/id/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Tantangan Alias"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validasi Tantangan"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validasi Tantangan"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validasi Tantangan"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/it/acme.po b/applications/luci-app-acme/po/it/acme.po
index b7ea356ed7..f392f2334a 100644
--- a/applications/luci-app-acme/po/it/acme.po
+++ b/applications/luci-app-acme/po/it/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Alias challenge"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validazione challenge"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validazione challenge"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validazione challenge"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/ja/acme.po b/applications/luci-app-acme/po/ja/acme.po
index f6ed1a3931..9698e35c30 100644
--- a/applications/luci-app-acme/po/ja/acme.po
+++ b/applications/luci-app-acme/po/ja/acme.po
@@ -42,8 +42,10 @@ msgstr "証明書設定"
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/ko/acme.po b/applications/luci-app-acme/po/ko/acme.po
index d5466e46f5..70b13a0137 100644
--- a/applications/luci-app-acme/po/ko/acme.po
+++ b/applications/luci-app-acme/po/ko/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "챌린지 별칭"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "챌린지 확인"
+msgid "DNS Challenge Validation"
+msgstr "DNS 챌린지 확인"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot 챌린지 확인"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/lt/acme.po b/applications/luci-app-acme/po/lt/acme.po
index 55a58a2374..46bb1b71f5 100644
--- a/applications/luci-app-acme/po/lt/acme.po
+++ b/applications/luci-app-acme/po/lt/acme.po
@@ -46,8 +46,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/mr/acme.po b/applications/luci-app-acme/po/mr/acme.po
index da4a24800b..a211f78744 100644
--- a/applications/luci-app-acme/po/mr/acme.po
+++ b/applications/luci-app-acme/po/mr/acme.po
@@ -42,8 +42,10 @@ msgstr "प्रमाणपत्र कॉन्फिगरेशन"
 msgid "Challenge Alias"
 msgstr "आव्हान उपनाम"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/ms/acme.po b/applications/luci-app-acme/po/ms/acme.po
index d31a0652a5..be210b2c8f 100644
--- a/applications/luci-app-acme/po/ms/acme.po
+++ b/applications/luci-app-acme/po/ms/acme.po
@@ -42,8 +42,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/nb_NO/acme.po b/applications/luci-app-acme/po/nb_NO/acme.po
index 34cdd981a5..4f2377ac8e 100644
--- a/applications/luci-app-acme/po/nb_NO/acme.po
+++ b/applications/luci-app-acme/po/nb_NO/acme.po
@@ -42,8 +42,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/pl/acme.po b/applications/luci-app-acme/po/pl/acme.po
index a3b138b6e4..1688acece3 100644
--- a/applications/luci-app-acme/po/pl/acme.po
+++ b/applications/luci-app-acme/po/pl/acme.po
@@ -44,8 +44,11 @@ msgid "Challenge Alias"
 msgstr "Alias wyzwania"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Weryfikacja wyzwań"
+msgid "DNS Challenge Validation"
+msgstr "DNS Weryfikacja wyzwań"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Weryfikacja wyzwań"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/pt/acme.po b/applications/luci-app-acme/po/pt/acme.po
index 5d2a506702..a93bda0b91 100644
--- a/applications/luci-app-acme/po/pt/acme.po
+++ b/applications/luci-app-acme/po/pt/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Aliás do Desafio"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validação do desafio"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validação do desafio"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validação do desafio"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/pt_BR/acme.po b/applications/luci-app-acme/po/pt_BR/acme.po
index f685d3a38f..29685edf76 100644
--- a/applications/luci-app-acme/po/pt_BR/acme.po
+++ b/applications/luci-app-acme/po/pt_BR/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Aliás do Desafio"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validação do Desafio"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validação do Desafio"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validação do Desafio"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/ro/acme.po b/applications/luci-app-acme/po/ro/acme.po
index bb83c0b8fc..edebabbb51 100644
--- a/applications/luci-app-acme/po/ro/acme.po
+++ b/applications/luci-app-acme/po/ro/acme.po
@@ -44,8 +44,11 @@ msgid "Challenge Alias"
 msgstr "Alias de provocare"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Validarea provocării"
+msgid "DNS Challenge Validation"
+msgstr "DNS Validarea provocării"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Validarea provocării"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/ru/acme.po b/applications/luci-app-acme/po/ru/acme.po
index 80659bd55a..b74ea4d18e 100644
--- a/applications/luci-app-acme/po/ru/acme.po
+++ b/applications/luci-app-acme/po/ru/acme.po
@@ -44,8 +44,11 @@ msgid "Challenge Alias"
 msgstr "Псевдонимы вызова"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Проверка вызовов"
+msgid "DNS Challenge Validation"
+msgstr "DNS подтверждение"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot подтверждение"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/si/acme.po b/applications/luci-app-acme/po/si/acme.po
index ed532e5417..eefe86a93c 100644
--- a/applications/luci-app-acme/po/si/acme.po
+++ b/applications/luci-app-acme/po/si/acme.po
@@ -42,8 +42,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/sk/acme.po b/applications/luci-app-acme/po/sk/acme.po
index 8f916a295f..d60ff5cdb2 100644
--- a/applications/luci-app-acme/po/sk/acme.po
+++ b/applications/luci-app-acme/po/sk/acme.po
@@ -42,8 +42,10 @@ msgstr "Konfigurácia certifikátov"
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/sv/acme.po b/applications/luci-app-acme/po/sv/acme.po
index 60d12eebdc..3f341a01d9 100644
--- a/applications/luci-app-acme/po/sv/acme.po
+++ b/applications/luci-app-acme/po/sv/acme.po
@@ -42,8 +42,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/templates/acme.pot b/applications/luci-app-acme/po/templates/acme.pot
index e336033df3..d15d75a0cb 100644
--- a/applications/luci-app-acme/po/templates/acme.pot
+++ b/applications/luci-app-acme/po/templates/acme.pot
@@ -33,8 +33,10 @@ msgstr ""
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
+msgid "DNS Challenge Validation"
+msgstr ""
+
+msgid "Webroot Challenge Validation"
 msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
diff --git a/applications/luci-app-acme/po/tr/acme.po b/applications/luci-app-acme/po/tr/acme.po
index 5ff033976d..e41a3861ee 100644
--- a/applications/luci-app-acme/po/tr/acme.po
+++ b/applications/luci-app-acme/po/tr/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Challenge Takma Adı"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Zorluk Doğrulaması"
+msgid "DNS Challenge Validation"
+msgstr "DNS Zorluk Doğrulaması"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Zorluk Doğrulaması"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/uk/acme.po b/applications/luci-app-acme/po/uk/acme.po
index aeb318c62f..82c44808d3 100644
--- a/applications/luci-app-acme/po/uk/acme.po
+++ b/applications/luci-app-acme/po/uk/acme.po
@@ -44,8 +44,11 @@ msgid "Challenge Alias"
 msgstr "Псевдоніми виклику"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Перевірка викликів"
+msgid "DNS Challenge Validation"
+msgstr "DNS Перевірка викликів"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Перевірка викликів"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/vi/acme.po b/applications/luci-app-acme/po/vi/acme.po
index a7e88ebd7b..37467c0419 100644
--- a/applications/luci-app-acme/po/vi/acme.po
+++ b/applications/luci-app-acme/po/vi/acme.po
@@ -42,9 +42,11 @@ msgstr "Cấu hình chứng chỉ"
 msgid "Challenge Alias"
 msgstr "Bí danh"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Thẩm định"
+msgid "DNS Challenge Validation"
+msgstr "DNS Thẩm định"
+
+msgid "Webroot Challenge Validation"
+msgstr "Webroot Thẩm định"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/zh_Hans/acme.po b/applications/luci-app-acme/po/zh_Hans/acme.po
index 21f2a9fe3a..cbfaafffc4 100644
--- a/applications/luci-app-acme/po/zh_Hans/acme.po
+++ b/applications/luci-app-acme/po/zh_Hans/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "质询别名"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "质询验证"
+msgid "DNS Challenge Validation"
+msgstr "DNS 质询验证"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot 质询验证"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"
diff --git a/applications/luci-app-acme/po/zh_Hant/acme.po b/applications/luci-app-acme/po/zh_Hant/acme.po
index b1325c946c..29f58a8fe4 100644
--- a/applications/luci-app-acme/po/zh_Hant/acme.po
+++ b/applications/luci-app-acme/po/zh_Hant/acme.po
@@ -43,8 +43,11 @@ msgid "Challenge Alias"
 msgstr "Challenge 別名"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "Challenge 驗證"
+msgid "DNS Challenge Validation"
+msgstr "DNS Challenge 驗證"
+
+msgid  "Webroot Challenge Validation"
+msgstr "Webroot Challenge 驗證"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
 msgid "Custom ACME CA"