i18n: sync translations

Sync translations.

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

30 files changed, 1698 insertions, 1944 deletions

diff --git a/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
index 6418382444..9187f341cd 100644
--- a/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/bg/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
index 0c05a65cdb..dbdb2ea03e 100644
--- a/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ca/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
index 77e98ed471..0cc66bb545 100644
--- a/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/cs/https-dns-proxy.po
@@ -10,156 +10,148 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP a DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "Více informací o dalších možnostech"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "Instance"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Naslouchající adresa"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Naslouchající port"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Poskytovatel"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "Proxy server"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Adresa podsítě"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
@@ -167,26 +159,28 @@ msgstr ""
 "Pokud níže přidáte nebo odeberete instance, budou použity k přepsání sekce "
 "'DNS forwardings' v"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "a"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "Provider"
+#~ msgstr "Poskytovatel"
+
+#~ msgid "Subnet address"
+#~ msgstr "Adresa podsítě"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "HTTPS DNS Proxy"
 
diff --git a/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
index ca014fc392..1c4230d68d 100644
--- a/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/de/https-dns-proxy.po
@@ -10,156 +10,148 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr "AdGuard (Familienschutz)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr "AdGuard (Standard)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr "CleanBrowsing (Familienfilter)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr "CleanBrowsing (Familienfilter)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr "CleanBrowsing (Sicherheitsfilter)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP und DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS über HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "DNS über HTTPS Proxy-Einstellungen"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr "DNS.SB"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr "Digitale Gesellschaft"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr "DoH"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "Weitere Informationen zu den verschiedenen Optionen finden Sie unter"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr "Google"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "Instanzen"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Listen-Adresse"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Listen-Port"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Lade"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr "ODVR (nic.cz)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Anbieter"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "Proxyserver"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr "Quad 9 (empfohlen)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr "Quad 9 (gesichert mit ECS-Unterstützung)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr "Quad 9 (gesichert)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr "Quad 9 (ungesichert)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Neu laden"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr "Laufend"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr "Dienststatus"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Start"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Stoppen"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Subnetzadresse"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Bekannter Anbieter"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
@@ -167,26 +159,37 @@ msgstr ""
 "Wenn Sie untenstehende Instanzen hinzufügen/entfernen, werden sie für den "
 "Abschnitt 'DNS-Weiterleitungen' verwendet von"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "und"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr "bei"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr "ist nicht installiert oder nicht gefunden"
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS über HTTPS Proxy"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "DNS über HTTPS Proxy-Einstellungen"
+
+#~ msgid "Provider"
+#~ msgstr "Anbieter"
+
+#~ msgid "Subnet address"
+#~ msgstr "Subnetzadresse"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Bekannter Anbieter"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "HTTPS-DNS-Proxy"
 
diff --git a/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
index a72984b497..2a8198caef 100644
--- a/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/el/https-dns-proxy.po
@@ -10,177 +10,165 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Φόρτωση"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
index ab7bd6e7f7..9dc2bebfb5 100644
--- a/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/en/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
index 7fd7d2fa23..4adb321e04 100644
--- a/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/es/https-dns-proxy.po
@@ -13,156 +13,148 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr "AdGuard (Protección familiar)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr "AdGuard (estándar)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr "CleanBrowsing (Filtro para adultos)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr "CleanBrowsing (Filtro familiar)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr "CleanBrowsing (Filtro de seguridad)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP y DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS sobre proxy HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Configuración de DNS sobre proxy HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr "DNS.SB"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr "Sociedad digital"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Desactivar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr "DoH"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Activar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "Para obtener más información sobre diferentes opciones, consulte"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr "Google"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "Instancias"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Escuchar dirección"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Puerto"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Cargando"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr "ODVR (nic.cz)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Proveedor"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr "Quad 9 (recomendado)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr "Quad 9 (Asegurado con soporte ECS)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr "Quad 9 (Asegurado)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr "Quad 9 (No asegurado)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Recargar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr "Corriendo"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr "Estado del servicio"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Iniciar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Detener"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "Detenido"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Direccion de subred"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Proveedor Desconocido"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
@@ -170,26 +162,37 @@ msgstr ""
 "Cuando agregue/elimine las instancias a continuación, se utilizarán para "
 "anular la sección 'Reenvíos DNS' de"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "y"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr "a"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr "no está instalado o no se encuentra"
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS sobre proxy HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Configuración de DNS sobre proxy HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Proveedor"
+
+#~ msgid "Subnet address"
+#~ msgstr "Direccion de subred"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Proveedor Desconocido"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "Proxy DNS HTTPS"
 
