From 31f7aaecc30759dc9faa8b8e40cc2ddae72f205c Mon Sep 17 00:00:00 2001 From: Dimitry Kolyshev Date: Wed, 23 Aug 2023 16:37:35 +0300 Subject: [PATCH] Pull request : 6126-client: boostrap dns Merge in DNS/adguard-home from 6126-bootstrap-dns to master Squashed commit of the following: commit 024e0280fb12f36e9d151132d1042c6c3c78615b Merge: f2be5189d 3722c2846 Author: Dimitry Kolyshev Date: Wed Aug 23 16:09:48 2023 +0300 Merge remote-tracking branch 'origin/master' into 6126-bootstrap-dns commit f2be5189da339830cbbef4dfc0399d23b4284320 Merge: 311429086 2bfc9fcb1 Author: Dimitry Kolyshev Date: Wed Aug 23 15:56:30 2023 +0300 Merge remote-tracking branch 'origin/master' into 6126-bootstrap-dns commit 3114290863f8d50f144ca519f396a7509897ed4a Merge: 332e28730 cb6d4620c Author: Dimitry Kolyshev Date: Tue Aug 22 17:33:20 2023 +0300 Merge remote-tracking branch 'origin/master' into 6126-bootstrap-dns commit 332e2873056771d2ba30188891e2b03ee0cb6cd6 Author: Shared Content Manager account Date: Tue Aug 22 17:32:28 2023 +0300 client: imd texts commit 83162fc835580e08bced3c70ebdc37ef139d0f38 Author: Dimitry Kolyshev Date: Tue Aug 22 16:29:41 2023 +0300 client: boostrap dns --- client/src/__locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json index 38d1fdab..85313bb3 100644 --- a/client/src/__locales/en.json +++ b/client/src/__locales/en.json @@ -7,7 +7,7 @@ "load_balancing": "Load-balancing", "load_balancing_desc": "Query one upstream server at a time. AdGuard Home uses its weighted random algorithm to pick the server so that the fastest server is used more often.", "bootstrap_dns": "Bootstrap DNS servers", - "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.", + "bootstrap_dns_desc": "IP addresses of DNS servers used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams. Comments are not permitted.", "local_ptr_title": "Private reverse DNS servers", "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve PTR requests for addresses in private IP ranges, for example \"192.168.12.34\", using reverse DNS. If not set, AdGuard Home uses the addresses of the default DNS resolvers of your OS except for the addresses of AdGuard Home itself.", "local_ptr_default_resolver": "By default, AdGuard Home uses the following reverse DNS resolvers: {{ip}}.",