diff --git a/client/package-lock.json b/client/package-lock.json index e7080ade..fc6ea4f1 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -6588,7 +6588,7 @@ }, "html-webpack-plugin": { "version": "3.2.0", - "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "dev": true, "requires": { @@ -6638,7 +6638,7 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { @@ -15003,7 +15003,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json index 7b6fba15..9d6e5ce7 100644 --- a/client/src/__locales/en.json +++ b/client/src/__locales/en.json @@ -49,7 +49,7 @@ "no_settings": "No settings", "general_settings": "General settings", "upstream_dns": "Upstream DNS servers", - "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use Cloudflare DNS<\/a> as an upstream. Use tls:\/\/ prefix for DNS over TLS servers.", + "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use Cloudflare DNS<\/a> as an upstream.", "test_upstream_btn": "Test upstreams", "apply_btn": "Apply", "disabled_filtering_toast": "Disabled filtering", @@ -86,6 +86,10 @@ "example_comment": "! Here goes a comment", "example_comment_meaning": "just a comment", "example_comment_hash": "# Also a comment", + "example_upstream_regular": "regular DNS (over UDP)", + "example_upstream_dot": "encrypted DNS-over-TLS", + "example_upstream_doh": "encrypted DNS-over-HTTPS", + "example_upstream_tcp": "regular DNS (over TCP)", "all_filters_up_to_date_toast": "All filters are already up-to-date", "updated_upstream_dns_toast": "Updated the upstream DNS servers", "dns_test_ok_toast": "Specified DNS servers are working correctly", diff --git a/client/src/components/Settings/Upstream.js b/client/src/components/Settings/Upstream.js index b12b119f..0085298f 100644 --- a/client/src/components/Settings/Upstream.js +++ b/client/src/components/Settings/Upstream.js @@ -57,6 +57,24 @@ class Upstream extends Component { +
+
+ examples_title: +
    +
  1. + 1.1.1.1 - { t('example_upstream_regular') } +
  2. +
  3. + tls://1dot1dot1dot1.cloudflare-dns.com - { t('example_upstream_dot') } +
  4. +
  5. + https://cloudflare-dns.com/dns-query - { t('example_upstream_doh') } +
  6. +
  7. + tcp://1.1.1.1 - { t('example_upstream_tcp') } +
  8. +
+