diff --git a/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
index 3f04542168..bc26fbdaf9 100644
--- a/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/fr/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
index 55504b455b..3b445c8464 100644
--- a/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/he/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
index cd3f3b6944..49b6f01a24 100644
--- a/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/hi/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
index 489d94e559..160d6da812 100644
--- a/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/hu/https-dns-proxy.po
@@ -10,177 +10,165 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP és DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Letiltás"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Betöltés"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Újratöltés"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Indítás"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Leállítás"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
index d2786e8ecd..bf84a19e4b 100644
--- a/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/it/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
index 58845a7700..a3aa6bc9a0 100644
--- a/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ja/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
index c5b4e75e3e..5a42245b70 100644
--- a/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ko/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
index 5329c1020f..cfec04e556 100644
--- a/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/mr/https-dns-proxy.po
@@ -10,177 +10,165 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "लोड करीत आहे"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
index 57b41a7e41..26b756b07b 100644
--- a/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ms/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
index 5566a8bdfc..63734bc2e2 100644
--- a/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/nb_NO/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
index 1b2edc9898..9c4d8635fd 100644
--- a/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pl/https-dns-proxy.po
@@ -11,156 +11,148 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr "AdGuard (Ochrona rodziny)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr "AdGuard (Standardowy)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr "CleanBrowsing (Filtr treści dla dorosłych)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr "CleanBrowsing (Filtr rodzinny)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr "CleanBrowsing (Filtr bezpieczeństwa)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP i DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "Proxy DNS over HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Ustawiania proxy DNS over HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr "DNS.SB"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr "Digitale Gesellschaft"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr "DoH"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Włącz"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "Więcej informacji na temat wyboru różnych opcji"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr "Google"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "Instancje"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Nasłuchiwany adres"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Nasłuchiwany port"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Ładowanie"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr "ODVR (nic.cz)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Dostawca"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "Serwer Proxy"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr "Quad 9 (Zalecane)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr "Quad 9 (Zabezpieczony z obsługą ECS)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr "Quad 9 (Zabezpieczony)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr "Quad 9 (Niezabezpieczony)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Przeładuj"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr "Uruchomione"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr "Status usługi"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Uruchom"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Stop"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Adres podsieci"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Nieznany dostawca"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
@@ -168,26 +160,37 @@ msgstr ""
 "Po dodaniu/usunięciu dowolnej instancji poniżej, zastąpią one ustawienia "
 "sekcji 'Przekierowania DNS' w"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "i"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr "na"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr "nie jest zainstalowany lub nie został znaleziony"
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "Proxy DNS over HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Ustawiania proxy DNS over HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Dostawca"
+
+#~ msgid "Subnet address"
+#~ msgstr "Adres podsieci"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Nieznany dostawca"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "HTTPS DNS Proxy"
 
diff --git a/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
index 46843434d1..11fb4ed16f 100644
--- a/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pt/https-dns-proxy.po
@@ -10,156 +10,148 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr "AdGuard (Proteção da Família)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr "AdGuard (Padrão)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr "CleanBrowsing (Filtro Adulto)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr "CleanBrowsing (Filtro para a Familia)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr "CleanBrowsing (Filtro de Segurança)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "Proxy de DNS sobre HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Configurações de Proxy DNS sobre HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr "DNS.SB"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr "Digitale Gesellschaft"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Desativar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr "DoH"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Ativar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "Para obter mais informações sobre opções diferentes, verifique"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr "Google"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "Instâncias"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Endereço de escuta"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Porta de escuta"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "A carregar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr "ODVR (nic.cz)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Provedor"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr "Quad 9 (Recomendado)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr "Quad 9 (Protegido com Suporte de ECS)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr "Quad 9 (Seguro)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr "Quad 9 (Sem Segurança)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Recarregar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr "Executando"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr "Estado do Serviço"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Iniciar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Parar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "Parado"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Endereço de sub-rede"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Provedor Desconhecido"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
@@ -167,26 +159,37 @@ msgstr ""
 "Quando adicionar/remover quaisquer instâncias abaixo, serão usadas para "
 "substituir a seção 'DNS forwardings' de"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "e"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr "em"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr "não está instalado ou não foi encontrado"
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "Proxy de DNS sobre HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Configurações de Proxy DNS sobre HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Provedor"
+
+#~ msgid "Subnet address"
+#~ msgstr "Endereço de sub-rede"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Provedor Desconhecido"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "Proxy de DNS HTTPS"
 
