i18n: sync translations

Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
author: Hannu Nyman <hannu.nyman@iki.fi> 2019-12-20 08:45:52 +0200
committer: Hannu Nyman <hannu.nyman@iki.fi> 2019-12-20 08:45:52 +0200
commit: 2096d67522e6622920d8d6aa1e0009769b392ef2 (patch)
tree: 3392ade5e48d0158893b758352783519bde34de7
parent: a3b29fac6f06c5bb9df38cb8371c3b771f9fb78a (diff)
92 files changed, 2236 insertions, 2711 deletions
diff --git a/applications/luci-app-aria2/po/bg/aria2.po b/applications/luci-app-aria2/po/bg/aria2.po
index a9811a1cfa..be9d435476 100644
--- a/applications/luci-app-aria2/po/bg/aria2.po
+++ b/applications/luci-app-aria2/po/bg/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/ca/aria2.po b/applications/luci-app-aria2/po/ca/aria2.po
index daad7ef91b..c0e2963726 100644
--- a/applications/luci-app-aria2/po/ca/aria2.po
+++ b/applications/luci-app-aria2/po/ca/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/cs/aria2.po b/applications/luci-app-aria2/po/cs/aria2.po
index ebc1fc97a9..b60c8d7a93 100644
--- a/applications/luci-app-aria2/po/cs/aria2.po
+++ b/applications/luci-app-aria2/po/cs/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Spustit démona pod uživatelskými oprávněními"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/de/aria2.po b/applications/luci-app-aria2/po/de/aria2.po
index 6f3a58986a..9f2154eabf 100644
--- a/applications/luci-app-aria2/po/de/aria2.po
+++ b/applications/luci-app-aria2/po/de/aria2.po
@@ -75,8 +75,8 @@ msgstr "Zertifikat überprüfen"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Schließe die Verbindung wenn die Download-Geschwinidigkeit niedriger oder "
 "gleich dieses Wertes (Bytes pro Sekunde) ist. 0 heißt es gibt keine "
@@ -517,10 +517,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Daemon als Benutzer ausführen"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Speichere Metadaten"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -547,6 +543,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Speichere Metadaten"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -710,7 +710,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/el/aria2.po b/applications/luci-app-aria2/po/el/aria2.po
index 8cb007a178..0e6b984c9c 100644
--- a/applications/luci-app-aria2/po/el/aria2.po
+++ b/applications/luci-app-aria2/po/el/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/en/aria2.po b/applications/luci-app-aria2/po/en/aria2.po
index 09228a0863..0d5050cc02 100644
--- a/applications/luci-app-aria2/po/en/aria2.po
+++ b/applications/luci-app-aria2/po/en/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/es/aria2.po b/applications/luci-app-aria2/po/es/aria2.po
index fadfc7d4a8..b4e495beba 100644
--- a/applications/luci-app-aria2/po/es/aria2.po
+++ b/applications/luci-app-aria2/po/es/aria2.po
@@ -77,8 +77,8 @@ msgstr "Comprobar certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Cierre la conexión si la velocidad de descarga es menor o igual a este valor "
 "(bytes por segundo). 0 significa que no tiene límite de velocidad mínima."
@@ -513,10 +513,6 @@ msgstr "Espera de reintento"
 msgid "Run daemon as user"
 msgstr "Ejecutar demonio como usuario"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Guardar metadatos"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -554,6 +550,10 @@ msgstr ""
 "efecto cuando se utiliza la URI de BitTorrent Magnet. El nombre del archivo "
 "es hash de información codificado hexadecimal con sufijo \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Guardar metadatos"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Guardar intervalo de sesión"
@@ -582,8 +582,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Enviar <code>Aceptar: deflate, gzip</code> encabezado de solicitud e inflar "
-"respuesta si el servidor remoto responde con <code>Content-Encoding: "
-"gzip</code> o <code>Content-Encoding: deflate</code>."
+"respuesta si el servidor remoto responde con <code>Content-Encoding: gzip</"
+"code> o <code>Content-Encoding: deflate</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -711,8 +711,8 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Especifique el tiempo de sembrado en minutos. Si se especifica la opción \""
-"Proporción de sembrado\" junto con esta opción, la siembra finaliza cuando "
+"Especifique el tiempo de sembrado en minutos. Si se especifica la opción "
+"\"Proporción de sembrado\" junto con esta opción, la siembra finaliza cuando "
 "se cumple al menos una de las condiciones. Especificar 0 desactiva el "
 "sembrado después de completar la descarga."
 
@@ -771,7 +771,9 @@ msgstr ""
 "y el archivo DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 "El directorio para almacenar el archivo descargado. p.ej. <code>/mnt/sda1</"
 "code>"
diff --git a/applications/luci-app-aria2/po/fr/aria2.po b/applications/luci-app-aria2/po/fr/aria2.po
index 617ef07c27..c4bfef077e 100644
--- a/applications/luci-app-aria2/po/fr/aria2.po
+++ b/applications/luci-app-aria2/po/fr/aria2.po
@@ -75,8 +75,8 @@ msgstr "Vérifier le certificat"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Ferme la connexion si la vitesse de téléchargement est inférieure ou égale à "
 "cette valeur (en bits par seconde). 0 signifie qu'il n'y a pas de limite de "
@@ -312,8 +312,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Liste des paramètres supplémentaires. Format : option=valeur, par ex. <code"
-">netrc-path=/tmp/.netrc</code>."
+"Liste des paramètres supplémentaires. Format : option=valeur, par ex. "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -508,10 +508,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Enregistrer les métadonnées"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -540,6 +536,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Enregistrer les métadonnées"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Intervalle d'enregistrement de la session"
@@ -724,7 +724,9 @@ msgstr ""
 "session et le fichier DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 "Répertoire dans lequel télécharger le fichier télécharger. Par ex. <code>/"
 "mnt/sda1</code>"
diff --git a/applications/luci-app-aria2/po/he/aria2.po b/applications/luci-app-aria2/po/he/aria2.po
index ec2f43b338..0bc0627723 100644
--- a/applications/luci-app-aria2/po/he/aria2.po
+++ b/applications/luci-app-aria2/po/he/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/hi/aria2.po b/applications/luci-app-aria2/po/hi/aria2.po
index f83cd973d0..26c10afa4d 100644
--- a/applications/luci-app-aria2/po/hi/aria2.po
+++ b/applications/luci-app-aria2/po/hi/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/hu/aria2.po b/applications/luci-app-aria2/po/hu/aria2.po
index dce2ba53e9..cdd23dc535 100644
--- a/applications/luci-app-aria2/po/hu/aria2.po
+++ b/applications/luci-app-aria2/po/hu/aria2.po
@@ -75,8 +75,8 @@ msgstr "Tanúsítvány ellenőrzése"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Kapcsolat lezárása, ha a letöltési sebesség kisebb vagy egyenlő ezzel az "
 "értékkel (bájt/másodperc). A 0 azt jelenti, hogy nincs legalacsonyabb "
@@ -519,10 +519,6 @@ msgstr "Újrapróbálás várakozása"
 msgid "Run daemon as user"
 msgstr "Démon futtatása felhasználóként"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Metaadatok mentése"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -561,6 +557,10 @@ msgstr ""
 "hatása, ha BitTorrent mágnes URI-t használnak. A fájlnév hexadecimálisan "
 "kódolt információs kivonat „.torrent” utótaggal."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Metaadatok mentése"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Munkamenet mentési időköze"
@@ -602,8 +602,8 @@ msgid ""
 msgstr ""
 "A <code>Cache-Control: no-cache</code> és <code>Pragma: no-cache</code> "
 "fejléc küldése a gyorsítótárazott tartalom elkerüléséhez. Ha le van tiltva, "
-"akkor ezek a fejlécek nem lesznek elküldve, és hozzáadhatja a „Cache-Control”"
-" fejlécet azzal az irányelvvel, amelyet használni szeretne „Header” "
+"akkor ezek a fejlécek nem lesznek elküldve, és hozzáadhatja a „Cache-"
+"Control” fejlécet azzal az irányelvvel, amelyet használni szeretne „Header” "
 "beállításként."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
@@ -780,8 +780,11 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr "A könyvtár a beállítófájl, a munkamenetfájl és a DHT-fájl tárolásához."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
-msgstr "A könyvtár a letöltött fájl tárolásához. Például <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
+msgstr ""
+"A könyvtár a letöltött fájl tárolásához. Például <code>/mnt/sda1</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
 msgid "The file name of the log file."
@@ -853,8 +856,8 @@ msgid ""
 "PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
 "you have to specify the \"Private key\" as well."
 msgstr ""