diff --git a/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
index e4ca92f55a..a49b0f5cff 100644
--- a/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/pt_BR/https-dns-proxy.po
@@ -10,156 +10,148 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr "AdGuard (Proteção Familiar)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr "AdGuard (Padrão)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr "CleanBrowsing (Filtro Adulto)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr "CleanBrowsing (Filtro Familiar)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr "CleanBrowsing (Filtro de Segurança)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS sobre Proxy HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "Configurações de DNS sobre Proxy HTTPS"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr "DNS.SB"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr "Digitale Gesellschaft"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Desativar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr "DoH"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Ativar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "Para obter mais informações sobre diferentes opções, verifique"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr "Google"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "Instâncias"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Escutar endereço"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Porta de escuta"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Carregando"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr "ODVR (nic.cz)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "Provedor"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr "Quad 9 (Preferível)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr "Quad 9 (Protegido com Suporte a ECS)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr "Quad 9 (Seguro)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr "Quad 9 (Sem Segurança)"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Recarregar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr "Em execução"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr "Condição do Serviço"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Iniciar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Parar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "Parado"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "Endereço de sub-rede"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "Provedor Desconhecido"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
@@ -167,22 +159,33 @@ msgstr ""
 "Quando você adiciona/remove quaisquer instâncias abaixo, elas serão usadas "
 "para substituir a seção 'Encaminhamentos DNS' de"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "e"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr "em"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr "não está instalado ou não foi encontrado"
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS sobre Proxy HTTPS"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "Configurações de DNS sobre Proxy HTTPS"
+
+#~ msgid "Provider"
+#~ msgstr "Provedor"
+
+#~ msgid "Subnet address"
+#~ msgstr "Endereço de sub-rede"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "Provedor Desconhecido"
diff --git a/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
index 6fb53c4595..e567be48aa 100644
--- a/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ro/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
index 7374688086..1b9e752b79 100644
--- a/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/ru/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
index 5798c1c878..1288d3f4ed 100644
--- a/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/sk/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
index 002ae435ed..88edf2604f 100644
--- a/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/sv/https-dns-proxy.po
@@ -10,177 +10,165 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP och DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Aktivera"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "Lyssningsadress"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "Lyssningsport"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Laddar"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "Ladda om"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Starta"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
index 6028db5141..3e1ddb2a32 100644
--- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
+++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
@@ -1,165 +1,165 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
 msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
 msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
 msgid "EDNS client subnet"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
 msgid "Resolver"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
 msgid "Unknown Provider"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
 
-#: luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
 msgid "rubyfish.cn"
 msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
index c61c6f936b..aa8333eab7 100644
--- a/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/tr/https-dns-proxy.po
@@ -10,177 +10,165 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Durdur"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
index 4e4862c181..412c97afc4 100644
--- a/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/uk/https-dns-proxy.po
@@ -11,177 +11,165 @@ msgstr ""
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP та DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "Завантаження"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "Запустити"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "Зупинити"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
index 244c5f7ed3..918e17c851 100644
--- a/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/vi/https-dns-proxy.po
@@ -4,177 +4,165 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr ""
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
diff --git a/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
index 19da1e0356..6d527d6b0d 100644
--- a/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/zh-cn/https-dns-proxy.po
@@ -16,181 +16,184 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr "AdGuard（家庭保护）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr "AdGuard（标准）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr "CleanBrowsing（成人过滤器）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr "CleanBrowsing（家庭过滤器）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr "CleanBrowsing（安全筛选器）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr "DHCP/DNS"
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
-msgstr "DNS over HTTPS 代理"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
-msgstr "DNS over HTTPS代理设置"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr "DNS.SB"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr "Digitale Gesellschaft"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr "禁用"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr "DoH"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr "启用"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr "有关不同选项的更多信息，请检查"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr "谷歌"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "实例"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "监听地址"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "监听端口"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr "加载中"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr "ODVR （nic.cz）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "提供商"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "代理服务器"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr "Quad 9（推荐）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr "Quad 9（获得ECS支持）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr "Quad 9（安全）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr "Quad 9（不安全）"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr "重新载入"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr "运行中"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr "服务状态"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr "启动"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr "停止"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr "已停止"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "子网地址"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
-msgstr "未知提供商"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
+msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr "当您添加/删除下面的任何实例时，它们将用于覆盖以下实例的“ DNS转发”部分"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr "和"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr "在"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr "未安装或未找到"
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "DNS over HTTPS Proxy"
+#~ msgstr "DNS over HTTPS 代理"
+
+#~ msgid "DNS over HTTPS Proxy Settings"
+#~ msgstr "DNS over HTTPS代理设置"
+
+#~ msgid "Provider"
+#~ msgstr "提供商"
+
+#~ msgid "Subnet address"
+#~ msgstr "子网地址"
+
+#~ msgid "Uknown Provider"
+#~ msgstr "未知提供商"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "HTTPS DNS 代理"
 