-"A FÁJLBAN lévő ügyféltanúsítvány használata. A tanúsítványnak vagy PKCS12 ("
-".p12, .pfx), vagy PEM formátumban kell lennie.<br/>A PKCS12 fájloknak "
+"A FÁJLBAN lévő ügyféltanúsítvány használata. A tanúsítványnak vagy PKCS12 (."
+"p12, .pfx), vagy PEM formátumban kell lennie.<br/>A PKCS12 fájloknak "
 "tartalmazniuk kell a tanúsítványt, egy kulcsot és esetlegesen a további "
 "tanúsítványok láncát. Csak az üres importálási jelszóval rendelkező PKCS12 "
 "fájlok nyithatók meg!<br/>PEM használatakor meg kell adnia a „Személyes "
diff --git a/applications/luci-app-aria2/po/it/aria2.po b/applications/luci-app-aria2/po/it/aria2.po
index 47507ca3c7..40506be48f 100644
--- a/applications/luci-app-aria2/po/it/aria2.po
+++ b/applications/luci-app-aria2/po/it/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/ja/aria2.po b/applications/luci-app-aria2/po/ja/aria2.po
index 3775d0062a..676262b3bc 100644
--- a/applications/luci-app-aria2/po/ja/aria2.po
+++ b/applications/luci-app-aria2/po/ja/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/ko/aria2.po b/applications/luci-app-aria2/po/ko/aria2.po
index c651b2fecb..600a68021c 100644
--- a/applications/luci-app-aria2/po/ko/aria2.po
+++ b/applications/luci-app-aria2/po/ko/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/mr/aria2.po b/applications/luci-app-aria2/po/mr/aria2.po
index 0193ef8013..dcc0eb5059 100644
--- a/applications/luci-app-aria2/po/mr/aria2.po
+++ b/applications/luci-app-aria2/po/mr/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,13 +491,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -621,7 +621,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/ms/aria2.po b/applications/luci-app-aria2/po/ms/aria2.po
index e3f5bdc7d3..7ed96c0abe 100644
--- a/applications/luci-app-aria2/po/ms/aria2.po
+++ b/applications/luci-app-aria2/po/ms/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/nb_NO/aria2.po b/applications/luci-app-aria2/po/nb_NO/aria2.po
index 3cc7178689..84082ba089 100644
--- a/applications/luci-app-aria2/po/nb_NO/aria2.po
+++ b/applications/luci-app-aria2/po/nb_NO/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/pl/aria2.po b/applications/luci-app-aria2/po/pl/aria2.po
index 03a6e3fb1a..a083d4a2e9 100644
--- a/applications/luci-app-aria2/po/pl/aria2.po
+++ b/applications/luci-app-aria2/po/pl/aria2.po
@@ -76,8 +76,8 @@ msgstr "Sprawdź certyfikat"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Zamknij połączenie, jeśli prędkość pobierania jest mniejsza lub równa tej "
 "wartości (bajty na sekundę). 0 oznacza, że nie ma dolnej granicy prędkości."
@@ -130,8 +130,8 @@ msgstr "Cache dysku"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
 msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
 msgstr ""
-"Nie należy rozdzielać zakresu bajtów poniżej 2*SIZE. Możliwe wartości: 1M-"
-"1024M."
+"Nie należy rozdzielać zakresu bajtów poniżej 2*SIZE. Możliwe wartości: "
+"1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
@@ -313,8 +313,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Lista dodatkowych ustawień. Format: option=value, np. <code>netrc-path=/tmp/"
-".netrc</code>."
+"Lista dodatkowych ustawień. Format: option=value, np. <code>netrc-path=/tmp/."
+"netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -510,10 +510,6 @@ msgstr "Ponów oczekiwanie"
 msgid "Run daemon as user"
 msgstr "Uruchom daemona jako użytkownik"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Zapisz metadane"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -551,6 +547,10 @@ msgstr ""
 "używany jest BitTorrent Magnet URI. Nazwa pliku jest zakodowana w postaci "
 "pliku hash z przyrostkiem \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Zapisz metadane"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Zapisz interwał sesji"
@@ -578,8 +578,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Wyślij <code>Accept: deflate, gzip</code> żądaj nagłówka i wywołaj "
-"odpowiedź, jeśli zdalny serwer zareaguje z <code>Content-Encoding: "
-"gzip</code> lub <code>Content-Encoding: deflate</code>."
+"odpowiedź, jeśli zdalny serwer zareaguje z <code>Content-Encoding: gzip</"
+"code> lub <code>Content-Encoding: deflate</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -588,8 +588,8 @@ msgid ""
 "you can add Cache-Control header with a directive you like using \"Header\" "
 "option."
 msgstr ""
-"Wyślij <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code>"
-" nagłówka w celu uniknięcia buforowania zawartości. Jeśli wyłączono, "
+"Wyślij <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</"
+"code> nagłówka w celu uniknięcia buforowania zawartości. Jeśli wyłączono, "
 "nagłówki nie są wysyłane i można dodać Cache-Control nagłówka z dyrektywą, "
 "którą lubisz używać w opcji \"Header\"."
 
@@ -599,9 +599,9 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
-"Ustaw numer portu TCP dla pobierań BitTorrent. Akceptowalny format: \"6881,"
-"6885\", \"6881-6999\" i \"6881-6889,6999\". Upewnij się, że określone porty "
-"są otwarte dla przychodzącego ruchu TCP."
+"Ustaw numer portu TCP dla pobierań BitTorrent. Akceptowalny format: "
+"\"6881,6885\", \"6881-6999\" i \"6881-6889,6999\". Upewnij się, że określone "
+"porty są otwarte dla przychodzącego ruchu TCP."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
@@ -696,8 +696,8 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Określ czas seedowania w minutach. Jeśli wraz z tą opcją podana jest opcja \""
-"Współczynnik seedów\", seedowanie zakończy się, gdy spełniony jest "
+"Określ czas seedowania w minutach. Jeśli wraz z tą opcją podana jest opcja "
+"\"Współczynnik seedów\", seedowanie zakończy się, gdy spełniony jest "
 "przynajmniej jeden z warunków. Ustawienie 0 wyłącza seedowanie po "
 "zakończeniu pobierania."
 
@@ -750,7 +750,9 @@ msgstr ""
 "Katalog do przechowywania pliku konfiguracyjnego, pliku sesji i pliku DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr "Katalog do zapisu pobranych plików. np. <code>/mnt/sda1</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/pt-br/aria2.po b/applications/luci-app-aria2/po/pt-br/aria2.po
index 137f79b9df..f8721a530e 100644
--- a/applications/luci-app-aria2/po/pt-br/aria2.po
+++ b/applications/luci-app-aria2/po/pt-br/aria2.po
@@ -80,8 +80,8 @@ msgstr "Verificar o certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Feche a conexão caso a velocidade de download seja menor ou igual a este "
 "valor (em bytes por segundo). 0 significa que não há limite mínimo de "
@@ -135,8 +135,8 @@ msgstr "Cache em Disco"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
 msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
 msgstr ""
-"Não divida a gama de byte para menos de 2*TAMANHO. Valores possíveis: 1M-"
-"1024M."
+"Não divida a gama de byte para menos de 2*TAMANHO. Valores possíveis: "
+"1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
@@ -323,8 +323,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Lista de configurações extras. Formato: option=value, por exemplo <code"
-">netrc-path=/tmp/.netrc</code>."
+"Lista de configurações extras. Formato: option=value, por exemplo "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -522,10 +522,6 @@ msgstr "Repetir espera"
 msgid "Run daemon as user"
 msgstr "Executar serviço como usuário"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Salvar os metadados"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -563,6 +559,10 @@ msgstr ""
 "apenas quando BitTorrent Magnet URI é usado. O nome do arquivo é hexadecimal "
 "codificado com a informação do hash com o sufixo \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Salvar os metadados"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Salvar o intervalo da sessão"
@@ -591,8 +591,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Enviar <code>Accept: deflate, gzip</code> requisitar o cabeçalho e inflar a "
-"resposta caso o servidor remoto responda com <code>Content-Encoding: "
-"gzip</code> ou <code>Content-Encoding: deflate</code>."
+"resposta caso o servidor remoto responda com <code>Content-Encoding: gzip</"
+"code> ou <code>Content-Encoding: deflate</code>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -612,8 +612,8 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
-"Defina o número da porta TCP para downloads BitTorrent. Formato aceitos: \""
-"6881,6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
+"Defina o número da porta TCP para downloads BitTorrent. Formato aceitos: "
+"\"6881,6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
 "portas definidas estão abertas para o tráfego de entrada TCP."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
@@ -697,13 +697,13 @@ msgid ""
 "entirely until allocation finishes."
 msgstr ""
 "Especifique o método de alocação de arquivo. Se você está usando sistemas de "
-"arquivos mais novos, como ext4 (com suporte a extents), btrfs, xfs ou NTFS ("
-"somente versões compiladas com MinGW), \"falloc\" é sua melhor escolha. Ele "
+"arquivos mais novos, como ext4 (com suporte a extents), btrfs, xfs ou NTFS "
+"(somente versões compiladas com MinGW), \"falloc\" é sua melhor escolha. Ele "
 "aloca arquivos grandes (com alguns GiB) quase que instantaneamente, mas pode "
-"não estar disponível caso o seu sistema não tenha a função posix_fallocate(3)"
-". Não use \"falloc\" com sistemas de arquivos antigos como ext3 e FAT32 "
-"porque leva quase o mesmo tempo que \"prealloc\" e bloqueia aria2 "
-"completamente até que a alocação termine."
+"não estar disponível caso o seu sistema não tenha a função "
+"posix_fallocate(3). Não use \"falloc\" com sistemas de arquivos antigos como "
+"ext3 e FAT32 porque leva quase o mesmo tempo que \"prealloc\" e bloqueia "
+"aria2 completamente até que a alocação termine."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
 msgid ""
@@ -719,9 +719,9 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Especifique o tempo de semeadura em minutos. Se a opção \"Relação de "
-"sementes\" for especificada em conjunto com esta, a semeadura termina quando "
-"pelo menos uma das condições for satisfeita. Ao definir como 0 desativa a "
+"Especifique o tempo de semeadura em minutos. Se a opção \"Relação de sementes"
+"\" for especificada em conjunto com esta, a semeadura termina quando pelo "
+"menos uma das condições for satisfeita. Ao definir como 0 desativa a "
 "semeadura após a conclusão do download."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
@@ -781,10 +781,12 @@ msgstr ""
 "arquivo DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
-"O diretório para armazenar o arquivo baixado, por exemplo, <code>/mnt/"
-"sda1</code>"
+"O diretório para armazenar o arquivo baixado, por exemplo, <code>/mnt/sda1</"
+"code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
 msgid "The file name of the log file."
diff --git a/applications/luci-app-aria2/po/pt/aria2.po b/applications/luci-app-aria2/po/pt/aria2.po
index 8be50d1882..0e3fdce4b3 100644
--- a/applications/luci-app-aria2/po/pt/aria2.po
+++ b/applications/luci-app-aria2/po/pt/aria2.po
@@ -75,8 +75,8 @@ msgstr "Verificar o certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "Fechar a ligação se a velocidade de transferência for inferior ou igual a "
 "este valor (bytes por segundo). 0 significa que não tem limite de velocidade "
@@ -130,8 +130,8 @@ msgstr "Cache em disco"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
 msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
 msgstr ""
-"Não dividir um intervale menos de 2*SIZE de bytes. Valores possíveis: 1M-"
-"1024M."
+"Não dividir um intervale menos de 2*SIZE de bytes. Valores possíveis: "
+"1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
@@ -189,7 +189,8 @@ msgstr "Erro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
 msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
-msgstr "Erro: Não consigo encontrar aria2c em PATH, por favor reinstale aria2c."
+msgstr ""
+"Erro: Não consigo encontrar aria2c em PATH, por favor reinstale aria2c."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
@@ -315,8 +316,8 @@ msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
-"Lista de configurações adicionais. Formato: opção=valor, por exemplo <code"
-">netrc-path=/tmp/.netrc</code>."
+"Lista de configurações adicionais. Formato: opção=valor, por exemplo "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
@@ -516,10 +517,6 @@ msgstr "Esperar até repetir"
 msgid "Run daemon as user"
 msgstr "Executar serviço como utilizador"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "Gravar metadados"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -557,6 +554,10 @@ msgstr ""
 "quando BitTorrent Magnet URI é usado. O nome do ficheiro é codificado "
 "hexadecimal info hash com o sufixo \".torrent\"."
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "Gravar metadados"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Gravar intervalo de sessão"
@@ -586,8 +587,8 @@ msgid ""
 "<code>Content-Encoding: deflate</code>."
 msgstr ""
 "Enviar cabeçalho de solicitação <code>Accept: deflate, gzip</code> e inflar "
-"a resposta se o servidor remoto responder com <code>Content-Encoding: "
-"gzip</code> ou <code>Content-Encoding: deflate</code>.."
+"a resposta se o servidor remoto responder com <code>Content-Encoding: gzip</"
+"code> ou <code>Content-Encoding: deflate</code>.."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -607,8 +608,8 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
-"Defina o número da porta TCP para desarregas BitTorrent. Aceitar formato: \""
-"6881.6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
+"Defina o número da porta TCP para desarregas BitTorrent. Aceitar formato: "
+"\"6881.6885\", \"6881-6999\" e \"6881-6889,6999\". Certifique-se de que as "
 "portas especificadas estão abertas para o tráfego TCP de entrada."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
@@ -714,10 +715,10 @@ msgid ""
 "with this option, seeding ends when at least one of the conditions is "
 "satisfied. Specifying 0 disables seeding after download completed."
 msgstr ""
-"Especifica o tempo de semeadura em minutos. Se a opção \"Relação de "
-"sementes\" for especificada com esta opção, semear termina quando pelo menos "
-"uma das condições for satisfeita. Especificar 0 desativa semear após a "
-"conclusão do descarregamento."
+"Especifica o tempo de semeadura em minutos. Se a opção \"Relação de sementes"
+"\" for especificada com esta opção, semear termina quando pelo menos uma das "
+"condições for satisfeita. Especificar 0 desativa semear após a conclusão do "
+"descarregamento."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
 msgid ""
@@ -774,7 +775,9 @@ msgstr ""
 "ficheiro DHT."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 "O diretório para armazenar o ficheiro descarregado, por exemplo, <code>/mnt/"
 "sda1</code>"
@@ -837,8 +840,8 @@ msgstr ""
 "em formato PKCS12 (.p12, .pfx) ou PEM.<br/>Os ficheiros PKCS12 devem conter "
 "o certificado, uma chave e opcionalmente uma cadeia de certificados "
 "adicionais. Somente ficheiros PKCS12 com uma palavra-passe de importação em "
-"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a \""
-"chave privada RPC\"."
+"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a "
+"\"chave privada RPC\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
 msgid ""
@@ -852,8 +855,8 @@ msgstr ""
 "formato PKCS12 (.p12, .pfx) ou PEM.<br/>Os ficheiros PKCS12 devem conter o "
 "certificado, uma chave e opcionalmente uma cadeia de certificados "
 "adicionais. Somente ficheiros PKCS12 com uma palavra-passe de importação em "
-"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a \""
-"Private key\"."
+"branco podem ser abertos!<br/>Ao usar o PEM, também tem que especificar a "
+"\"Private key\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
 msgid ""
@@ -883,8 +886,8 @@ msgstr "Nome de Utilizador e Palavra-passe"
 msgid ""
 "Verify the peer using certificates specified in \"CA certificate\" option."
 msgstr ""