diff --git a/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po b/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
index c4d40fca4b..7484b8fe32 100644
--- a/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
+++ b/applications/luci-app-https-dns-proxy/po/zh-tw/https-dns-proxy.po
@@ -15,181 +15,175 @@ msgstr ""
 "X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns-family.lua:3
 msgid "AdGuard (Family Protection)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.adguard.dns.lua:3
 msgid "AdGuard (Standard)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-adult.lua:3
 msgid "CleanBrowsing (Adult Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-family.lua:3
 msgid "CleanBrowsing (Family Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/org.cleanbrowsing.doh-security.lua:3
 msgid "CleanBrowsing (Security Filter)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.cloudflare-dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.cloudflare-dns.lua:3
 msgid "Cloudflare"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:85
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:85
 msgid "DHCP and DNS"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:4
-msgid "DNS over HTTPS Proxy"
+#: applications/luci-app-https-dns-proxy/luasrc/controller/https-dns-proxy.lua:4
+msgid "DNS Over HTTPS Proxy"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:64
-msgid "DNS over HTTPS Proxy Settings"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:64
+msgid "DNS Over HTTPS Proxy Settings"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/sb.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/sb.dns.lua:3
 msgid "DNS.SB"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/ch.digitale-gesellschaft.dns.lua:3
 msgid "Digitale Gesellschaft"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:53
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:53
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "DoH"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:51
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:143
+msgid "EDNS client subnet"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:51
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:2
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:2
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:87
 msgid "For more information on different options check"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers/com.google.dns.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/google.dns.lua:3
 msgid "Google"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid "Instances"
 msgstr "例項"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:118
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126
 msgid "Listen address"
 msgstr "監聽位址"
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:131
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:139
 msgid "Listen port"
 msgstr "監聽埠"
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/js.htm:52
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/js.htm:52
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/cz.nic.odvr.lua:3
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/cz.nic.odvr.lua:3
 msgid "ODVR (nic.cz)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:91
-msgid "Provider"
-msgstr "提供商"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:139
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:146
 msgid "Proxy server"
 msgstr "代理伺服器"
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns.lua:3
 msgid "Quad 9 (Recommended)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns11.lua:3
 msgid "Quad 9 (Secured with ECS Support)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns9.lua:3
 msgid "Quad 9 (Secured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:11
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.quad9.dns10.lua:3
 msgid "Quad 9 (Unsecured)"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:43
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:43
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:99
+msgid "Resolver"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "Running"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:66
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:68
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:66
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:68
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:41
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:41
 msgid "Start"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/view/https_dns_proxy/buttons.htm:45
+#: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:45
 msgid "Stop"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:37
 msgid "Stopped"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:135
-msgid "Subnet address"
-msgstr "子網位址"
-
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:22
-msgid "Uknown Provider"
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:22
+msgid "Unknown Provider"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:83
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:83
 msgid ""
 "When you add/remove any instances below, they will be used to override the "
 "'DNS forwardings' section of"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/com.adguard.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns10.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns11.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns9.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/net.quad9.dns.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-adult.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-family.lua:6
-#: applications/luci-app-https_dns_proxy/luasrc/https_dns_proxy/providers.disabled/org.cleanbrowsing.doh-security.lua:6
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
 msgid "and"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:56
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:56
 msgid "at"
 msgstr ""
 
-#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:32
 msgid "is not installed or not found"
 msgstr ""
 
+#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers.disabled/cn.rubyfish.dns.lua:3
+msgid "rubyfish.cn"
+msgstr ""
+
+#~ msgid "Provider"
+#~ msgstr "提供商"
+
+#~ msgid "Subnet address"
+#~ msgstr "子網位址"
+
 #~ msgid "HTTPS DNS Proxy"
 #~ msgstr "HTTPS DNS 代理"