-"Verificar o par usando certificados especificados na opção \"Certificado AC\""
-"."
+"Verificar o par usando certificados especificados na opção \"Certificado AC"
+"\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
diff --git a/applications/luci-app-aria2/po/ro/aria2.po b/applications/luci-app-aria2/po/ro/aria2.po
index 133f8cfdf3..57ffa868c2 100644
--- a/applications/luci-app-aria2/po/ro/aria2.po
+++ b/applications/luci-app-aria2/po/ro/aria2.po
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -492,10 +492,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -522,6 +518,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -685,7 +685,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/ru/aria2.po b/applications/luci-app-aria2/po/ru/aria2.po
index 8c6cdcf9e5..844e8a7048 100644
--- a/applications/luci-app-aria2/po/ru/aria2.po
+++ b/applications/luci-app-aria2/po/ru/aria2.po
@@ -79,8 +79,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -497,10 +497,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Запуск демона<br />от имени пользователя"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -527,6 +523,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -690,7 +690,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/sk/aria2.po b/applications/luci-app-aria2/po/sk/aria2.po
index d2370b05e4..adfe80ef52 100644
--- a/applications/luci-app-aria2/po/sk/aria2.po
+++ b/applications/luci-app-aria2/po/sk/aria2.po
@@ -67,8 +67,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -485,10 +485,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -515,6 +511,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -678,7 +678,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/sv/aria2.po b/applications/luci-app-aria2/po/sv/aria2.po
index fdfea93249..50cc81a20a 100644
--- a/applications/luci-app-aria2/po/sv/aria2.po
+++ b/applications/luci-app-aria2/po/sv/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "Kör daemon som användare"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/templates/aria2.pot b/applications/luci-app-aria2/po/templates/aria2.pot
index 43a68baac8..c02f7f1680 100644
--- a/applications/luci-app-aria2/po/templates/aria2.pot
+++ b/applications/luci-app-aria2/po/templates/aria2.pot
@@ -64,8 +64,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value(bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -482,13 +482,9 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Sava metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
-"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
 "is not saved during download."
 msgstr ""
 
@@ -512,6 +508,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -556,7 +556,7 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
 msgid ""
-"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"Set UDP listening port used by DHT (IPv4, IPv6) and UDP tracker. Make sure "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
 
@@ -612,7 +612,7 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
 "Specify file allocation method. If you are using newer file systems such as "
-"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"ext4 (with extents support), btrfs, xfs or NTFS (MinGW build only), \"falloc"
 "\" is your best choice. It allocates large(few GiB) files almost instantly, "
 "but it may not be available if your system doesn't have posix_fallocate(3) "
 "function. Don't use \"falloc\" with legacy file systems such as ext3 and "
@@ -675,7 +675,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/tr/aria2.po b/applications/luci-app-aria2/po/tr/aria2.po
index d017fe2c59..fe5efa47c7 100644
--- a/applications/luci-app-aria2/po/tr/aria2.po
+++ b/applications/luci-app-aria2/po/tr/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/uk/aria2.po b/applications/luci-app-aria2/po/uk/aria2.po
index 6bd478367a..f78e121186 100644
--- a/applications/luci-app-aria2/po/uk/aria2.po
+++ b/applications/luci-app-aria2/po/uk/aria2.po
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -494,10 +494,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -524,6 +520,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -687,7 +687,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/vi/aria2.po b/applications/luci-app-aria2/po/vi/aria2.po
index 9b81a17e1f..8ac93b4dd2 100644
--- a/applications/luci-app-aria2/po/vi/aria2.po
+++ b/applications/luci-app-aria2/po/vi/aria2.po
@@ -73,8 +73,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -491,10 +491,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -521,6 +517,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -684,7 +684,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po
index e10e63f544..a60b28abd6 100644
--- a/applications/luci-app-aria2/po/zh-cn/aria2.po
+++ b/applications/luci-app-aria2/po/zh-cn/aria2.po
@@ -73,8 +73,8 @@ msgstr "检查证书"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 "如果速度小于或等于这个速度（byte/s），关闭下载下载连接。0 表示不限制下载速"
 "度。"
@@ -500,10 +500,6 @@ msgstr "重试等待"
 msgid "Run daemon as user"
 msgstr "以此用户权限运行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr "保存元数据"
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -537,6 +533,10 @@ msgstr ""
 "将元数据保存到 \".torrent\" 文件。此选项仅在下载连接为 BT 磁力链接时生效。文"
 "件名为 Hash 值，后缀为 \".torrent\"。"
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr "保存元数据"
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr "Session 保存间隔"
@@ -725,7 +725,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr "用于放置配置文件，Session 文件和 DHT 文件的目录。"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr "用于放置下载文件的目录。例如：<code>/mnt/sda1</code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-aria2/po/zh-tw/aria2.po b/applications/luci-app-aria2/po/zh-tw/aria2.po
index ef4a230045..f0a74d7df5 100644
--- a/applications/luci-app-aria2/po/zh-tw/aria2.po
+++ b/applications/luci-app-aria2/po/zh-tw/aria2.po
@@ -74,8 +74,8 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
 msgid ""
-"Close connection if download speed is lower than or equal to this "
-"value (bytes per sec). 0 means has no lowest speed limit."
+"Close connection if download speed is lower than or equal to this value "
+"(bytes per sec). 0 means has no lowest speed limit."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
@@ -492,10 +492,6 @@ msgstr ""
 msgid "Run daemon as user"
 msgstr "以此使用者許可權執行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
-msgid "Save metadata"
-msgstr ""
-
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
 msgid ""
 "Save a control file (*.aria2) every N seconds. If 0 is given, a control file "
@@ -522,6 +518,10 @@ msgid ""
 "suffix \".torrent\"."
 msgstr ""
 
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Save metadata"
+msgstr ""
+
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
 msgstr ""
@@ -685,7 +685,9 @@ msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
-msgid "The directory to store the downloaded file. For example <code>/mnt/sda1</code>."
+msgid ""
+"The directory to store the downloaded file. For example <code>/mnt/sda1</"
+"code>."
 msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
diff --git a/applications/luci-app-bmx7/po/pt_BR/bmx7.po b/applications/luci-app-bmx7/po/pt_BR/bmx7.po
index 50de021bc0..7a817eda8d 100644
--- a/applications/luci-app-bmx7/po/pt_BR/bmx7.po
+++ b/applications/luci-app-bmx7/po/pt_BR/bmx7.po
@@ -27,8 +27,8 @@ msgid "BMX7 revision"
 msgstr "Revisão do BMX7"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
-msgstr "Largura de banda"
+msgid "Bandwidth"
+msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
 msgid "Bmx7 mesh nodes"
@@ -61,8 +61,8 @@ msgid "Link key"
 msgstr "Chave do link"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
-msgstr "LinkLocal Ipv6"
+msgid "Link-local IPv6"
+msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
 msgid "Links"
@@ -158,8 +158,8 @@ msgid "Rating"
 msgstr "Classificação"
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
-msgstr "linklocal IPv6 remoto"
+msgid "Remote link-local IPv6"
+msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82
 msgid "Routes"
@@ -225,3 +225,12 @@ msgstr "Tempo de atividade"
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/nodes_j.htm:79
 msgid "Via Neighbour"
 msgstr "Através de Vizinho"
+
+#~ msgid "Bandwith"
+#~ msgstr "Largura de banda"
+
+#~ msgid "LinkLocal Ipv6"
+#~ msgstr "LinkLocal Ipv6"
+
+#~ msgid "Remote linklocal IPv6"
+#~ msgstr "linklocal IPv6 remoto"
diff --git a/applications/luci-app-bmx7/po/templates/bmx7.pot b/applications/luci-app-bmx7/po/templates/bmx7.pot
index e8c72f6f3f..8f30028582 100644
--- a/applications/luci-app-bmx7/po/templates/bmx7.pot
+++ b/applications/luci-app-bmx7/po/templates/bmx7.pot
@@ -18,7 +18,7 @@ msgid "BMX7 revision"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:41
-msgid "Bandwith"
+msgid "Bandwidth"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:3
@@ -52,7 +52,7 @@ msgid "Link key"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:61
-msgid "LinkLocal Ipv6"
+msgid "Link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:71
@@ -149,7 +149,7 @@ msgid "Rating"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:78
-msgid "Remote linklocal IPv6"
+msgid "Remote link-local IPv6"
 msgstr ""
 
 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:82
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 代理"
 
diff --git a/modules/luci-base/po/bg/base.po b/modules/luci-base/po/bg/base.po
index 81417013ad..c6c81945e3 100644
--- a/modules/luci-base/po/bg/base.po
+++ b/modules/luci-base/po/bg/base.po
@@ -33,8 +33,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -190,7 +188,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -431,7 +428,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
@@ -791,7 +787,6 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -2783,15 +2778,18 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
+msgid "Leasetime remaining"
 msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
@@ -3238,7 +3236,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4194,7 +4191,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4450,7 +4446,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4492,7 +4487,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4510,7 +4504,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4555,7 +4548,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4817,7 +4809,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4945,7 +4936,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index b2f666fed9..1e9091b4b6 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -43,8 +43,6 @@ msgstr "(finestra de %d minuts, interval de %d segons)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -204,7 +202,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuració dels <abbr title=\"Light Emitting Diode\">LED</abbr>s"
 
@@ -455,7 +452,6 @@ msgstr "Adreça per accedir al relay bridge local"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administració"
 
@@ -819,7 +815,6 @@ msgid "Backup"
 msgstr "Còpia de seguretat"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Còpia de seguretat i microprogramari"
 
@@ -2849,16 +2844,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Temps d'arrendament restant"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Fitxer d'arrendament"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Temps d'arrendament restant"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3306,7 +3304,6 @@ msgstr "Punt de muntatge"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Punts de muntatge"
 
@@ -4266,7 +4263,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -4522,7 +4518,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Contrasenya de l'encaminador"
 
@@ -4566,7 +4561,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Accés SSH"
 
@@ -4584,7 +4578,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Claus SSH"
 
@@ -4629,7 +4622,6 @@ msgstr "Escaneja"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tasques programades"
 
@@ -4891,7 +4883,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Arrencada"
 
@@ -5019,7 +5010,6 @@ msgstr "Sincronitza amb el navegador"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index ee9fa1945f..be24cb81f7 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -40,8 +40,6 @@ msgstr "(%d minutové okno, %d sekundový interval)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -202,7 +200,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurace"
 
@@ -456,7 +453,6 @@ msgstr "Adresa pro přístup k místnímu relay bridge"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Správa"
 
@@ -832,7 +828,6 @@ msgid "Backup"
 msgstr "Zálohovat"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Zálohovat / nahrát firmware"
 
@@ -2901,16 +2896,19 @@ msgstr "Leaf"
 msgid "Lease time"
 msgstr "Doba zapůjčení"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Zbývající doba trvání zápůjčky"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Soubor zápůjček"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Zbývající doba trvání zápůjčky"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3384,7 +3382,6 @@ msgstr "Přípojný bod"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Přípojné body"
 
@@ -4372,7 +4369,6 @@ msgstr "Opětovné nastavení ochrany"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -4637,7 +4633,6 @@ msgstr "Služba oznamování směrovače (RA)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Heslo routeru"
 
@@ -4680,7 +4675,6 @@ msgstr "Odstup signálu od šumu"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Přístup přes SSH"
 
@@ -4698,7 +4692,6 @@ msgstr "SSH uživatelské jméno"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH klíče"
 
@@ -4743,7 +4736,6 @@ msgstr "Skenovat"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Naplánované úlohy"
 
@@ -5024,7 +5016,6 @@ msgstr "Zahájeno bezdrátové skenování..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Po spuštění"
 
@@ -5158,7 +5149,6 @@ msgstr "Synchronizovat s prohlížečem"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Systém"
 
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 5df8198e8b..ad32efbce7 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -43,8 +43,6 @@ msgstr "(%d Minuten Abschnitt, %d Sekunden Intervall)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -206,7 +204,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfiguration"
 
@@ -459,7 +456,6 @@ msgstr "Adresse der lokalen Relay-Brücke"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
@@ -840,7 +836,6 @@ msgid "Backup"
 msgstr "Sichern"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Firmware Update"
 
@@ -2925,16 +2920,19 @@ msgstr "Zweigstelle"
 msgid "Lease time"
 msgstr "Laufzeit"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Verbleibende Gültigkeit"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Leasedatei"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Verbleibende Gültigkeit"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3405,7 +3403,6 @@ msgstr "Einhängepunkt"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Einhängepunkte"
 
@@ -4398,7 +4395,6 @@ msgstr "DNS-Rebind-Schutz"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Neu Starten"
 
@@ -4663,7 +4659,6 @@ msgstr "Router-Advertisement-Dienst"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Routerpasswort"
 
@@ -4707,7 +4702,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH-Zugriff"
 
@@ -4725,7 +4719,6 @@ msgstr "SSH Benutzername"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-Schlüssel"
 
@@ -4770,7 +4763,6 @@ msgstr "Suche"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Geplante Aufgaben"
 
@@ -5055,7 +5047,6 @@ msgstr "Starte WLAN Scan..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Systemstart"
 
@@ -5190,7 +5181,6 @@ msgstr "Mit Browser synchronisieren"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 40633e3ba7..bc942860e7 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -42,8 +42,6 @@ msgstr "(παράθυρο %d λεπτών, διάστημα %d δευτερολ�
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -203,7 +201,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Παραμετροποίηση <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
@@ -454,7 +451,6 @@ msgstr "Διεύθυνση για πρόσβαση σε την τοπική γέ
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Διαχείριση"
 
@@ -821,7 +817,6 @@ msgid "Backup"
 msgstr "Αντίγραφο ασφαλείας"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Αντίγραφο ασφαλείας / Εγγραφή FLASH Υλικολογισμικό"
 
@@ -2869,16 +2864,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Υπόλοιπο χρόνου Lease"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Αρχείο Leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Υπόλοιπο χρόνου Lease"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3325,7 +3323,6 @@ msgstr "Σημείο Προσάρτησης"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Σημεία Προσάρτησης"
 
@@ -4286,7 +4283,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
@@ -4542,7 +4538,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Κωδικός Πρόσβασης Δρομολογητή"
 
@@ -4587,7 +4582,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Πρόσβαση SSH"
 
@@ -4605,7 +4599,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Κλειδιά SSH"
 
@@ -4650,7 +4643,6 @@ msgstr "Σάρωση"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Προγραμματισμένες Εργασίες"
 
@@ -4912,7 +4904,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Εκκίνηση"
 
@@ -5040,7 +5031,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Σύστημα"
 
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 1a9804dd9c..12abaab671 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -42,8 +42,6 @@ msgstr "(%d minute window, %d second interval)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -203,7 +201,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 
@@ -451,7 +448,6 @@ msgstr "Address to access local relay bridge"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
@@ -812,7 +808,6 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Flash Firmware"
 
@@ -2839,16 +2834,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Lease time remaining"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Leasefile"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Lease time remaining"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3294,7 +3292,6 @@ msgstr "Mount Point"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Mount Points"
 
@@ -4254,7 +4251,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -4510,7 +4506,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4554,7 +4549,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4572,7 +4566,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4617,7 +4610,6 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
@@ -4879,7 +4871,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -5007,7 +4998,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 02ce0e0322..cb5c6a75d4 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -43,8 +43,6 @@ msgstr "(ventana de %d minutos, intervalo de %d segundos)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -207,7 +205,6 @@ msgstr "Sufijo (hex)<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuración de <abbr title=\"Light Emitting Diode\">LEDs</abbr>"
 
@@ -461,7 +458,6 @@ msgstr "Dirección del puente relé local"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administración"
 
@@ -841,7 +837,6 @@ msgid "Backup"
 msgstr "Copia de seguridad"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Copia de seguridad / Grabar firmware"
 
@@ -2919,16 +2914,19 @@ msgstr "Hoja"
 msgid "Lease time"
 msgstr "Tiempo de expiración"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Tiempo de conexión restante"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Archivo de conexiones"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Tiempo de conexión restante"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3397,7 +3395,6 @@ msgstr "Punto de montaje"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Puntos de montaje"
 
@@ -4387,7 +4384,6 @@ msgstr "Protección contra reasociación"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -4650,7 +4646,6 @@ msgstr "Servicio de anuncio de enrutador"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Contraseña del router"
 
@@ -4694,7 +4689,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acceso SSH"
 
@@ -4712,7 +4706,6 @@ msgstr "Nombre de usuario SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Claves SSH"
 
@@ -4757,7 +4750,6 @@ msgstr "Escanear"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tareas programadas"
 
@@ -5041,7 +5033,6 @@ msgstr "Iniciando escaneo de WiFi..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Arranque"
 
@@ -5175,7 +5166,6 @@ msgstr "Sincronizar con el navegador"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 1f2a34f81c..899714de13 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -43,8 +43,6 @@ msgstr "(fenêtre de %d minutes, intervalle de %d secondes)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -206,7 +204,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 "Configuration des <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>s"
@@ -463,7 +460,6 @@ msgstr "Adresse pour accéder au pont-relais local"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
@@ -830,7 +826,6 @@ msgid "Backup"
 msgstr "Sauvegarder"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Sauvegarde / Mise à jour du micrologiciel"
 
@@ -2882,16 +2877,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Durée de validité"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Fichier de baux"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Durée de validité"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3348,7 +3346,6 @@ msgstr "Point de montage"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Point de montage"
 
@@ -4310,7 +4307,6 @@ msgstr "Protection contre l'attaque « rebind »"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Redémarrage"
 
@@ -4566,7 +4562,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Mot de passe du routeur"
 
@@ -4611,7 +4606,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Accès SSH"
 
@@ -4629,7 +4623,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Clés SSH"
 
@@ -4674,7 +4667,6 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tâches Régulières"
 
@@ -4944,7 +4936,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Démarrage"
 
@@ -5076,7 +5067,6 @@ msgstr "Synchro avec le navigateur"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Système"
 
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index e02f6b83f5..836106e8ca 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -40,8 +40,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -198,7 +196,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "הגדרות <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
@@ -447,7 +444,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 #, fuzzy
 msgid "Administration"
 msgstr "מנהלה"
@@ -813,7 +809,6 @@ msgid "Backup"
 msgstr "גיבוי"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "גיבוי / קושחת פלאש"
 
@@ -2815,15 +2810,18 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
+msgid "Leasetime remaining"
 msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
@@ -3270,7 +3268,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4226,7 +4223,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4482,7 +4478,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4524,7 +4519,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4542,7 +4536,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4587,7 +4580,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4851,7 +4843,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "אתחול"
 
@@ -4982,7 +4973,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
diff --git a/modules/luci-base/po/hi/base.po b/modules/luci-base/po/hi/base.po
index fc55b08a52..24427c3e2f 100644
--- a/modules/luci-base/po/hi/base.po
+++ b/modules/luci-base/po/hi/base.po
@@ -38,8 +38,6 @@ msgstr "(%d मिनट अवधि, %d पल मध्यांतर)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -195,7 +193,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -439,7 +436,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
@@ -799,7 +795,6 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -2791,15 +2786,18 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
+msgid "Leasetime remaining"
 msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
@@ -3246,7 +3244,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4202,7 +4199,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4458,7 +4454,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4500,7 +4495,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4518,7 +4512,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4563,7 +4556,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4825,7 +4817,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4953,7 +4944,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index d0a1c53c50..7b4e32bac1 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -41,8 +41,6 @@ msgstr "(%d perces ablak, %d másodperces időköz)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -202,7 +200,6 @@ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-utótag (hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> beállítása"
 
@@ -455,7 +452,6 @@ msgstr "Cím a helyi átjátszóhíd eléréséhez"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Adminisztráció"
 
@@ -830,7 +826,6 @@ msgid "Backup"
 msgstr "Biztonsági mentés"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Mentés / Firmware frissítés"
 
@@ -2907,16 +2902,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "A bérletből hátralévő idő"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Bérletfájl"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "A bérletből hátralévő idő"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3377,7 +3375,6 @@ msgstr "Csatolási pont"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Csatolási pontok"
 
@@ -4356,7 +4353,6 @@ msgstr "Újrakötési védelem"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Újraindítás"
 
@@ -4618,7 +4614,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Útválasztó jelszava"
 
@@ -4662,7 +4657,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH hozzáférés"
 
@@ -4680,7 +4674,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH kulcsok"
 
@@ -4725,7 +4718,6 @@ msgstr "Felderítés"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Ütemezett feladatok"
 
@@ -5004,7 +4996,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Rendszerindítás"
 
@@ -5138,7 +5129,6 @@ msgstr "Szinkronizálás a böngészővel"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Rendszer"
 
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 4160ca0ea9..e827ee6060 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -43,8 +43,6 @@ msgstr "(%d finestra in minuti , %d secondi intervallo)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -207,7 +205,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configurazione <abbr title=\"Diodo ad Emissione di Luce\">LED</abbr>"
 
@@ -462,7 +459,6 @@ msgstr "Indirizzo per accedere al ponte locale di trasmissione"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Amministrazione"
 
@@ -827,7 +823,6 @@ msgid "Backup"
 msgstr "Copia di Sicurezza"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Copia di Sicurezza / Flash Firmware"
 
@@ -2872,16 +2867,19 @@ msgstr ""
 msgid "Lease time"
 msgstr "Tempo Contratto"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Tempo contratto residuo"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "File di contratti"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Tempo contratto residuo"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3335,7 +3333,6 @@ msgstr "Punto di Mount"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Punti di Mount"
 
@@ -4297,7 +4294,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Riavvia"
 
@@ -4553,7 +4549,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4597,7 +4592,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4615,7 +4609,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4660,7 +4653,6 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Operazioni programmate"
 
@@ -4930,7 +4922,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Avvio"
 
@@ -5062,7 +5053,6 @@ msgstr "Sincronizza con il browser"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index b8c05b59aa..1813a646f2 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -43,8 +43,6 @@ msgstr "(%d 分幅, %d 秒間隔)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -205,7 +203,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
@@ -456,7 +453,6 @@ msgstr "ローカル リレーブリッジにアクセスするためのIPアド
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "管理画面"
 
@@ -829,7 +825,6 @@ msgid "Backup"
 msgstr "バックアップ"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "バックアップ / ファームウェア更新"
 
@@ -2895,16 +2890,19 @@ msgstr ""
 msgid "Lease time"
 msgstr "リース時間"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "残りリース時間"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "リースファイル"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "残りリース時間"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3364,7 +3362,6 @@ msgstr "マウントポイント"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "マウントポイント"
 
@@ -4346,7 +4343,6 @@ msgstr "DNSリバインディング・プロテクション"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "再起動"
 
@@ -4606,7 +4602,6 @@ msgstr "ルーター アドバタイズメント-サービス"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "ルーター パスワード"
 
@@ -4650,7 +4645,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH アクセス"
 
@@ -4668,7 +4662,6 @@ msgstr "SSH ユーザー名"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH キー"
 
@@ -4713,7 +4706,6 @@ msgstr "スキャン"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
@@ -4991,7 +4983,6 @@ msgstr "無線LANのスキャンを開始しています..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "スタートアップ"
 
@@ -5124,7 +5115,6 @@ msgstr "ブラウザの時刻と同期"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "システム"
 
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index 4e797a4722..b285cf33fb 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -42,8 +42,6 @@ msgstr "(%d 분 window, %d 초 간격)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -199,7 +197,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 설정"
 
@@ -446,7 +443,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "관리"
 
@@ -806,7 +802,6 @@ msgid "Backup"
 msgstr "백업"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Firmware 백업 / Flash"
 
@@ -2824,16 +2819,19 @@ msgstr ""
 msgid "Lease time"
 msgstr "임대 시간"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "남아있는 임대 시간"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "남아있는 임대 시간"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3281,7 +3279,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4241,7 +4238,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "재부팅"
 
@@ -4497,7 +4493,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "라우터 암호"
 
@@ -4541,7 +4536,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4559,7 +4553,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4604,7 +4597,6 @@ msgstr "Scan 하기"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "작업 관리"
 
@@ -4866,7 +4858,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "시작 프로그램"
 
@@ -4997,7 +4988,6 @@ msgstr "브라우저 시간대로 동기화"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "시스템"
 
diff --git a/modules/luci-base/po/mr/base.po b/modules/luci-base/po/mr/base.po
index 54a3b8caf5..ad2b4c9ccd 100644
--- a/modules/luci-base/po/mr/base.po
+++ b/modules/luci-base/po/mr/base.po
@@ -39,8 +39,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -196,7 +194,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -437,7 +434,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
@@ -797,7 +793,6 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -2789,15 +2784,18 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
+msgid "Leasetime remaining"
 msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
@@ -3244,7 +3242,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4200,7 +4197,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4456,7 +4452,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4498,7 +4493,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4516,7 +4510,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4561,7 +4554,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4823,7 +4815,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4951,7 +4942,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 9d1ddda4d9..27009a286a 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -42,8 +42,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -200,7 +198,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Konfigurasi lampu LED"
 
@@ -441,7 +438,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Pentadbiran"
 
@@ -801,7 +797,6 @@ msgid "Backup"
 msgstr "Sandaran"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -2811,16 +2806,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Sisa masa penyewaan"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Sewa fail"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Sisa masa penyewaan"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3266,7 +3264,6 @@ msgstr "Mount Point"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Mount Points"
 
@@ -4225,7 +4222,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -4481,7 +4477,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4525,7 +4520,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4543,7 +4537,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4588,7 +4581,6 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tugas Jadual"
 
@@ -4850,7 +4842,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4978,7 +4969,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistem"
 
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 8fa9ae472a..74801b3e43 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -39,8 +39,6 @@ msgstr "(%d minutters vindu, %d sekunds intervall)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -200,7 +198,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurasjon"
 
@@ -452,7 +449,6 @@ msgstr "Adresse for tilgang til lokal relébro"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administrasjon"
 
@@ -468,7 +464,7 @@ msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -812,7 +808,6 @@ msgid "Backup"
 msgstr "Sikkerhetskopi"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Sikkerhetskopiering/Firmware oppgradering"
 
@@ -1866,7 +1861,7 @@ msgid "Expand hosts"
 msgstr "Utvid vertsliste"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
@@ -2305,7 +2300,7 @@ msgstr "IP adresse"
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2848,11 +2843,14 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "<abbr title=\"Leasefile\">Leie-fil</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
@@ -3311,7 +3309,6 @@ msgstr "Monterings Punkt"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Monterings Punkter"
 
@@ -3531,7 +3528,7 @@ msgid "Noise:"
 msgstr "Støy:"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive CRC errors (CRC_P)"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
@@ -4080,7 +4077,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4275,7 +4272,6 @@ msgstr "Binde beskyttelse"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Omstart"
 
@@ -4531,7 +4527,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Ruter Passord"
 
@@ -4575,7 +4570,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH Tilgang"
 
@@ -4593,7 +4587,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-Nøkler"
 
@@ -4638,7 +4631,6 @@ msgstr "Skann"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Planlagte Oppgaver"
 
@@ -4906,7 +4898,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Oppstart"
 
@@ -5037,7 +5028,6 @@ msgstr "Synkroniser med nettleser"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index f427ff8ab9..3deda26d59 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -44,8 +44,6 @@ msgstr "(okno %d minut, interwał %d sekund)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -204,7 +202,6 @@ msgstr "Sufiks <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>(hex)"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Konfiguracja diod <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
@@ -462,7 +459,6 @@ msgstr "Adres dostępowy do \"relay bridge\""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Zarządzanie"
 
@@ -835,7 +831,6 @@ msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Kopia zapasowa / aktualizacja firmware"
 
@@ -2913,16 +2908,19 @@ msgstr "Karta"
 msgid "Lease time"
 msgstr "Czas dzierżawy"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Pozostały czas dzierżawy"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Plik dzierżawy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Pozostały czas dzierżawy"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3389,7 +3387,6 @@ msgstr "Punkt montowania"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Punkty montowania"
 
@@ -4377,7 +4374,6 @@ msgstr "Przypisz ochronę"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Restart"
 
@@ -4639,7 +4635,6 @@ msgstr "Serwis rozgłoszeniowy routera"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Hasło routera"
 
@@ -4684,7 +4679,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Dostęp SSH"
 
@@ -4702,7 +4696,6 @@ msgstr "Nazwa użytkownika SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Klucze SSH"
 
@@ -4747,7 +4740,6 @@ msgstr "Skanuj"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Zaplanowane Zadania"
 
@@ -5029,7 +5021,6 @@ msgstr "Rozpoczynanie skanowania..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Autostart"
 
@@ -5162,7 +5153,6 @@ msgstr "Synchronizuj z przeglądarką"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index f54f582873..ea124d4e8c 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -43,8 +43,6 @@ msgstr "(janela de %d minutos, intervalo de %d segundos)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -215,7 +213,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
@@ -475,7 +472,6 @@ msgstr "Endereço para acessar a ponte por retransmissão local"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administração"
 
@@ -858,7 +854,6 @@ msgid "Backup"
 msgstr "Cópia de Segurança"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Cópia de Segurança / Gravar Firmware"
 
@@ -2971,16 +2966,19 @@ msgstr "Folha"
 msgid "Lease time"
 msgstr "Tempo de concessão"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Tempo restante da atribuição"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Arquivo de atribuições"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Tempo restante da atribuição"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3458,7 +3456,6 @@ msgstr "Ponto de Montagem"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
@@ -4454,7 +4451,6 @@ msgstr "Proteção contra \"Rebind\""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -4719,7 +4715,6 @@ msgstr "Serviço de Anúncio de Roteador"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Senha do Roteador"
 
@@ -4764,7 +4759,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acesso SSH"
 
@@ -4782,7 +4776,6 @@ msgstr "Usuário do SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Chaves SSH"
 
@@ -4827,7 +4820,6 @@ msgstr "Procurar"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
@@ -5115,7 +5107,6 @@ msgstr "Iniciando o escaneamento da rede sem fio..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Iniciação"
 
@@ -5249,7 +5240,6 @@ msgstr "Sincronizar com o navegador"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 4dd0f6eb1e..695218eabb 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -43,8 +43,6 @@ msgstr "(janela de %d minutos, intervalo de %d segundos)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -212,7 +210,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
@@ -465,7 +462,6 @@ msgstr "Endereço para acesso à ponte de retransmissão local"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Gestão"
 
@@ -845,7 +841,6 @@ msgid "Backup"
 msgstr "Backup"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Flash Firmware"
 
@@ -2927,16 +2922,19 @@ msgstr "Folha"
 msgid "Lease time"
 msgstr "Tempo de concessão"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Tempo de concessão restante"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Ficheiro de concessões"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Tempo de concessão restante"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3413,7 +3411,6 @@ msgstr "Ponto de Montagem"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
@@ -4408,7 +4405,6 @@ msgstr "Religar protecção"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -4672,7 +4668,6 @@ msgstr "Serviço de Anúncio de Roteador"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Password do Router"
 
@@ -4717,7 +4712,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acesso SSH"
 
@@ -4735,7 +4729,6 @@ msgstr "Utilizador do SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Chaves-SSH"
 
@@ -4780,7 +4773,6 @@ msgstr "Procurar"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
@@ -5068,7 +5060,6 @@ msgstr "Iniciando a varredura da rede wireless..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Iniciação"
 
@@ -5202,7 +5193,6 @@ msgstr "Sincronizar com o browser"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistema"
 
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 0e8884ebf0..5c35550f4d 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -42,8 +42,6 @@ msgstr "(%d fereastra minute, %d interval secunde)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -202,7 +200,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configurare"
 
@@ -448,7 +445,6 @@ msgstr "Adresa de acces punte locala repetor"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administrare"
 
@@ -810,7 +806,6 @@ msgid "Backup"
 msgstr "Salveaza"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Salveaza / Scrie Firmware"
 
@@ -2813,15 +2808,18 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
+msgid "Leasetime remaining"
 msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
@@ -3268,7 +3266,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4226,7 +4223,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Rebooteaza"
 
@@ -4482,7 +4478,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Parola routerului"
 
@@ -4524,7 +4519,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Acces SSH"
 
@@ -4542,7 +4536,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "Cheile SSH"
 
@@ -4587,7 +4580,6 @@ msgstr "Scan"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Operatiuni programate"
 
@@ -4849,7 +4841,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Pornire"
 
@@ -4977,7 +4968,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistem"
 
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 71974f7f0c..37d0068685 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -45,8 +45,6 @@ msgstr "(%d минутное окно, %d секундный интервал)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -207,7 +205,6 @@ msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</a
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Настройка <abbr title=\"Светодиод\">LED</abbr> индикации"
 
@@ -461,7 +458,6 @@ msgstr "Адрес для доступа к локальному мосту-ре
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Управление"
 
@@ -846,7 +842,6 @@ msgid "Backup"
 msgstr "Резервное копирование"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Резервное копирование / Перепрошивка"
 
@@ -2921,16 +2916,19 @@ msgstr "Лист"
 msgid "Lease time"
 msgstr "Время аренды адреса"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Оставшееся время аренды"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Файл аренд"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Оставшееся время аренды"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3399,7 +3397,6 @@ msgstr "Точка монтирования"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Монтирование разделов"
 
@@ -4389,7 +4386,6 @@ msgstr "Защита от DNS Rebinding"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Перезагрузка"
 
@@ -4653,7 +4649,6 @@ msgstr "Доступные режимы работы"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Пароль маршрутизатора"
 
@@ -4697,7 +4692,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Доступ по SSH"
 
@@ -4715,7 +4709,6 @@ msgstr "SSH логин"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH ключи"
 
@@ -4760,7 +4753,6 @@ msgstr "Поиск"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Запланированные задания"
 
@@ -5042,7 +5034,6 @@ msgstr "Начато сканирование беспроводных сете�
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Загрузка"
 
@@ -5175,7 +5166,6 @@ msgstr "Синхронизировать с браузером"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Система"
 
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index b4aa40a120..089f177f6c 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -38,8 +38,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -195,7 +193,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -436,7 +433,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
@@ -796,7 +792,6 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -2788,15 +2783,18 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
+msgid "Leasetime remaining"
 msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
@@ -3243,7 +3241,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4199,7 +4196,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4455,7 +4451,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4497,7 +4492,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4515,7 +4509,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4560,7 +4553,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4822,7 +4814,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4950,7 +4941,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 37d0637e04..90ad84e574 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -41,8 +41,6 @@ msgstr "(%d minut-fönster, %d sekundintervall)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -201,7 +199,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Lysdiod\">LED</abbr>-konfiguration"
 
@@ -444,7 +441,6 @@ msgstr "Adress för att komma åt lokal reläbrygga"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Administration"
 
@@ -807,7 +803,6 @@ msgid "Backup"
 msgstr "Säkerhetskopiera"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Säkerhetskopiera / Flasha inre mjukvara"
 
@@ -2808,16 +2803,19 @@ msgstr "Löv"
 msgid "Lease time"
 msgstr "Kontraktstid"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Återstående kontraktstid"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Kontraktsfil"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Återstående kontraktstid"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3264,7 +3262,6 @@ msgstr "Monteringspunkt"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Monteringspunkter"
 
@@ -4222,7 +4219,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Starta om"
 
@@ -4478,7 +4474,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Router-lösenord"
 
@@ -4520,7 +4515,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH-åtkomst"
 
@@ -4538,7 +4532,6 @@ msgstr "Användarnamn för SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-nycklar"
 
@@ -4583,7 +4576,6 @@ msgstr "Skanna"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Schemalagda uppgifter"
 
@@ -4845,7 +4837,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4973,7 +4964,6 @@ msgstr "Synkronisera med webbläsare"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "System"
 
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index ec0937e1bf..2f7c0d2776 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -30,8 +30,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -187,7 +185,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
@@ -428,7 +425,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
@@ -444,7 +440,7 @@ msgid "Advanced Settings"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:27
-msgid "Aggregate Transmit Power(ACTATP)"
+msgid "Aggregate Transmit Power (ACTATP)"
 msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
@@ -788,7 +784,6 @@ msgid "Backup"
 msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -1810,7 +1805,7 @@ msgid "Expand hosts"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:198
-msgid "Expecting an hexadecimal assignment hint"
+msgid "Expecting a hexadecimal assignment hint"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
@@ -2244,7 +2239,7 @@ msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:8
 #: modules/luci-compat/luasrc/model/network.lua:28
-msgid "IP address in invalid"
+msgid "IP address is invalid"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/network.js:11
@@ -2780,11 +2775,14 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
@@ -3235,7 +3233,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -3453,7 +3450,7 @@ msgid "Noise:"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:34
-msgid "Non Pre-emtive CRC errors (CRC_P)"
+msgid "Non Pre-emptive CRC errors (CRC_P)"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:371
@@ -4000,7 +3997,7 @@ msgid "Power Management Mode"
 msgstr ""
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js:35
-msgid "Pre-emtive CRC errors (CRCP_P)"
+msgid "Pre-emptive CRC errors (CRCP_P)"
 msgstr ""
 
 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
@@ -4191,7 +4188,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr ""
 
@@ -4447,7 +4443,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr ""
 
@@ -4489,7 +4484,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr ""
 
@@ -4507,7 +4501,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4552,7 +4545,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr ""
 
@@ -4814,7 +4806,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4942,7 +4933,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr ""
 
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index f3f6e0d288..457ed5aacb 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -44,8 +44,6 @@ msgstr "(%d dakika gösteriliyor, %d saniye aralıklı)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -204,7 +202,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Ayarları"
 
@@ -453,7 +450,6 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr ""
 
@@ -818,7 +814,6 @@ msgid "Backup"
 msgstr "Yedekleme"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Yedek/Firmware Yazma"
 
@@ -2814,16 +2809,19 @@ msgstr ""
 msgid "Lease time"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Kalan kira süresi"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Kalan kira süresi"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3269,7 +3267,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr ""
 
@@ -4225,7 +4222,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Yeniden başlat"
 
@@ -4481,7 +4477,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Yönlendirici Parolası"
 
@@ -4523,7 +4518,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH Erişimi"
 
@@ -4541,7 +4535,6 @@ msgstr "SSH kullanıcı adı"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-Anahtarları"
 
@@ -4587,7 +4580,6 @@ msgstr "Tara"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Zamanlanmış Görevler"
 
@@ -4849,7 +4841,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr ""
 
@@ -4977,7 +4968,6 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Sistem"
 
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 7b9dd94c55..0be8ca574d 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -42,8 +42,6 @@ msgstr "(вікно – %d хв, інтервал – %d с)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -213,7 +211,6 @@ msgstr "<abbr title=\"Інтернет-протокол версії 6\">IPv6</a
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 "Налаштування <abbr title=\"Light Emitting Diode — світлодіод\">LED</abbr>"
@@ -475,7 +472,6 @@ msgstr "Адреса для доступу до мосту локального
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Адміністрування"
 
@@ -855,7 +851,6 @@ msgid "Backup"
 msgstr "Резервне копіювання"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Рез. копіювання / Перепрош."
 
@@ -2940,16 +2935,19 @@ msgstr "Лист"
 msgid "Lease time"
 msgstr "Час оренди"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Час оренди, що лишився"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Файл оренд"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Час оренди, що лишився"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3428,7 +3426,6 @@ msgstr "Точка монтування"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Точки монтування"
 
@@ -4419,7 +4416,6 @@ msgstr "Захист від переприв'язки"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Перезавантаження"
 
@@ -4682,7 +4678,6 @@ msgstr "Служба оголошень маршрутизатора"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Пароль маршрутизатора"
 
@@ -4726,7 +4721,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH-доступ"
 
@@ -4744,7 +4738,6 @@ msgstr "Ім'я користувача SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-ключі"
 
@@ -4789,7 +4782,6 @@ msgstr "Сканувати"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Заплановані завдання"
 
@@ -5074,7 +5066,6 @@ msgstr "Розпочато сканування бездротових мере�
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Запуск"
 
@@ -5208,7 +5199,6 @@ msgstr "Синхронізувати з браузером"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Система"
 
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index f00256d29b..d9c2bddc0f 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -43,8 +43,6 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -205,7 +203,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"đèn LEDLED\">LED</abbr> Configuration"
 
@@ -460,7 +457,6 @@ msgstr "Địa chỉ truy cập cầu chuyển tiếp địa phương"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "Quản trị"
 
@@ -829,7 +825,6 @@ msgid "Backup"
 msgstr "Sao lưu"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "Sao lưu / cập nhật phần mềm"
 
@@ -2885,16 +2880,19 @@ msgstr ""
 msgid "Lease time"
 msgstr "Thời gian được cấp một địa chỉ IP"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "Leasetime còn lại"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "Leasefile"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "Leasetime còn lại"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3357,7 +3355,6 @@ msgstr "Lắp điểm"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "Lắp điểm"
 
@@ -4345,7 +4342,6 @@ msgstr "Bảo vệ tái kết nối"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "Khởi động lại"
 
@@ -4610,7 +4606,6 @@ msgstr "Dịch vụ quảng bá bộ định tuyến"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "Mật khẩu bộ định tuyến"
 
@@ -4654,7 +4649,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "Kết nối SSH"
 
@@ -4672,7 +4666,6 @@ msgstr "Tên người dùng SSH"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr ""
 
@@ -4717,7 +4710,6 @@ msgstr "quét"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "Nhiệm vụ theo lịch trình"
 
@@ -4995,7 +4987,6 @@ msgstr "Bắt đầu quét mạng ..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "Khởi động"
 
@@ -5129,7 +5120,6 @@ msgstr "Đồng bộ với trình duyệt web"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "Hệ thống"
 
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 28eca1c7e4..4b2fbf1c55 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -43,8 +43,6 @@ msgstr "（最近 %d 分钟信息，每 %d 秒刷新）"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -204,7 +202,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 配置"
 
@@ -452,7 +449,6 @@ msgstr "接入本地中继桥的地址"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "管理权"
 
@@ -813,7 +809,6 @@ msgid "Backup"
 msgstr "备份"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "备份/升级"
 
@@ -2837,16 +2832,19 @@ msgstr "叶节点"
 msgid "Lease time"
 msgstr "租期"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "剩余租期"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "租约文件"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "剩余租期"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3300,7 +3298,6 @@ msgstr "挂载点"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "挂载点"
 
@@ -4267,7 +4264,6 @@ msgstr "重绑定保护"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "重启"
 
@@ -4527,7 +4523,6 @@ msgstr "路由通告服务"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "主机密码"
 
@@ -4569,7 +4564,6 @@ msgstr "SNR"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH 访问"
 
@@ -4587,7 +4581,6 @@ msgstr "SSH 用户名"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH 密钥"
 
@@ -4632,7 +4625,6 @@ msgstr "扫描"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "计划任务"
 
@@ -4902,7 +4894,6 @@ msgstr "正在启动无线扫描…"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "启动项"
 
@@ -5032,7 +5023,6 @@ msgstr "同步浏览器时间"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "系统"
 
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 2aa1fb88a5..dccd5cbb47 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -41,8 +41,6 @@ msgstr "(%d 分鐘資訊,每 %d 秒更新)"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:257
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:281
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:38
-#: modules/luci-compat/luasrc/view/cbi/firewall_zoneforwards.htm:41
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:88
 #: modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm:91
 msgid "(empty)"
@@ -199,7 +197,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:89
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
@@ -446,7 +443,6 @@ msgstr "存取本地中繼橋接位置"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:3
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:12
 msgid "Administration"
 msgstr "管理"
 
@@ -806,7 +802,6 @@ msgid "Backup"
 msgstr "備份"
 
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:103
 msgid "Backup / Flash Firmware"
 msgstr "備份/升級韌體"
 
@@ -2824,16 +2819,19 @@ msgstr ""
 msgid "Lease time"
 msgstr "租賃時間長度"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
+msgid "Lease time remaining"
+msgstr "租賃保留時間"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Leasefile"
 msgstr "租賃檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:55
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:31
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:58
-msgid "Lease time remaining"
-msgstr "租賃保留時間"
+msgid "Leasetime remaining"
+msgstr ""
 
 #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
@@ -3280,7 +3278,6 @@ msgstr "掛載點"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:143
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:226
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:75
 msgid "Mount Points"
 msgstr "掛載設定"
 
@@ -4238,7 +4235,6 @@ msgstr "重新綁護"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/reboot.js:13
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:30
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:112
 msgid "Reboot"
 msgstr "重開機"
 
@@ -4494,7 +4490,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:44
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:11
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:20
 msgid "Router Password"
 msgstr "路由器密碼"
 
@@ -4536,7 +4531,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:13
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:29
 msgid "SSH Access"
 msgstr "SSH存取"
 
@@ -4554,7 +4548,6 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:16
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:43
 msgid "SSH-Keys"
 msgstr "SSH-金鑰"
 
@@ -4599,7 +4592,6 @@ msgstr "掃描"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:23
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:66
 msgid "Scheduled Tasks"
 msgstr "排程任務"
 
@@ -4863,7 +4855,6 @@ msgstr "開始無線掃描..."
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:106
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:57
 msgid "Startup"
 msgstr "開機自動執行"
 
@@ -4993,7 +4984,6 @@ msgstr "與瀏覽器同步時間"
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:8
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:26
-#: modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json:3
 msgid "System"
 msgstr "系統"
author	Hannu Nyman <hannu.nyman@iki.fi>	2019-12-20 08:45:52 +0200
committer	Hannu Nyman <hannu.nyman@iki.fi>	2019-12-20 08:45:52 +0200
commit	2096d67522e6622920d8d6aa1e0009769b392ef2 (patch)
tree	3392ade5e48d0158893b758352783519bde34de7
parent	a3b29fac6f06c5bb9df38cb8371c3b771f9fb78a (diff)