Merge: * (home): update locales

Merge in DNS/adguard-home from update_locales to master Squashed commit of the following: commit 2650ebe94614e986a02ca66aab0cca9f6b618eda Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Oct 12 19:14:05 2020 +0300 Rename MacOs to macOs in setup_dns_privacy_4 string commit c6d8b49be0bfd13f48b4a5a40323bcaed33a9cab Author: Andrey Meshkov <am@adguard.com> Date: Mon Oct 12 18:41:23 2020 +0300 Update locales commit 850e87fcc9a40c6560a744363394fe8db351549b Merge: 5dd23ebe 56e7b2f6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Oct 12 18:27:38 2020 +0300 fix filters string commit 5dd23ebe06809f73760b0b54bae78659e6581837 Author: Andrey Meshkov <am@adguard.com> Date: Mon Oct 12 17:46:26 2020 +0300 Update translations commit 03bf548da40fa7881c26a16f8e7f5793a0d970af Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Oct 12 11:48:42 2020 +0300 Update link in filters_block_toggle_hint locale commit 4372229c8c6f61c6efa1322866c4bbce73e29acd Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Oct 9 13:25:15 2020 +0300 Update locales commit 7c9361fe294f4cb691798b39583e25b8f4e3879e Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Oct 8 17:59:04 2020 +0300 Update locales commit 4b36ba65815b311b81c94cb9b6c4890cc8517780 Merge: 0b9adc88 b97f6b3f Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Oct 8 17:37:45 2020 +0300 Merge branch 'fix/2159' into update_locales commit 0b9adc88ac7cc0612712d2095a116e0bec48f5bb Merge: 1a3d98d3 51819408 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Oct 8 17:37:26 2020 +0300 Merge branch 'update_locales' of ssh://bit.adguard.com:7999/dns/adguard-home into update_locales commit b97f6b3f265c4ec8d55e60ef52c316b510e19aa0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Oct 8 16:35:16 2020 +0300 Update CheckboxField props commit 8c4545fc554749d7aaa836cc496b2026073dfc39 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Oct 8 16:27:17 2020 +0300 - client: 2159 Fix general settings link to filters commit 518194088aaa9be40b2b43a2fa3097273d3ecfd8 Author: Andrey Meshkov <am@adguard.com> Date: Thu Oct 8 12:10:58 2020 +0300 * (home): update locales
- client: 2159 Fix general settings link to filters
2020-10-12 19:28:12 +03:00 · 2020-10-12 18:08:22 +03:00 · 2020-10-09 19:19:14 +03:00 · 2020-10-09 13:23:14 +03:00 · 2020-10-08 12:10:40 +03:00 · 2020-10-08 11:35:06 +03:00
119 changed files with 3091 additions and 1411 deletions
--- a/AGHTechDoc.md
+++ b/AGHTechDoc.md
@@ -33,6 +33,7 @@ Contents:
 	* Static IP check/set
 	* API: Add a static lease
 	* API: Reset DHCP configuration
+	* RA+SLAAC
 * DNS general settings
 	* API: Get DNS general settings
 	* API: Set DNS general settings
@@ -725,6 +726,53 @@ Response:
 	200 OK


+### RA+SLAAC
+
+There are 3 options for a client to get IPv6 address:
+
+1. via DHCPv6.
+	Client doesn't receive any `ICMPv6.RouterAdvertisement` packets, so it tries to use DHCPv6.
+2. via SLAAC.
+	Client receives a `ICMPv6.RouterAdvertisement` packet with `Managed=false` flag and IPv6 prefix.
+	Client then assigns to itself an IPv6 address using this prefix and its MAC address.
+	DHCPv6 server won't be started in this case.
+3. via DHCPv6 or SLAAC.
+	Client receives a `ICMPv6.RouterAdvertisement` packet with `Managed=true` flag and IPv6 prefix.
+	Client may choose to use SLAAC or DHCPv6 to obtain an IPv6 address.
+
+Configuration:
+
+	dhcp:
+		...
+		dhcpv6:
+			...
+			ra_slaac_only: false
+			ra_allow_slaac: false
+
+* `ra_slaac_only:false; ra_allow_slaac:false`: use option #1.
+	Don't send any `ICMPv6.RouterAdvertisement` packets.
+* `ra_slaac_only:true; ra_allow_slaac:false`: use option #2.
+	Periodically send `ICMPv6.RouterAdvertisement(Flags=(Managed=false,Other=false))` packets.
+* `ra_slaac_only:false; ra_allow_slaac:true`: use option #3.
+	Periodically send `ICMPv6.RouterAdvertisement(Flags=(Managed=true,Other=true))` packets.
+
+ICMPv6.RouterAdvertisement packet description:
+
+	ICMPv6:
+	Type=RouterAdvertisement(134)
+	Flags
+		Managed=<BOOL>
+		Other=<BOOL>
+	Option=Prefix information(3)
+		<IPv6 address prefix (/64) of the network interface>
+	Option=MTU(5)
+		<...>
+	Option=Source link-layer address(1)
+		<MAC address>
+	Option=Recursive DNS Server(25)
+		<IPv6 address of DNS server>
+
+
 ## TLS


@@ -782,6 +830,36 @@ Request:
 	"private_key_path":"..." // if set, private_key must be empty
 	}

+Response:
+
+	200 OK
+	
+### API: Validate TLS configuration
+
+Request:
+
+	POST /control/tls/validate
+
+    {
+    "enabled":true,
+    "port_https":443,
+    "port_dns_over_tls":853,
+    "port_dns_over_quic":784,
+    "allow_unencrypted_doh":false,
+    "certificate_chain":"...",
+    "private_key":"...",
+    "certificate_path":"...",
+    "private_key_path":"...",
+    "valid_cert":true,
+    "valid_chain":false,
+    "not_before":"2019-03-19T08:23:45Z",
+    "not_after":"2029-03-16T08:23:45Z",
+    "dns_names":null,
+    "valid_key":true,
+    "valid_pair":true
+    }
+
+
 Response:

 	200 OK
@@ -942,7 +1020,7 @@ Error response (Client not found):
 ### API: Find clients by IP

 This method returns the list of clients (manual and auto-clients) matching the IP list.
-For auto-clients only `name`, `ids` and `whois_info` fields are set.  Other fields are empty.
+For auto-clients only `name`, `ids`, `whois_info`, `disallowed`, and `disallowed_rule` fields are set.  Other fields are empty.

 Request:

@@ -968,11 +1046,16 @@ Response:
 				key: "value"
 				...
 			}
+
+			"disallowed": false,
+			"disallowed_rule": "..."
 		}
 	}
 	...
 	]

+* `disallowed` - whether the client's IP is blocked or not.
+* `disallowed_rule` - the rule due to which the client is disallowed. If `disallowed` is `true`, and this string is empty - it means that the client IP is disallowed by the "allowed IP list", i.e. it is not included in allowed.

 ## DNS general settings

@@ -1102,7 +1185,7 @@ and `value` is either:
 * IPv4 address: use this IP in A response
 * IPv6 address: use this IP in AAAA response
 * canonical name: add CNAME record
-* "<key>": CNAME exception - pass request to upstream
+* "`key`": CNAME exception - pass request to upstream
 * "A": A exception - pass A request to upstream
 * "AAAA": AAAA exception - pass AAAA request to upstream

@@ -1423,6 +1506,7 @@ When a new DNS request is received and processed, we store information about thi
 		"Reason":3,
 		"Rule":"...",
 		"FilterID":1,
+		"ServiceName":"..."
 		},
 	"Elapsed":12345,
 	"Upstream":"...",
@@ -1470,7 +1554,8 @@ Strict matching can be enabled by enclosing the value in double quotes: e.g. `"a
 `response_status`:
 * all
 * filtered             - all kinds of filtering
-* blocked              - blocked or blocked service
+* blocked              - blocked or blocked services
+* blocked_services     - blocked services
 * blocked_safebrowsing - blocked by safebrowsing
 * blocked_parental     - blocked by parental control
 * whitelisted          - whitelisted
@@ -1893,6 +1978,29 @@ Check if host name is blocked by SB/PC service:
 		sha256(sub.host.com)[0..1] -> hashes[2],...
 		...

+## API: Get DNS over HTTPS .mobileconfig
+
+Request:
+
+	GET /apple/doh.mobileconfig
+
+Response:
+
+	200 OK
+	
+    DOH plist file
+
+## API: Get DNS over TLS .mobileconfig
+
+Request:
+
+	GET /apple/dot.mobileconfig
+
+Response:
+
+	200 OK
+
+    DOT plist file

 ## ipset

--- a/4
+++ b/4
@@ -56,10 +56,10 @@ ifeq ($(CHANNEL),edge)
 endif

 # goreleaser command depends on the $CHANNEL
-GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --snapshot
+GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --snapshot --parallelism 1
 ifneq ($(CHANNEL),edge)
 	# If this is not an "edge" build, use normal release command
-	GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish
+	GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --parallelism 1
 endif

 # Version properties
--- a/README.md
+++ b/README.md
@@ -64,14 +64,29 @@ It operates as a DNS server that re-routes tracking domains to a "black hole," t
 <a id="getting-started"></a>
 ## Getting Started

-Please read the **[Getting Started](https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started)** article on our Wiki to learn how to install AdGuard Home, and how to configure your devices to use it.
+### Automated install (Linux and Mac)
+Run the following command in your terminal:
+```
+curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh
+```
+
+### Alternative methods
+
+#### Manual installation
+
+Please read the **[Getting Started](https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started)** article on our Wiki to learn how to install AdGuard Home manually, and how to configure your devices to use it.
+
+#### Docker
+
+You can use our [official Docker image](https://hub.docker.com/r/adguard/adguardhome).
+
+#### Snap Store

 If you're running **Linux**, there's a secure and easy way to install AdGuard Home - you can get it from the [Snap Store](https://snapcraft.io/adguard-home).

-Alternatively, you can use our [official Docker image](https://hub.docker.com/r/adguard/adguardhome). 
-
 ### Guides

+* [FAQ](https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ)
 * [Configuration](https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration)
 * [AdGuard Home as a DNS-over-HTTPS or DNS-over-TLS server](https://github.com/AdguardTeam/AdGuardHome/wiki/Encryption)
 * [How to install and run AdGuard Home on Raspberry Pi](https://github.com/AdguardTeam/AdGuardHome/wiki/Raspberry-Pi)
@@ -228,13 +243,17 @@ There are three options how you can install an unstable version:

 1. [Snap Store](https://snapcraft.io/adguard-home) -- look for "beta" and "edge" channels there.
 2. [Docker Hub](https://hub.docker.com/r/adguard/adguardhome) -- look for "beta" and "edge" tags there.
-3. Standalone builds. Look for the available builds below.
+3. Standalone builds. Use the automated installation script or look for the available builds below.

-There are three options how you can install an unstable version.
+Beta:
+```
+curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s beta
+```

-1. You can either install AdGuard Home from "beta" or "edge" distribution channel which we update periodically. If you're already using stable version of AdGuard Home, just replace the executable file with a new one.
-2. You can use the Docker image from the `edge` tag, which is synced with the repo master branch.
-3. You can install AdGuard Home from `beta` or `edge` channels on the Snap Store.
+Edge:
+```
+curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s edge
+```

 * Beta channel builds
    * Linux: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_386.tar.gz)
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Налады кліентаў",
    "example_upstream_reserved": "Вы можаце паказаць DNS-сервер <0>для канкрэтнага дамена(аў)</0>",
+    "example_upstream_comment": "Вы можаце паказаць каментар",
    "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту",
    "parallel_requests": "Паралельныя запыты",
    "load_balancing": "Размеркаванне нагрузкі",
@@ -114,7 +115,7 @@
    "average_processing_time": "Сярэдні час апрацоўкі запыту",
    "average_processing_time_hint": "Сярэдні час для апрацоўкі запыту DNS  у мілісекундах",
    "block_domain_use_filters_and_hosts": "Блакаваць дамены з выкарыстаннем фільтраў і файлаў хастоў",
-    "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў <a href='#filters'> \"Фільтрах\"</a>.",
+    "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў <a> \"Фільтрах\"</a>.",
    "use_adguard_browsing_sec": "Выкарыстаць Бяспечную навігацыю AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home праверыць, ці ўлучаны дамен у ўэб-службу бяспекі браўзара. Ён будзе выкарыстоўваць API, каб выканаць праверку: на сервер адсылаецца толькі кароткі прэфікс імя дамена SHA256.",
    "use_adguard_parental": "Ужывайце модуль Бацькоўскага кантролю AdGuard ",
@@ -133,6 +134,7 @@
    "dhcp_settings": "Налады DHCP",
    "upstream_dns": "Upstream DNS-серверы",
    "upstream_dns_help": "Увядзіце адрасы сервераў па адным у радку. <a>Даведацца больш </a> пра наладжванне DNS-сервераў.",
+    "upstream_dns_configured_in_file": "Наладжаны ў {{path}}",
    "test_upstream_btn": "Тэст upstream сервераў",
    "upstreams": "Upstreams",
    "apply_btn": "Ужыць",
@@ -186,6 +188,7 @@
    "example_upstream_regular": "звычайны DNS (наўзверх UDP)",
    "example_upstream_dot": "зашыфраваны <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-па-над-TLS</a>",
    "example_upstream_doh": "зашыфраваны <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
+    "example_upstream_doq": "зашыфраваны <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "вы можаце выкарыстоўваць <a href='https://dnscrypt.info/stamps/' target='_blank'>DNS Stamps</a> для <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> ці <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a> рэзалвераў",
    "example_upstream_tcp": "звычайны DNS (наўзверх TCP)",
    "all_lists_up_to_date_toast": "Усе спісы ўжо абноўлены",
@@ -194,6 +197,10 @@
    "dns_test_not_ok_toast": "Сервер \"{{key}}\": немагчыма выкарыстоўваць, праверце слушнасць напісання",
    "unblock": "Адблакаваць",
    "block": "Заблакаваць",
+    "disallow_this_client": "Забараніць доступ гэтаму кліенту",
+    "allow_this_client": "Дазволіць доступ гэтаму кліенту",
+    "block_for_this_client_only": "Заблакаваць толькі для гэтага кліента",
+    "unblock_for_this_client_only": "Адблакаваць толькі для гэтага кліента",
    "time_table_header": "Час",
    "date": "Дата",
    "domain_name_table_header": "Дамен",
@@ -235,6 +242,7 @@
    "blocking_mode": "Рэжым блакавання",
    "default": "Стандартны",
    "nxdomain": "NXDOMAIN",
+    "refused": "REFUSED",
    "null_ip": "Нулёвы IP",
    "custom_ip": "Свой IP",
    "blocking_ipv4": "Блакаванне IPv4",
@@ -249,7 +257,8 @@
    "rate_limit_desc": "Абмежаванне на колькасць запытаў у секунду для кожнага кліента (0 — неабмежавана)",
    "blocking_ipv4_desc": "IP-адрас, што вяртаецца пры блакаванню A-запыту",
    "blocking_ipv6_desc": "IP-адрас, што вяртаецца пры блакаванню AAAA-запыту",
-    "blocking_mode_default": "Стандартны: Адказвае з REFUSED, калі заблакавана правілам у стылі Adblock; адказвае з IP-адрасам, паказаным у правіле, калі заблакавана правілам у стылі /etc/hosts",
+    "blocking_mode_default": "Стандартны: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA), калі заблакавана правілам у стылі Adblock; адказвае з IP-адрасам, паказаным у правіле, калі заблакавана правілам у стылі /etc/hosts-style",
+    "blocking_mode_refused": "REFUSED: Адказвае з кодам REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Адказвае з кодам NXDOMAIN\n",
    "blocking_mode_null_ip": "Нулёвы IP: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA)",
    "blocking_mode_custom_ip": "Карыстацкі IP: Адказвае з ручна наладжаным IP-адрасам",
@@ -326,6 +335,8 @@
    "encryption_https_desc": "Калі порт HTTPS наладжаны, ўэб-інтэрфейс адміністравання AdGuard Home будзе даступны праз HTTPS, а таксама DNS-over-HTTPS сервер будзе даступны па шляху '/dns-query'.",
    "encryption_dot": "Порт DNS-over-TLS",
    "encryption_dot_desc": "Калі гэты порт наладжаны, AdGuard Home запусціць DNS-over-TLS-сервер на гэтаму порту.",
+    "encryption_doq": "Порт DNS-over-QUIC",
+    "encryption_doq_desc": "Калі гэты порт наладжаны, AdGuard Home запусціць сервер DNS-over-QUIC на гэтым порце. Гэта эксперыментальна і можа быць ненадзейна. Апроч таго, не так шмат кліентаў падтрымвае гэты спосаб цяпер.",
    "encryption_certificates": "Сертыфікаты",
    "encryption_certificates_desc": "Для выкарыстання шыфравання вам трэба падаць валідны ланцужок SSL-сертыфікатаў для вашага дамена. Вы можаце атрымаць дармовы сертыфікат на <0>{{link}}</0> ці вы можаце купіць яго ў аднаго з давераных Цэнтраў Сертыфікацыі.",
    "encryption_certificates_input": "Скапіюйце сюды сертыфікаты ў PEM-кадоўцы.",
@@ -404,7 +415,7 @@
    "dns_privacy": "Зашыфраваны DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Ужывайце радок <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Ужывайце радок <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Звярніце ўвагу, што зашыфраваны DNS-пратакол падтрымваецца толькі на Android 9. Для іншых аперацыйных сістэм вам трэба будзе ўсталяваць дадатковае ПА.</0><0>Вось спіс ПА, якое вы можаце выкарыстоўваць.</0>",
+    "setup_dns_privacy_3": "<0>Вось спіс ПА, якое вы можаце выкарыстоўваць.</0>",
    "setup_dns_privacy_android_1": "Android 9 натыўна падтрымвае DNS-over-TLS. Для налады, перайдзіце ў Налады → Сеціва і Інтэрнэт → Дадаткова → Персанальны DNS сервер, і ўвядзіце туды ваша даменавае імя.",
    "setup_dns_privacy_android_2": "<0>AdGuard для Android</0> падтрымвае <1>DNS-over-HTTPS</1> і <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> дадае падтрымка <1>DNS-over-HTTPS</1> на Android.",
@@ -517,6 +528,7 @@
    "check_reason": "Прычына: {{reason}}",
    "check_rule": "Правіла: {{rule}}",
    "check_service": "Назва сэрвісу: {{service}}",
+    "service_name": "Назва сэрвіса",
    "check_not_found": "Не знойдзена ў вашым спісе фільтраў",
    "client_confirm_block": "Вы ўпэўнены, што хочаце заблакаваць кліента \"{{ip}}\"?",
    "client_confirm_unblock": "Вы ўпэўнены, што хочаце адблакаваць кліента \"{{ip}}\"?",
@@ -551,11 +563,12 @@
    "cache_size_desc": "Памер кэша DNS (у байтах)",
    "cache_ttl_min_override": "Перавызначыць мінімальны TTL",
    "cache_ttl_max_override": "Перавызначыць максімальны TTL",
-    "enter_cache_size": "Увядзіце памер кэша",
-    "enter_cache_ttl_min_override": "Увядзіце мінімальны TTL",
-    "enter_cache_ttl_max_override": "Увядзіце максімальны TTL",
+    "enter_cache_size": "Увядзіце памер кэша (байты)",
+    "enter_cache_ttl_min_override": "Увядзіце мінімальны TTL (секунды)",
+    "enter_cache_ttl_max_override": "Увядзіце максімальны TTL (секунды)",
    "cache_ttl_min_override_desc": "Перавызначыць TTL-значэнне (мінімальнае), атрыманае з upstream-сервера",
-    "cache_ttl_max_override_desc": "Перавызначыць TTL-значэнне (максімальнае), атрыманае з сервера для выгрузкі даных",
+    "cache_ttl_max_override_desc": "Усталюйце максімальнае TTL-значэнне (секунды) для запісаў у кэшы DNS",
+    "ttl_cache_validation": "Мінімальнае значэнне TTL кэша павінна быць менш ці роўна максімальнаму значэнню",
    "filter_category_general": "Галоўныя",
    "filter_category_security": "Бяспека",
    "filter_category_regional": "Рэгіянальныя",
@@ -567,5 +580,8 @@
    "setup_config_to_enable_dhcp_server": "Наладзіць канфігурацыю для ўключэння DHCP-сервера",
    "original_response": "Першапачатковы адказ",
    "click_to_view_queries": "Націсніце, каб прагледзець запыты",
-    "port_53_faq_link": "Порт 53 часта заняты службамі \"DNSStubListener\" ці \"systemd-resolved\". Азнаёмцеся з <0>інструкцыяй</0> пра тое, як гэта дазволіць."
+    "port_53_faq_link": "Порт 53 часта заняты службамі \"DNSStubListener\" ці \"systemd-resolved\". Азнаёмцеся з <0>інструкцыяй</0> пра тое, як гэта дазволіць.",
+    "adg_will_drop_dns_queries": "AdGuard Home скіне ўсе DNS-запыты ад гэтага кліента.",
+    "client_not_in_allowed_clients": "Кліент не дазволены, бо яго няма ў спісе \"Дазволеных кліентаў\".",
+    "experimental": "Эксперыментальны"
 }
--- a/client/src/__locales/bg.json
+++ b/client/src/__locales/bg.json
@@ -71,7 +71,7 @@
    "average_processing_time": "Средно време за обработка",
    "average_processing_time_hint": "Средно време за обработка на DNS заявки в милисекунди",
    "block_domain_use_filters_and_hosts": "Блокирани домейни - общи и местни филтри",
-    "filters_block_toggle_hint": "Може да зададете собствени настройки в <a href='#filters'>Филтри</a>.",
+    "filters_block_toggle_hint": "Може да зададете собствени настройки в <a>Филтри</a>.",
    "use_adguard_browsing_sec": "Използвайте AdGuard модул за сигурността",
    "use_adguard_browsing_sec_hint": "Модул Сигурност в AdGuard Home проверява всяка страница която отваряте дали е в черните списъци застрашаващи вашата сигурност. Използва се програмен интерфейс който защитава вашата анонимност и изпраща само SHA256 сума базирана на част от домейна който посещавате.",
    "use_adguard_parental": "Включи AdGuard Родителски Надзор",
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Nastavení klienta",
    "example_upstream_reserved": "Můžete zadat DNS upstream <0>pro konkrétní doménu(y)</0>",
+    "example_upstream_comment": "Můžete zadat komentář",
    "upstream_parallel": "Použijte paralelní požadavky na urychlení řešení simultánním dotazováním na všechny navazující servery",
    "parallel_requests": "Paralelní požadavky",
    "load_balancing": "Optimalizace vytížení",
@@ -114,7 +115,7 @@
    "average_processing_time": "Průměrný čas zpracování",
    "average_processing_time_hint": "Průměrný čas zpracování požadavků DNS v milisekundách",
    "block_domain_use_filters_and_hosts": "Blokovat domény pomocí filtrů a seznamů adres",
-    "filters_block_toggle_hint": "Pravidla blokování můžete nastavit v nastavení <a href='#filters'>Filtry</a>.",
+    "filters_block_toggle_hint": "Pravidla blokování můžete nastavit v nastavení <a>Filtry</a>.",
    "use_adguard_browsing_sec": "Použít službu AdGuard Bezpečné prohlížení",
    "use_adguard_browsing_sec_hint": "AdGuard Home zkontroluje, zda je doména na seznamu zakázaných ve službě Bezpečné prohlížení. Použije vyhledávací API přátelské k ochraně soukromí na provedení kontroly: na server je odeslána pouze krátká předpona SHA256 otisku názvu domény.",
    "use_adguard_parental": "Použít službu AdGuard Rodičovská kontrola",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Blokování IPv6",
    "dns_over_https": "DNS přes HTTPS",
    "dns_over_tls": "DNS přes TLS",
+    "download_mobileconfig_doh": "Stáhnout .mobileconfig pro DNS skrze HTTPS",
+    "download_mobileconfig_dot": "Stáhnout .mobileconfig pro DNS skrze TLS",
    "plain_dns": "Čisté DNS",
    "form_enter_rate_limit": "Zadejte rychlostní limit",
    "rate_limit": "Rychlostní limit",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Počet požadavků za sekundu, které smí jeden klient provádět (0: neomezeno)",
    "blocking_ipv4_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku typu A",
    "blocking_ipv6_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku typu AAAA",
-    "blocking_mode_default": "Výchozí: Odezva pomocí REFUSED, pokud je blokováno pravidlem ve stylu Adblock; odezva pomocí IP adresy uvedené v pravidle, pokud je blokováno pravidlem /etc/hosts-style",
+    "blocking_mode_default": "Výchozí: Odezva s nulovou IP adresou (0.0.0.0 pro A; :: pro AAAA), pokud je blokováno pravidlem ve stylu Adblock; odezva pomocí IP adresy uvedené v pravidle, pokud je blokováno pravidlem /etc/hosts-style",
    "blocking_mode_refused": "REFUSED: Odezva pomocí kódu REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Odezva s kódem NXDOMAIN",
    "blocking_mode_null_ip": "Nulová IP: Odezva s nulovou IP adresou (0.0.0.0 pro A; :: pro AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "Soukromí DNS",
    "setup_dns_privacy_1": "<0>DNS-přes-TLS:</0> Použít <1>{{address}}</1> řetězec.",
    "setup_dns_privacy_2": "<0>DNS-přes-HTTPS:</0> Použít <1>{{address}}</1> řetězec.",
-    "setup_dns_privacy_3": "<0>Upozorňujeme, že šifrované protokoly DNS jsou podporovány pouze v systému Android 9. Proto je třeba nainstalovat další software pro jiné operační systémy.</0><0>Zde je seznam softwaru, který můžete použít.</0>",
+    "setup_dns_privacy_3": "<0>Zde je seznam softwaru, který můžete použít.</0>",
+    "setup_dns_privacy_4": "Na zařízení se systémem iOS 14 nebo macOS Big Sur si můžete stáhnout speciální soubor '.mobileconfig', který do nastavení DNS přidává servery <highlight>DNS skrze HTTPS</highlight> nebo <highlight> DNS skrze TLS</highlight>.",
    "setup_dns_privacy_android_1": "Android 9 podporuje DNS-přes-TLS nativně. Pokud ho chcete konfigurovat, přejděte na Nastavení → Síť & internet → Pokročilé → Soukromé DNS a tam zadejte název vaší domény.",
    "setup_dns_privacy_android_2": "<0>AdGuard pro Android</0> podporuje <1>DNS-přes-HTTPS</1> a <1>DNS-přes-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> přidává podporu <1>DNS-přes-HTTPS</1> pro Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Důvod: {{reason}}",
    "check_rule": "Pravidlo: {{rule}}",
    "check_service": "Název služby: {{service}}",
+    "service_name": "Název služby",
    "check_not_found": "Nenalezeno ve Vašich seznamech filtrů",
    "client_confirm_block": "Opravdu chcete zablokovat klienta „{{ip}}“?",
    "client_confirm_unblock": "Opravdu chcete odblokovat klienta „{{ip}}“?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Velikost mezipaměti DNS (v bajtech)",
    "cache_ttl_min_override": "Přepsat minimální hodnotu TTL",
    "cache_ttl_max_override": "Přepsat maximální hodnotu TTL",
-    "enter_cache_size": "Zadejte velikost mezipaměti",
-    "enter_cache_ttl_min_override": "Zadejte minimální hodnotu TTL",
-    "enter_cache_ttl_max_override": "Zadejte maximální hodnotu TTL",
-    "cache_ttl_min_override_desc": "Přepište hodnotu TTL (minimální) obdrženou z odchozího serveru",
-    "cache_ttl_max_override_desc": "Přepište hodnotu TTL (maximální) obdrženou z odchozího serveru",
+    "enter_cache_size": "Zadejte velikost mezipaměti (v bajtech)",
+    "enter_cache_ttl_min_override": "Zadejte minimální hodnotu TTL (v sekundách)",
+    "enter_cache_ttl_max_override": "Zadejte maximální hodnotu TTL (v sekundách)",
+    "cache_ttl_min_override_desc": "Prodlužte nejkratší hodnotu TTL (v sekundách) obdrženou z odchozího serveru při ukládání DNS odpovědí do mezipaměti",
+    "cache_ttl_max_override_desc": "Nastavte maximální hodnotu TTL (v sekundách) pro položky v mezipaměti DNS",
    "ttl_cache_validation": "Minimální hodnota TTL mezipaměti musí být menší nebo rovna maximální hodnotě",
    "filter_category_general": "Obecné",
    "filter_category_security": "Bezpečnost",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Klikněte pro zobrazení dotazů",
    "port_53_faq_link": "Port 53 je často obsazen službami \"DNSStubListener\" nebo \"systemd-resolved\". Přečtěte si <0>tento návod</0> o tom, jak to vyřešit.",
    "adg_will_drop_dns_queries": "AdGuard Home zruší všechny DNS dotazy tohoto klienta.",
+    "client_not_in_allowed_clients": "Tento klient není povolen, protože není na seznamu \"Povolení klienti\".",
    "experimental": "Experimentální"
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Klient-indstillinger",
    "example_upstream_reserved": "Du kan specificere DNS upstream <0>for det(de) specifikke domæne(r)</0>",
+    "example_upstream_comment": "Du kan uddybe kommentaren",
    "upstream_parallel": "Brug parallelle forespørgsler til at fremskynde behandlingen ved samtidig at spørge alle upstream servere",
    "parallel_requests": "Parallelle forespørgsler",
    "load_balancing": "Belastningsfordeling",
@@ -114,7 +115,7 @@
    "average_processing_time": "Gennemsnitlig behandlingstid",
    "average_processing_time_hint": "Gennemsnitlig behandlingstid i millisekunder af DNS-forespørgsel",
    "block_domain_use_filters_and_hosts": "Bloker domæner ved hjælp af filtre og værtsfiler",
-    "filters_block_toggle_hint": "Du kan oprette blokeringsregler i <a href='#filters'>Filterindstillingerne</a>.",
+    "filters_block_toggle_hint": "Du kan oprette blokeringsregler i <a>Filterindstillingerne</a>.",
    "use_adguard_browsing_sec": "Brug AdGuards browsing sikkerhedstjeneste",
    "use_adguard_browsing_sec_hint": "AdGuard Home vil kontrollere om domænet er sortlistet af browsing sikkerhedstjenesten. Den vil bruge privatlivsvenlig lookup API til at udføre kontrollen: kun et kort præfiks af domænenavnet SHA256 hash bliver sendt til serveren.",
    "use_adguard_parental": "Brug AdGuards forældrekontrol",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "IPv6-blokering",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Download .mobileconfig til DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Download .mobileconfig til DNS-over-TLS",
    "plain_dns": "Almindelig DNS",
    "form_enter_rate_limit": "Indtast hyppighedsgrænse",
    "rate_limit": "Hyppighedsgrænse",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Antallet af anmodninger pr. sekund, som en enkelt klient får lov til at fremsætte (indstilles den til 0 betyder det ubegrænset)",
    "blocking_ipv4_desc": "IP-adresse, der skal returneres for en blokeret A-anmodning",
    "blocking_ipv6_desc": "IP-adresse, der skal returneres for en blokeret AAAA-anmodning",
-    "blocking_mode_default": "Standard: Svar med REFUSED, når det blokeres af Adblock-stil-reglen; svar med den IP-adresse, der er angivet i reglen, når den blokeres af /etc/hosts-style-reglen",
+    "blocking_mode_default": "Standard: Svar med nul IP-adresse (0.0.0.0 for A; :: for AAAA), når den blokeres af Adblock-stil-reglen; svar med den IP-adresse, der er angivet i reglen, når den blokeres af /etc/hosts-style-reglen",
    "blocking_mode_refused": "REFUSED: Svar med en REFUSED kode",
    "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-kode",
    "blocking_mode_null_ip": "Null IP: Svar med nul IP-adresse (0.0.0.0 for A; :: for AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS Privatliv",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Brug <1>{{address}}</1> streng.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Brug <1>{{address}}</1> streng.",
-    "setup_dns_privacy_3": "<0>Bemærk venligst, at krypterede DNS-protokoller kun understøttes på Android 9. Så du skal installere ekstra software til andre styresystemer.</0><0>Her er en liste af software, du kan bruge.</0>",
+    "setup_dns_privacy_3": "<0>Her er en liste over software, du kan bruge.</0>",
+    "setup_dns_privacy_4": "På en iOS 14 eller macOS Big Sur-enhed kan du downloade en særlig '.mobileconfig' -fil, der tilføjer <highlight>DNS-over-HTTPS</highlight> eller <highlight>DNS-over-TLS</highlight> servere til DNS-indstillingerne.",
    "setup_dns_privacy_android_1": "Android 9 understøtter den indbyggede DNS-over-TLS. For at konfigurere den, gå til Indstillinger → Netværk & internet → Avanceret → Privat DNS og indtast dit domænenavn.",
    "setup_dns_privacy_android_2": "<0>AdGuard til Android</0> understøtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> tilføjer <1>DNS-over-HTTPS</1> understøttelse til Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Årsag: {{reason}}",
    "check_rule": "Regel: {{rule}}",
    "check_service": "Servicenavn: {{service}}",
+    "service_name": "Navn på tjeneste",
    "check_not_found": "Ikke fundet i dine filterlister",
    "client_confirm_block": "Er du sikker på, at du vil blokere klienten \"{{ip}}\"?",
    "client_confirm_unblock": "Er du sikker på, at du vil fjerne blokeringen af klienten \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Størrelse på DNS-cache (i bytes)",
    "cache_ttl_min_override": "Overskriv minimum TTL",
    "cache_ttl_max_override": "Overskriv maksimal TTL",
-    "enter_cache_size": "Indtast cache-størrelse",
-    "enter_cache_ttl_min_override": "Indtast minimum TTL",
-    "enter_cache_ttl_max_override": "Indtast maksimum TTL",
-    "cache_ttl_min_override_desc": "Overskriv TTL-værdi (minimum) modtaget fra upstream-serveren",
-    "cache_ttl_max_override_desc": "Overskriv TTL-værdi (maksimum) modtaget fra upstream-serveren",
+    "enter_cache_size": "Indtast cache-størrelse (bytes)",
+    "enter_cache_ttl_min_override": "Indtast minimum TTL (sekunder)",
+    "enter_cache_ttl_max_override": "Indtast maksimum TTL (sekunder)",
+    "cache_ttl_min_override_desc": "Udvid korte time-to-live værdier (sekunder) modtaget fra upstream-serveren, når DNS-svar cachelagres",
+    "cache_ttl_max_override_desc": "Indstil en maksimal time-to-live (sekunder) for registreringer i DNS-cachen",
    "ttl_cache_validation": "Minimum cache TTL-værdi skal være mindre end eller lig med den maksimale værdi",
    "filter_category_general": "Generelt",
    "filter_category_security": "Sikkerhed",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Klik for at se forespørgsler",
    "port_53_faq_link": "Port 53 optages ofte af \"DNSStubListener\" eller \"systemd-resolved\" tjenester. Læs <0>denne instruktion</0> om, hvordan du løser dette.",
    "adg_will_drop_dns_queries": "AdGuard Home vil afbryde alle DNS-forespørgsler fra denne klient.",
+    "client_not_in_allowed_clients": "Klienten er ikke tilladt, fordi den ikke er på listen \"Tilladte klienter\".",
    "experimental": "Eksperimentel"
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Client-Einstellungen",
    "example_upstream_reserved": "Sie können DNS-Upstream <0>für bestimmte Domain(s)</0> angeben",
+    "example_upstream_comment": "Sie können den Kommentar angeben",
    "upstream_parallel": "Parallele Abfragen verwenden, um die Lösung zu beschleunigen, indem Sie alle Upstream-Server gleichzeitig abfragen",
    "parallel_requests": "Parallele Abfragen",
    "load_balancing": "Lastverteilung",
@@ -114,7 +115,7 @@
    "average_processing_time": "Durchschnittliche Bearbeitungsdauer",
    "average_processing_time_hint": "Durchschnittliche Zeit in Millisekunden zur Bearbeitung von DNS-Anfragen",
    "block_domain_use_filters_and_hosts": "Domains durch Filter und Host-Dateien sperren",
-    "filters_block_toggle_hint": "Sie können Blockierregeln in den <a href='#filters'>Filter</a>einstellungen erstellen",
+    "filters_block_toggle_hint": "Sie können Blockierregeln in den <a>Filter</a>einstellungen erstellen.",
    "use_adguard_browsing_sec": "AdGuard Webservice für Internetsicherheit nutzen",
    "use_adguard_browsing_sec_hint": "AdGuard Home prüft, ob die Domain durch den Webdienst für Internetsicherheit auf eine Sperrliste gesetzt wurde. Um Ihre Privatsphäre zu wahren, wird eine API verwendet, bei der nur ein kurzer Präfix des Domainnamens als SHA256 gehasht an den Server gesendet wird.",
    "use_adguard_parental": "AdGuard Webservice für Kindersicherung verwenden",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "IPv6-Sperren",
    "dns_over_https": "DNS-over-HTTPS (DNS-Abrage über HTTPS)",
    "dns_over_tls": "DNS-over-TLS (DNS-Abrage über TLS)",
+    "download_mobileconfig_doh": ".mobileconfig für DNS-über-HTTPS herunterladen",
+    "download_mobileconfig_dot": ".mobileconfig für DNS-über-TLS herunterladen",
    "plain_dns": "Einfaches DNS",
    "form_enter_rate_limit": "Begrenzungswert eingeben",
    "rate_limit": "Begrenzungswert",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Die Anzahl der Anfragen pro Sekunde, die ein einzelner Client stellen darf (0: unbegrenzt)",
    "blocking_ipv4_desc": "IP-Adresse, die für eine gesperrte A-Anfrage zurückgegeben werden soll",
    "blocking_ipv6_desc": "IP-Adresse, die für eine gesperrte AAAA-Anfrage zurückgegeben werden soll",
-    "blocking_mode_default": "Standard: Mit REFUSED antworten, wenn sie durch eine Regel im Adblock-Stil gesperrt sind; mit der in der Regel angegebenen IP-Adresse antworten, wenn sie durch eine Regel im /etc/hosts-Stil gesperrt wurde",
+    "blocking_mode_default": "Standard: Mit Null IP Adress (0.0.0.0 for A; :: for AAAA) antworten, wenn sie durch eine Regel im Adblock-Stil gesperrt sind; mit der in der Regel angegebenen IP-Adresse antworten, wenn sie durch eine Regel im /etc/hosts-Stil gesperrt wurde",
    "blocking_mode_refused": "REFUSED: mit abgelehntem Code REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Mit NXDOMAIN-Code antworten",
    "blocking_mode_null_ip": "Null-IP: Antworten mit Null-IP-Adresse (0.0.0.0.0 für A; :: für AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS-Datenschutz",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
-    "setup_dns_privacy_3": "<0>Bitte beachten Sie, dass verschlüsselte DNS-Protokolle nur von Android 9 unterstützt werden. Sie müssen also zusätzliche Software für andere Betriebssysteme installieren.</0><0>Hier eine Liste der Apps, die Sie verwenden könnten.</0>",
+    "setup_dns_privacy_3": "<0>Hier ist eine Liste von Software, die Sie verwenden können.</0>",
+    "setup_dns_privacy_4": "Auf einem iOS 14 oder macOS Big Sur-Gerät können Sie eine spezielle Datei „.mobileconfig” herunterladen, die Server für <highlight>DNS-über-HTTPS</highlight> oder <highlight>DNS-über-TLS</highlight> zu den DNS-Einstellungen hinzufügt.",
    "setup_dns_privacy_android_1": "Android 9 unterstützt DNS-over-TLS nativ. Um es zu konfigurieren, gehen Sie zu „Einstellungen” → „Netzwerk & Internet” → „Erweitert” → „Privater DNS” und geben Sie dort Ihren Domainnamen ein.",
    "setup_dns_privacy_android_2": "<0>AdGuard für Android</0> unterstützt <1>DNS-over-HTTTPS</1> und <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "„<0>Intra</0>” fügt <1>DNS-over-HTTPS</1>-Unterstützung zu Android hinzu.",
@@ -527,6 +531,7 @@
    "check_reason": "Grund: {{reason}}",
    "check_rule": "Regel: {{rule}}",
    "check_service": "Dienstname: {{service}}",
+    "service_name": "Name des Dienstes",
    "check_not_found": "Nicht in Ihren Filterlisten enthalten",
    "client_confirm_block": "Möchten Sie den Client „{{ip}}” wirklich sperren?",
    "client_confirm_unblock": "Möchten Sie den Client „{{ip}}” wirklich entsperren?",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Anklicken, um Abfragen anzuzeigen",
    "port_53_faq_link": "Port 53 wird oft von Diensten wie „DNSStubListener” oder „systemresolved” belegt. Bitte lesen Sie <0>diese Anweisung</0>, wie dies behoben werden kann.",
    "adg_will_drop_dns_queries": "AdGuard Home wird alle DNS-Abfragen von diesem Client verwerfen.",
+    "client_not_in_allowed_clients": "Diese Anwendung ist nicht erlaubt, weil diese nicht in der Liste „Erlaubte Anwendungen” aufgeführt ist.",
    "experimental": "Experimentell"
 }
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Client settings",
    "example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)</0>",
+    "example_upstream_comment": "You can specify the comment",
    "upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers",
    "parallel_requests": "Parallel requests",
    "load_balancing": "Load-balancing",
@@ -114,7 +115,7 @@
    "average_processing_time": "Average processing time",
    "average_processing_time_hint": "Average time in milliseconds on processing a DNS request",
    "block_domain_use_filters_and_hosts": "Block domains using filters and hosts files",
-    "filters_block_toggle_hint": "You can setup blocking rules in the <a href='#filters'>Filters</a> settings.",
+    "filters_block_toggle_hint": "You can setup blocking rules in the <a>Filters</a> settings.",
    "use_adguard_browsing_sec": "Use AdGuard browsing security web service",
    "use_adguard_browsing_sec_hint": "AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.",
    "use_adguard_parental": "Use AdGuard parental control web service",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Blocking IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
    "plain_dns": "Plain DNS",
    "form_enter_rate_limit": "Enter rate limit",
    "rate_limit": "Rate limit",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)",
    "blocking_ipv4_desc": "IP address to be returned for a blocked A request",
    "blocking_ipv6_desc": "IP address to be returned for a blocked AAAA request",
-    "blocking_mode_default": "Default: Respond with REFUSED when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule",
+    "blocking_mode_default": "Default: Respond with zero IP address (0.0.0.0 for A; :: for AAAA) when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule",
    "blocking_mode_refused": "REFUSED: Respond with REFUSED code",
    "blocking_mode_nxdomain": "NXDOMAIN: Respond with NXDOMAIN code",
    "blocking_mode_null_ip": "Null IP: Respond with zero IP address (0.0.0.0 for A; :: for AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS Privacy",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Use <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Use <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Please note that encrypted DNS protocols are supported only on Android 9. So you need to install additional software for other operating systems.</0><0>Here's a list of software you can use.</0>",
+    "setup_dns_privacy_3": "<0>Here's a list of software you can use.</0>",
+    "setup_dns_privacy_4": "On an iOS 14 or macOS Big Sur device you can download special '.mobileconfig' file that adds <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> servers to the DNS settings.",
    "setup_dns_privacy_android_1": "Android 9 supports DNS-over-TLS natively. To configure it, go to Settings → Network & internet → Advanced → Private DNS and enter your domain name there.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> supports <1>DNS-over-HTTPS</1> and <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> adds <1>DNS-over-HTTPS</1> support to Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Reason: {{reason}}",
    "check_rule": "Rule: {{rule}}",
    "check_service": "Service name: {{service}}",
+    "service_name": "Service name",
    "check_not_found": "Not found in your filter lists",
    "client_confirm_block": "Are you sure you want to block the client \"{{ip}}\"?",
    "client_confirm_unblock": "Are you sure you want to unblock the client \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "DNS cache size (in bytes)",
    "cache_ttl_min_override": "Override minimum TTL",
    "cache_ttl_max_override": "Override maximum TTL",
-    "enter_cache_size": "Enter cache size",
-    "enter_cache_ttl_min_override": "Enter minimum TTL",
-    "enter_cache_ttl_max_override": "Enter maximum TTL",
-    "cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server",
-    "cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server",
+    "enter_cache_size": "Enter cache size (bytes)",
+    "enter_cache_ttl_min_override": "Enter minimum TTL (seconds)",
+    "enter_cache_ttl_max_override": "Enter maximum TTL (seconds)",
+    "cache_ttl_min_override_desc": "Extend short time-to-live values (seconds) received from the upstream server when caching DNS responses",
+    "cache_ttl_max_override_desc": "Set a maximum time-to-live value (seconds) for entries in the DNS cache",
    "ttl_cache_validation": "Minimum cache TTL value must be less than or equal to the maximum value",
    "filter_category_general": "General",
    "filter_category_security": "Security",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Click to view queries",
    "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this.",
    "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.",
+    "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
    "experimental": "Experimental"
 }
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -1,12 +1,13 @@
 {
    "client_settings": "Configuración de clientes",
    "example_upstream_reserved": "puedes especificar el DNS de subida <0>para un dominio específico</0>",
+    "example_upstream_comment": "Puedes especificar el comentario",
    "upstream_parallel": "Usar peticiones paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores de subida",
    "parallel_requests": "Peticiones paralelas",
    "load_balancing": "Balanceo de carga",
    "load_balancing_desc": "Consulta un servidor a la vez. AdGuard Home utilizará el algoritmo aleatorio ponderado para elegir el servidor más rápido y sea utilizado con más frecuencia.",
    "bootstrap_dns": "Servidores DNS de arranque",
-    "bootstrap_dns_desc": "Los servidores DNS de arranque se utilizan para resolver las direcciones IP de los resolutores DoH/DoT que usted especifique como DNS de subida.",
+    "bootstrap_dns_desc": "Los servidores DNS de arranque se utilizan para resolver las direcciones IP de los resolutores DoH/DoT que especifiques como DNS de subida.",
    "check_dhcp_servers": "Comprobar si hay servidores DHCP",
    "save_config": "Guardar configuración",
    "enabled_dhcp": "Servidor DHCP habilitado",
@@ -114,7 +115,7 @@
    "average_processing_time": "Tiempo promedio de procesamiento",
    "average_processing_time_hint": "Tiempo promedio en milisegundos al procesar una petición DNS",
    "block_domain_use_filters_and_hosts": "Bloquear dominios usando filtros y archivos hosts",
-    "filters_block_toggle_hint": "Puedes configurar las reglas de bloqueo en la configuración de <a href='#filters'>filtros</a>.",
+    "filters_block_toggle_hint": "Puedes configurar las reglas de bloqueo en la configuración de <a>filtros</a>.",
    "use_adguard_browsing_sec": "Usar el servicio web de seguridad de navegación de AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home comprobará si el dominio está en la lista negra del servicio web de seguridad de navegación. Utilizará la API de búsqueda amigable con la privacidad para realizar la comprobación: solo se envía al servidor un prefijo corto del nombre de dominio con hash SHA256.",
    "use_adguard_parental": "Usar el control parental de AdGuard",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Bloqueo de IPv6",
    "dns_over_https": "DNS mediante HTTPS",
    "dns_over_tls": "DNS mediante TLS",
+    "download_mobileconfig_doh": "Descargar .mobileconfig para DNS mediante HTTPS",
+    "download_mobileconfig_dot": "Descargar .mobileconfig para DNS mediante TLS",
    "plain_dns": "DNS simple",
    "form_enter_rate_limit": "Ingresa el límite de cantidad",
    "rate_limit": "Límite de cantidad",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Número de peticiones por segundo que un solo cliente puede hacer (establecerlo en 0 significa ilimitado)",
    "blocking_ipv4_desc": "Dirección IP devolverá una petición A bloqueada",
    "blocking_ipv6_desc": "Dirección IP devolverá una petición AAAA bloqueada",
-    "blocking_mode_default": "Predeterminado: Responde con REFUSED cuando está bloqueado por la regla de estilo Adblock; responde con la dirección IP especificada en la regla cuando está bloqueado por una regla de estilo /etc/hosts",
+    "blocking_mode_default": "Predeterminado: Responde con dirección IP cero (0.0.0.0 para A; :: para AAAA) cuando está bloqueado por la regla de estilo Adblock; responde con la dirección IP especificada en la regla cuando está bloqueado por una regla de estilo /etc/hosts",
    "blocking_mode_refused": "REFUSED: Responde con el código REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Responde con el código NXDOMAIN",
    "blocking_mode_null_ip": "IP nulo: Responde con dirección IP cero (0.0.0.0 para A; :: para AAAA)",
@@ -383,7 +386,7 @@
    "client_edit": "Editar cliente",
    "client_identifier": "Identificador",
    "ip_address": "Dirección IP",
-    "client_identifier_desc": "Los clientes pueden ser identificados por la dirección IP, MAC y CIDR. Tenga en cuenta que el uso de MAC como identificador solo es posible si AdGuard Home también es un <0>servidor DHCP</0>",
+    "client_identifier_desc": "Los clientes pueden ser identificados por la dirección IP, MAC y CIDR. Ten en cuenta que el uso de MAC como identificador solo es posible si AdGuard Home también es un <0>servidor DHCP</0>",
    "form_enter_ip": "Ingresa la IP",
    "form_enter_mac": "Ingresa la MAC",
    "form_enter_id": "Ingresa el identificador",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS cifrado",
    "setup_dns_privacy_1": "<0>DNS mediante TLS:</0> Utiliza la cadena <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS mediante HTTPS:</0> Utiliza la cadena <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Tenga en cuenta que los protocolos DNS cifrados solo son compatibles con Android 9. Por lo tanto, necesita instalar software adicional para otros sistemas operativos.</0><0>Aquí hay una lista de software que puedes usar.</0>",
+    "setup_dns_privacy_3": "<0>Aquí hay una lista de software que puedes usar.</0>",
+    "setup_dns_privacy_4": "En un dispositivo iOS 14 o macOS Big Sur puedes descargar el archivo especial '.mobileconfig' que añade servidores <highlight>DNS mediante HTTPS</highlight> o <highlight>DNS mediante TLS</highlight> a la configuración del DNS.",
    "setup_dns_privacy_android_1": "Android 9 soporta DNS mediante TLS de forma nativa. Para configurarlo, ve a Configuración → Red e Internet → Avanzado → DNS privado e ingresa el nombre del dominio allí.",
    "setup_dns_privacy_android_2": "<0>AdGuard para Android</0> soporta <1>DNS mediante HTTPS</1> y <1>DNS mediante TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> añade soporte a Android para <1>DNS mediante HTTPS</1>.",
@@ -527,6 +531,7 @@
    "check_reason": "Razón: {{reason}}",
    "check_rule": "Regla: {{rule}}",
    "check_service": "Nombre del servicio: {{service}}",
+    "service_name": "Nombre del servicio",
    "check_not_found": "No se ha encontrado en tus listas de filtros",
    "client_confirm_block": "¿Está seguro de que desea bloquear al cliente \"{{ip}}\"?",
    "client_confirm_unblock": "¿Está seguro de que desea desbloquear al cliente \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Tamaño de la caché DNS (en bytes)",
    "cache_ttl_min_override": "Anular TTL mínimo",
    "cache_ttl_max_override": "Anular TTL máximo",
-    "enter_cache_size": "Ingresa el tamaño de la caché",
-    "enter_cache_ttl_min_override": "Ingresa el TTL mínimo",
-    "enter_cache_ttl_max_override": "Ingresa el TTL máximo",
-    "cache_ttl_min_override_desc": "Anula el valor TTL (mínimo) recibido del servidor DNS de subida",
-    "cache_ttl_max_override_desc": "Anula el valor TTL (máximo) recibido del servidor DNS de subida",
+    "enter_cache_size": "Ingresa el tamaño de la caché (bytes)",
+    "enter_cache_ttl_min_override": "Ingresa el TTL mínimo (en segundos)",
+    "enter_cache_ttl_max_override": "Ingresa el TTL máximo (en segundos)",
+    "cache_ttl_min_override_desc": "Amplia el corto tiempo de vida de los valores recibidos del servidor DNS de subida al almacenar en caché las respuestas DNS",
+    "cache_ttl_max_override_desc": "Establece un valor de tiempo de vida máximo para las entradas en la caché DNS",
    "ttl_cache_validation": "El valor TTL mínimo de la caché debe ser menor o igual al valor máximo",
    "filter_category_general": "General",
    "filter_category_security": "Seguridad",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Clic para ver las consultas",
    "port_53_faq_link": "El puerto 53 suele estar ocupado por los servicios \"DNSStubListener\" o \"systemd-resolved\". Por favor lee <0>esta instrucción</0> sobre cómo resolver esto.",
    "adg_will_drop_dns_queries": "AdGuard Home descartará todas las consultas DNS de este cliente.",
+    "client_not_in_allowed_clients": "El cliente no está permitido porque no está en la lista de \"Clientes permitidos\".",
    "experimental": "experimental"
 }
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -106,7 +106,7 @@
    "average_processing_time": "میانگین زمان پردازش",
    "average_processing_time_hint": "زمان میانگین بر هزارم ثانیه در پردازش درخواست DNS",
    "block_domain_use_filters_and_hosts": "مسدودسازی دامنه ها توسط فیلترها و فایل های میزبان",
-    "filters_block_toggle_hint": "میتوانید دستورات مسدودسازی را در تنظیمات <a href='#filters'>فیلترها</a> راه اندازی کنید.",
+    "filters_block_toggle_hint": "میتوانید دستورات مسدودسازی را در تنظیمات <a>فیلترها</a> راه اندازی کنید.",
    "use_adguard_browsing_sec": "استفاده از سرویس وب امنیت وب گردی AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home بررسی می کند اگر دامنه در سرویس وب امنیت وب گردی در لیست سیاه است.آن از اِی پی آی دارای حریم خصوصی برای بررسی استفاده می کند:فقط پیشوند کوتاه نام دامنه هش SHA256 به سرور ارسال خواهد شد.",
    "use_adguard_parental": "از سرویس وب نظارت والدین AdGuard استفاده کن",
@@ -232,7 +232,6 @@
    "edns_cs_desc": "اگر فعال باشد،AdGuard Home زیرشبکه های کلاینت ها را به سرورهای DNS می فرستد.",
    "blocking_ipv4_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده A",
    "blocking_ipv6_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده AAAA",
-    "blocking_mode_default": "پیش فرض: وقتی مسدود شود با دستور سبک-مسدودساز تبلیغ REFUSED پاسخ میدهد،پاسخ با آدرس آی پی تعیین شده در دستور وقتی با دستور /etc/hosts-style rule مسدود شود",
    "blocking_mode_nxdomain": "NXDOMAIN: پاسخ با کُد NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: پاسخ با آدرس آی پی صفر(0.0.0.0 برای A; :: برای AAAA)",
    "blocking_mode_custom_ip": "آی پی دستی: پاسخ با آدرس آی پی دستی تنظیم شده",
@@ -386,7 +385,6 @@
    "dns_privacy": "حریم خصوصی DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> استفاده از<1>{{address}}</1> .",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> استفاده از <1>{{address}}</1> .",
-    "setup_dns_privacy_3": "<0>لطفا توجه کنید که پروتکل های رمزگذاری شده DNS فقط در آندروئید 9 پشتیبانی می شود. پس برای سیستم عامل های دیگر نیاز است که برنامه دیگری نصب کنید.</0><0>در اینجا میتوانید لیست نرم افزارهای قابل استفاده را ببینید.</0>",
    "setup_dns_privacy_android_1": "آندروئید 9 بطور پیش فرض از  DNS-over-TLS پشتیبانی می کند. برای پیکربندی آن، بروید به تنظیمات → شبکه & اینترنت → پیشرفته → DNS خصوصی و نام دامنه را آنجا وارد کنید.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> پشتیبانی از <1>DNS-over-HTTPS</1> و <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> قابلیت <1>DNS-over-HTTPS</1> را به آندروئید اضافه می کند.",
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Paramètres du client",
    "example_upstream_reserved": "Vous pouvez spécifier un DNS en amont <0>pour un/des domaine(s) spécifique(s)</0>",
+    "example_upstream_comment": "Vous pouvez spécifier un commentaire",
    "upstream_parallel": "Utiliser des requêtes parallèles pour accélérer la résolution en requêtant simultanément tous les serveurs upstream",
    "parallel_requests": "Demandes en parallèle",
    "load_balancing": "Équilibrage de charge",
@@ -11,6 +12,8 @@
    "save_config": "Sauvegarder la configuration",
    "enabled_dhcp": "Serveur DHCP activé",
    "disabled_dhcp": "Serveur DHCP désactivé",
+    "unavailable_dhcp": "Le DHCP n’est pas disponible",
+    "unavailable_dhcp_desc": "AdGuard Home ne peut pas exécuter un serveur DHCP sur votre système d’exploitation",
    "dhcp_title": "Serveur DHCP (experimental !)",
    "dhcp_description": "Si votre routeur ne fonctionne pas avec les réglages DHCP, vous pouvez utiliser le serveur DHCP par défaut d'AdGuard.",
    "dhcp_enable": "Activer le serveur DHCP",
@@ -21,6 +24,8 @@
    "dhcp_static_leases": "Baux statiques DHCP",
    "dhcp_leases_not_found": "Aucune location des serveurs DHCP trouvée",
    "dhcp_config_saved": "La configuration du serveur DHCP est sauvegardée",
+    "dhcp_ipv4_settings": "Paramètres IPv4 du DHCP",
+    "dhcp_ipv6_settings": "Paramètres IPv6 du DHCP",
    "form_error_required": "Champ requis",
    "form_error_ip4_format": "Format IPv4 invalide",
    "form_error_ip6_format": "Format IPv6 invalide",
@@ -29,6 +34,7 @@
    "form_error_client_id_format": "Format d'ID client non valide",
    "form_error_positive": "Doit être supérieur à 0",
    "form_error_negative": "Doit être égal à 0 ou supérieur",
+    "range_end_error": "Doit être supérieur au début de la gamme",
    "dhcp_form_gateway_input": "IP de la passerelle",
    "dhcp_form_subnet_input": "Masque de sous-réseau",
    "dhcp_form_range_title": "Rangée des adresses IP",
@@ -109,7 +115,7 @@
    "average_processing_time": "Temps moyen de traitement",
    "average_processing_time_hint": "Temps moyen (en millisecondes) de traitement d'une requête DNS",
    "block_domain_use_filters_and_hosts": "Bloquez les domaines à l'aide des filtres et fichiers hosts",
-    "filters_block_toggle_hint": "Vous pouvez configurer les règles de filtrage dans les paramètres des <a href='#filters'>Filtres</a>.",
+    "filters_block_toggle_hint": "Vous pouvez configurer les règles de filtrage dans les paramètres des <a>Filtres</a>.",
    "use_adguard_browsing_sec": "Utilisez le service Sécurité de navigation d'AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home va vérifier si le domaine est dans la liste noire du service de sécurité de navigation. Pour cela il va utiliser un lookup API discret : le préfixe court du hash du nom de domaine SHA256 sera envoyé au serveur.",
    "use_adguard_parental": "Utiliser le contrôle parental d'AdGuard",
@@ -127,6 +133,8 @@
    "encryption_settings": "Paramètres de chiffrement",
    "dhcp_settings": "Paramètres DHCP",
    "upstream_dns": "Serveurs DNS upstream",
+    "upstream_dns_help": "Saisissez les adresses des serveurs, une par ligne. <a>En savoir plus</a> sur la configuration des serveurs DNS en amont.",
+    "upstream_dns_configured_in_file": "Configuré dans {{path}}",
    "test_upstream_btn": "Tester les upstreams",
    "upstreams": "En amont",
    "apply_btn": "Appliquer",
@@ -180,6 +188,7 @@
    "example_upstream_regular": "DNS classique (au-dessus de UDP)",
    "example_upstream_dot": "<0>DNS-over-TLS</0> chiffré",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0> chiffré",
+    "example_upstream_doq": "<0>DNS-over-QUIC</0> chiffré",
    "example_upstream_sdns": "vous pouvez utiliser <0>DNS Stamps</0> pour <1>DNSCrypt</1> ou les resolveurs <2>DNS_over_HTTPS</2>",
    "example_upstream_tcp": "DNS classique (au-dessus de TCP)",
    "all_lists_up_to_date_toast": "Toutes les listes sont déjà à jour",
@@ -188,6 +197,10 @@
    "dns_test_not_ok_toast": "Impossible d'utiliser le serveur \"{{key}}\": veuillez vérifier si le nom saisi est bien correct",
    "unblock": "Débloquer",
    "block": "Bloquer",
+    "disallow_this_client": "Interdire ce client",
+    "allow_this_client": "Autoriser ce client",
+    "block_for_this_client_only": "Bloquer uniquement pour ce client",
+    "unblock_for_this_client_only": "Débloquer uniquement pour ce client",
    "time_table_header": "Temps",
    "date": "Date",
    "domain_name_table_header": "Nom de domaine",
@@ -236,14 +249,17 @@
    "blocking_ipv6": "Blocage IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Télécharger .mobileconfig pour DNS-sur-HTTPS",
+    "download_mobileconfig_dot": "Télécharger .mobileconfig pour DNS-sur-TLS",
    "plain_dns": "DNS brut",
    "form_enter_rate_limit": "Entrez la limite de taux",
    "rate_limit": "Limite de taux",
    "edns_enable": "Activer le sous-réseau du client EDNS",
    "edns_cs_desc": "Si activé, AdGuard Home enverra les sous-réseaux des clients aux serveurs DNS.",
+    "rate_limit_desc": "Le nombre de requêtes par seconde qu’un seul client est autorisé à faire (le réglage 0 fait illimité)",
    "blocking_ipv4_desc": "Adresse IP à renvoyer pour une demande A bloquée",
    "blocking_ipv6_desc": "Adresse IP à renvoyer pour une demande AAAA bloquée",
-    "blocking_mode_default": "Par défaut : Répondre avec REFUSED lorsque bloqué par la règle de style Adblock; répondre avec l’adresse IP spécifiée dans la règle lorsque bloquée par la règle de style /etc/hosts",
+    "blocking_mode_default": "Par défaut : Répondre avec adresse IP zéro (0.0.0.0 pour A; :: pour AAAA) lorsque bloqué par la règle de style Adblock; répondre avec l’adresse IP spécifiée dans la règle lorsque bloquée par la règle du style /etc/hosts",
    "blocking_mode_refused": "REFUSED: Répondre avec le code REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN : Répondre avec le code NXDOMAIN",
    "blocking_mode_null_ip": "IP nulle : Répondre avec une adresse IP nulle (0.0.0.0 pour A; :: pour AAAA)",
@@ -321,6 +337,8 @@
    "encryption_https_desc": "Si le port HTTPS est configuré, l'interface administrateur de AdGuard Home sera accessible via HTTPS et fournira aussi un service DNS-over-HTTPS sur l'emplacement '/dns-query'.",
    "encryption_dot": "Port DNS-over-TLS",
    "encryption_dot_desc": "Si ce port est configuré, AdGuard Home exécutera un serveur DNS-over-TLS sur ce port.",
+    "encryption_doq": "Port DNS sur QUIC",
+    "encryption_doq_desc": "Si ce port est configuré, AdGuard Home exécutera un serveur DNS sur QUIC sur ce port. Ceci est expérimental et possiblement pas entièrement fiable. Peu de clients le prennent en charge actuellement.",
    "encryption_certificates": "Certificats",
    "encryption_certificates_desc": "Pour utiliser le chiffrement, vous devez fournir une chaîne de certificats SSL valide pour votre domaine. Vous pouvez en obtenir une gratuitement sur <0>{{link}}</0> ou vous pouvez en acheter une via les Autorités de Certification de confiance.",
    "encryption_certificates_input": "Copiez/coller vos certificats encodés PEM ici.",
@@ -399,7 +417,8 @@
    "dns_privacy": "Confidentialité DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS :</0> Utiliser le string <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS :</0> Utiliser le string <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Veuillez noter que les protocoles DNS chiffrés sont supportés que sur Android 9. Donc vous devez installer un logiciel complémentaire pour les autres systèmes opérationnels.</0><0>Voici une liste de logiciels que vous pouvez utiliser.</0>",
+    "setup_dns_privacy_3": "<0>Voici une liste de logiciels que vous pouvez utiliser.</0>",
+    "setup_dns_privacy_4": "Si vous utilisez un appareil sur iOS 14 ou macOS Big Sur, vous pouvez télécharger un fichier spécial '.mobileconfig' pour ajouter les serveurs <highlight>DNS-sur-HTTPS</highlight> ou <highlight>DNS-sur-TLS</highlight> aux configurations DNS.",
    "setup_dns_privacy_android_1": "Android 9 supporte nativement le DNS-over-TLS. Pour le configurer, allez dans Paramètres → Réseau et Internet → Avancés → DNS privé et saisissez votre nom de domaine ici.",
    "setup_dns_privacy_android_2": "<0>AdGuard pour Android</0> supporte le <1>DNS-over-HTTPS</1> et le <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> ajoute le support <1>DNS-over-HTTPS</1> sur Android.",
@@ -480,6 +499,7 @@
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Apprenez-en plus</0> à propos de la création de vos propres listes de blocage d’hôtes.",
    "blocked_by_response": "Bloqué par un CNAME ou une réponse IP",
+    "blocked_by_cname_or_ip": "Bloqué par CNAME ou adresse IP",
    "try_again": "Réessayer",
    "domain_desc": "Saisissez le nom de domaine ou le caractère générique que vous souhaitez réécrire.",
    "example_rewrite_domain": "réécrivez les réponses pour ce nom de domaine uniquement.",
@@ -511,6 +531,7 @@
    "check_reason": "Raison : {{reason}}",
    "check_rule": "Règle : {{rule}}",
    "check_service": "Nom du service : {{service}}",
+    "service_name": "Nom du service",
    "check_not_found": "Introuvable dans vos listes de filtres",
    "client_confirm_block": "Voulez-vous vraiment bloquer le client « {{ip}} »?",
    "client_confirm_unblock": "Voulez-vous vraiment débloquer le client « {{ip}} »?",
@@ -528,6 +549,7 @@
    "dnssec_enable": "Activer DNSSEC",
    "dnssec_enable_desc": "Définir l’indicateur DNSSEC dans les requêtes DNS sortantes et vérifier le résultat (résolveur compatible DNSSEC requis)",
    "validated_with_dnssec": "Validé avec DNSSEC",
+    "all_queries": "Toutes les requêtes",
    "show_blocked_responses": "Bloqué",
    "show_whitelisted_responses": "Ajouté à la liste blanche",
    "show_processed_responses": "Traité",
@@ -544,10 +566,12 @@
    "cache_size_desc": "Taille du cache DNS (en bytes)",
    "cache_ttl_min_override": "Remplacer le TTL minimum",
    "cache_ttl_max_override": "Remplacer le TTL maximum",
-    "enter_cache_size": "Entrer la taille du cache",
-    "enter_cache_ttl_min_override": "Entrez le TTL minimum",
-    "enter_cache_ttl_max_override": "Entrez le TTL maximum",
-    "cache_ttl_max_override_desc": "Remplacer la valeur TTL (maximale) reçue du serveur en amont",
+    "enter_cache_size": "Entrer la taille du cache (octets)",
+    "enter_cache_ttl_min_override": "Entrez le TTL minimum (secondes)",
+    "enter_cache_ttl_max_override": "Entrez le TTL maximum (secondes)",
+    "cache_ttl_min_override_desc": "Prolonger les valeurs courtes de durée de vie (en secondes) reçues du serveur en amont lors de la mise en cache des réponses DNS",
+    "cache_ttl_max_override_desc": "Établir la valeur de durée de vie TTL maximale (en secondes) pour les saisies dans le cache du DNS",
+    "ttl_cache_validation": "La valeur TTL minimale du cache doit être inférieure ou égale à la valeur maximale",
    "filter_category_general": "Général",
    "filter_category_security": "Sécurité",
    "filter_category_regional": "Régional",
@@ -556,6 +580,11 @@
    "filter_category_security_desc": "Listes spécialisées dans le blocage de logiciels malveillants, d’hameçonnage ou de domaines frauduleux",
    "filter_category_regional_desc": "Listes axées sur les annonces régionales et les serveurs de pistage",
    "filter_category_other_desc": "Autres listes noires",
+    "setup_config_to_enable_dhcp_server": "Configurer les paramètres pour activer le serveur DHCP",
+    "original_response": "Réponse originale",
    "click_to_view_queries": "Cliquez pour voir les requêtes",
-    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème."
+    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème.",
+    "adg_will_drop_dns_queries": "AdGuard Home ignorera toutes les requêtes DNS de ce client.",
+    "client_not_in_allowed_clients": "Le client n’est pas autorisé car il ne figure pas dans la liste « Clients autorisés ».",
+    "experimental": "Expérimental"
 }
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Postavke klijenta",
    "example_upstream_reserved": "VI možete odrediti DNS upstream-ove <0>za određene domene</0>",
+    "example_upstream_comment": "Možete odrediti komentar",
    "upstream_parallel": "Koristi paralelne upite kako bi ubrzali rješavanje istovremenim ispitavanjem svih upstream poslužitelja",
    "parallel_requests": "Paralelni zahtjevi",
    "load_balancing": "Load-balancing",
@@ -114,7 +115,7 @@
    "average_processing_time": "Prosječno vrijeme obrade",
    "average_processing_time_hint": "Prosječno vrijeme u milisekundama za obradu DNS zahtjeva",
    "block_domain_use_filters_and_hosts": "Blokiraj domene koristeći filtre ili hosts datoteke",
-    "filters_block_toggle_hint": "Pravila blokiranja možete postaviti u postavkama <a href='#filters'>filtara</a>.",
+    "filters_block_toggle_hint": "Pravila blokiranja možete postaviti u postavkama <a>filtara</a>.",
    "use_adguard_browsing_sec": "Koristi AdGuard uslugu zaštite pregledavanja",
    "use_adguard_browsing_sec_hint": "AdGuard Home će provjeriti nalazi li se domena na popisu nedopuštenih domena od usluge zaštite pregledavanja. Za provjeru će se koristiti API za provjeru koji poštuje vašu privatnost. Samo mali dio SHA256 hash-a od naziva domene se šalje poslužitelju.",
    "use_adguard_parental": "Koristi web uslugu AdGuard roditeljske zaštite",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Blokiranje IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Preuzmi .mobileconfig za DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Preuzmi .mobileconfig za DNS-over-TLS",
    "plain_dns": "Obični DNS",
    "form_enter_rate_limit": "Unesite ograničenje",
    "rate_limit": "Ograničenje",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu (postavljanje na 0 znači neograničeno)",
    "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve",
    "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve",
-    "blocking_mode_default": "Zadano: Odgovor s REFUSED kada je blokirano od Adblock sličnog pravila; odgovor s IP adresom definiranom u pravilu kada je blokirano od /etc/hosts sličnog pravila",
+    "blocking_mode_default": "Zadano: Odgovori s nultom IP adresom (0.0.0.0 za A; :: za AAAA) kada ga blokira Adblock slično pravilo; odgovorite s IP adresom definiranom u pravilu kada je blokirano od /etc/hosts sličnog pravila",
    "blocking_mode_refused": "REFUSED: Odgovorite s REFUSED kôdom",
    "blocking_mode_nxdomain": "NXDOMAIN: Odgovor s NXDOMAIN kôdom",
    "blocking_mode_null_ip": "Nuliran IP: Odgovor s nuliranom IP adresom (0.0.0.0 za A; :: za AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS privatnost",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Koristite <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Koristite <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Imajte na umu da su šifrirani DNS protokoli podržani samo na Androidu 9. Stoga morate instalirati dodatni program za ostale operativne sustave.</0><0>Evo popisa programa koje možete koristiti.</0>",
+    "setup_dns_privacy_3": "<0>Evo popisa programa koje možete koristiti.</0>",
+    "setup_dns_privacy_4": "Na iOS 14 ili macOS Big Sur uređaju možete preuzeti posebnu datoteku '.mobileconfig' koja dodaje <highlight>DNS-over-HTTPS</highlight> ili <highlight>DNS-over-TLS</highlight> poslužitelje u postavke DNS-a.",
    "setup_dns_privacy_android_1": "Android 9 nativno podržava DNS-over-TLS. Da biste ga postavili, idite na Postavke → Mreža i internet → Napredno → Privatni DNS i tamo unesite svoje naziv domene.",
    "setup_dns_privacy_android_2": "<0>AdGuard za Android</0> podržava <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> dodaje <1>DNS-over-HTTPS</1> podršku za Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Razlog: {{reason}}",
    "check_rule": "Pravilo: {{rule}}",
    "check_service": "Naziv usluge: {{service}}",
+    "service_name": "Naziv usluge",
    "check_not_found": "Nije pronađeno na vašoj listi filtara",
    "client_confirm_block": "Jeste li sigurni da želite blokirati \"{{ip}}\" klijenta?",
    "client_confirm_unblock": "Jeste li sigurni da želite odblokirati \"{{ip}}\" klijenta?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Veličina DNS predmemorije (u bajtovima)",
    "cache_ttl_min_override": "Nadjačaj minimum TTL-a",
    "cache_ttl_max_override": "Nadjačaj maksimum TTL-a",
-    "enter_cache_size": "Unesite veličinu predmemorije",
-    "enter_cache_ttl_min_override": "Unesite minimalni TTL",
-    "enter_cache_ttl_max_override": "Unesite maksimalni TTL",
-    "cache_ttl_min_override_desc": "Nadjačaj TTL vrijednost (minimum) dobivenu od upstream poslužitelja",
-    "cache_ttl_max_override_desc": "Nadjačaj TTL vrijednost (maksimum) dobivenu od upstream poslužitelja",
+    "enter_cache_size": "Unesite veličinu predmemorije (u bajtovima)",
+    "enter_cache_ttl_min_override": "Unesite minimalni TTL (u sekundama)",
+    "enter_cache_ttl_max_override": "Unesite maksimalni TTL (u sekundama)",
+    "cache_ttl_min_override_desc": "Povećajte kratke vrijednosti TTL-a (u sekundama) primljene od upstream poslužitelja prilikom predmemoriranja DNS odgovora",
+    "cache_ttl_max_override_desc": "Postavite maksimalnu vrijednost TTL-a (u sekundama) za zapise u DNS predmemoriju",
    "ttl_cache_validation": "Minimalna vrijednost TTL predmemorije mora biti manja ili jednaka maksimalnoj vrijednosti",
    "filter_category_general": "Općenito",
    "filter_category_security": "Sigurnost",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Kliknite za pregled upita",
    "port_53_faq_link": "Port 53 često zauzimaju usluge \"DNSStubListener\" ili \"systemd-resolved\". Molimo pročitajte <0>ove upute</0> o tome kako to riješiti.",
    "adg_will_drop_dns_queries": "AdGuard Home odbaciti će sve DNS upite od ovog klijenta.",
+    "client_not_in_allowed_clients": "Klijent nije dopušten jer nije na popisu \"Dopuštenih klijenata\".",
    "experimental": "Eksperimentalno"
 }
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -114,7 +114,7 @@
    "average_processing_time": "Átlagos feldolgozási idő",
    "average_processing_time_hint": "A DNS lekérdezések feldolgozásához szükséges átlagos idő milliszekundumban",
    "block_domain_use_filters_and_hosts": "Domainek blokkolása szűrők és hosztfájlok használatával",
-    "filters_block_toggle_hint": "A <a href='#filters'> szűrőbeállításoknál</a> megadhatja a blokkolási szabályokat.",
+    "filters_block_toggle_hint": "A <a> szűrőbeállításoknál</a> megadhatja a blokkolási szabályokat.",
    "use_adguard_browsing_sec": "Használja az AdGuard böngészési biztonság webszolgáltatását",
    "use_adguard_browsing_sec_hint": "Az AdGuard Home ellenőrzi, hogy a böngészési biztonsági modul a domaint tiltólistára tette-e. Az ellenőrzés elvégzéséhez egy adatvédelmet tiszteletben tartó API-t fog használni: a domain név egy rövid előtagját elküldi SHA256 kódolással a szerver felé.",
    "use_adguard_parental": "Használja az AdGuard szülői felügyelet webszolgáltatását",
@@ -247,7 +247,6 @@
    "edns_cs_desc": "Ha engedélyezve van, az AdGuard Home a kliensek alhálózatait küldi el a DNS-kiszolgálóknak.",
    "blocking_ipv4_desc": "A blokkolt A kéréshez visszaadandó IP-cím",
    "blocking_ipv6_desc": "A blokkolt AAAA kéréshez visszaadandó IP-cím",
-    "blocking_mode_default": "Alapértelmezés: Adblock-stílusú szabály esetén REFUSED válasz küldése, /etc/hosts-stílusú szabály esetén pedig a szabályban meghatározott IP-címmel való válasz küldése",
    "blocking_mode_nxdomain": "NXDOMAIN: Az NXDOMAIN kóddal fog válaszolni",
    "blocking_mode_null_ip": "Null IP: Nullákból álló IP-címmel válaszol (0.0.0.0 for A; :: for AAAA)",
    "blocking_mode_custom_ip": "Egyedi IP: Válasz egy kézzel beállított IP címmel",
@@ -402,7 +401,6 @@
    "dns_privacy": "DNS Adatvédelem",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Használja a(z) <1>{{address}}</1> szöveget.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Használja a(z) <1>{{address}}</1> szöveget.",
-    "setup_dns_privacy_3": "<0>Kérjük, vegye figyelembe, hogy a titkosított DNS protokollok csak Android 9-től vannak támogatva. Tehát további szoftvert kell telepítenie más operációs rendszerekhez.</0><0>Itt megtalálja azon szoftverek listáját, amelyeket használhat.</0>",
    "setup_dns_privacy_android_1": "Az Android 9 natív módon támogatja a DNS-over-TLS-t. A beállításához menjen a Beállítások → Hálózat & internet → Speciális → Privát DNS menübe, és adja meg itt a domaint.",
    "setup_dns_privacy_android_2": "Az <0>AdGuard for Android</0> támogatja a <1>DNS-over-HTTPS</1>-t és a <1>DNS-over-TLS</1>-t.",
    "setup_dns_privacy_android_3": "Az <0>Intra</0> hozzáadja a <1>DNS-over-HTTPS</1> támogatást az Androidhoz.",
@@ -547,10 +545,6 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "Gyorsítótár mérete",
    "cache_size_desc": "DNS gyorsítótár mérete (bájtokban)",
-    "enter_cache_size": "Adja meg a gyorsítótár méretét",
-    "enter_cache_ttl_min_override": "Adja meg a minimális TTL-t",
-    "enter_cache_ttl_max_override": "Adja meg a maximális TTL-t",
-    "cache_ttl_max_override_desc": "Felülbírálja az upstream kiszolgálótól kapott (maximális) TTL értéket",
    "filter_category_general": "Általános",
    "filter_category_security": "Biztonság",
    "filter_category_regional": "Regionális",
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Pengaturan klien",
    "example_upstream_reserved": "Anda dapat menetapkan DNS upstream <0>untuk domain spesifik</0>",
+    "example_upstream_comment": "Anda dapat menentukan komentar",
    "upstream_parallel": "Gunakan kueri paralel untuk mempercepat resoluasi dengan menanyakan semua server upstream secara bersamaan",
    "parallel_requests": "Permintaan paralel",
    "load_balancing": "Penyeimbang beban",
@@ -114,7 +115,7 @@
    "average_processing_time": "Rata-rata waktu pemrosesan",
    "average_processing_time_hint": "Rata-rata waktu dalam milidetik untuk pemrosesan sebuah permintaan DNS",
    "block_domain_use_filters_and_hosts": "Blokir domain menggunakan filter dan file hosts",
-    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran di pengaturan <a href='#filters'>Penyaringan</a>.",
+    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran di pengaturan <a>Penyaringan</a>.",
    "use_adguard_browsing_sec": "Gunakan layanan web Keamanan Penjelajahan AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home akan mengecek jika domain diblacklist oleh layanan web keamanan penjelajahan. Akan menggunakan lookup API yang ramah privasi untuk melakukan cek: hanya awalan singkat hash SHA256 dari nama domain yang dikirim ke server.",
    "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
@@ -132,6 +133,8 @@
    "encryption_settings": "Pengaturan enkripsi",
    "dhcp_settings": "Pengaturan DHCP",
    "upstream_dns": "Server DNS hulu",
+    "upstream_dns_help": "Masukkan alamat server per baris. <a>Pelajari lebih</a> mengenai konfigurasi upstream server DNS.",
+    "upstream_dns_configured_in_file": "Diatur dalam {{path}}",
    "test_upstream_btn": "Uji hulu",
    "upstreams": "Upstream",
    "apply_btn": "Terapkan",
@@ -185,6 +188,7 @@
    "example_upstream_regular": "DNS reguler (melalui UDP)",
    "example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>",
    "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "anda bisa menggunakan <0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "DNS reguler (melalui TCP)",
    "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
@@ -193,6 +197,10 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
    "unblock": "Buka Blokir",
    "block": "Blok",
+    "disallow_this_client": "Cabut ijin untuk klien ini",
+    "allow_this_client": "Ijinkan klien ini",
+    "block_for_this_client_only": "Blok hanya untuk klien ini",
+    "unblock_for_this_client_only": "Jangan diblok hanya untuk klien ini",
    "time_table_header": "Waktu",
    "date": "Tanggal",
    "domain_name_table_header": "Nama domain",
@@ -234,20 +242,25 @@
    "blocking_mode": "Mode blokir",
    "default": "Standar",
    "nxdomain": "NXDOMAIN",
+    "refused": "DITOLAK",
    "null_ip": "Null IP",
    "custom_ip": "Custom IP",
    "blocking_ipv4": "Blokiran IPv4",
    "blocking_ipv6": "Blokiran IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Unduh .mobileconfig untuk DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Unduh .mobileconfig untuk DNS-over-TLS",
    "plain_dns": "Plain DNS",
    "form_enter_rate_limit": "Masukkan batas nilai",
    "rate_limit": "Batas nilai",
    "edns_enable": "Aktifkan EDNS Klien Subnet",
    "edns_cs_desc": "Apabila dinyalakan, AdGuard Home akan mengirim subnet klien ke server-server DNS.",
+    "rate_limit_desc": "Jumlah permintaan per detik yang diperbolehkan untuk satu klien (atur ke 0 untuk tidak terbatas)",
    "blocking_ipv4_desc": "Alamat IP akan dikembalikan untuk permintaan A yang diblokir",
    "blocking_ipv6_desc": "Alamat IP akan dipulihkan untuk permintaan AAAA yang diblokir",
-    "blocking_mode_default": "Standar: Respon pakai REFUSED saat diblokir oleh aturan gaya Adblock; membalas dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh /et /aturan hosts-style",
+    "blocking_mode_default": "Default: Tanggapi dengan alamat IP nol (0.0.0.0 untuk A; :: untuk AAAA) saat diblokir oleh aturan gaya Adblock; tanggapi dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh aturan gaya host /etc/",
+    "blocking_mode_refused": "DITOLAK: Respon dengan kode DITOLAK",
    "blocking_mode_nxdomain": "NXDOMAIN: Respon pakai kode NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: Respon pakai alamat IP kosong (0.0.0.0 untuk A; :: untuk AAAA)",
    "blocking_mode_custom_ip": "IP kustom: respon dengan alamat IP yang diset secara manual",
@@ -324,6 +337,8 @@
    "encryption_https_desc": "Jika port HTTPS dikonfigurasi, antarmuka admin Home AdGuard akan dapat diakses melalui HTTPS, dan itu juga akan memberikan DNS-over-HTTPS di lokasi '/ dns-query'.",
    "encryption_dot": "Port DNS-over-TLS",
    "encryption_dot_desc": "Jika port ini terkonfigurasi, AdGuard Home akan menjalankan server DNS-over-TLS dalam port ini",
+    "encryption_doq": "Port DNS-lewat-QUIC",
+    "encryption_doq_desc": "Jika port ini diatur secara sepesifik, AdGuard Home akan menjalankan server DNS-lewat-QUIC pada port ini. Ini adalah eksperimental dan mungkin tidak dapat diandalkan. Juga, tidak banyak klien yang mendukungnya saat ini.",
    "encryption_certificates": "Sertifikat",
    "encryption_certificates_desc": "Untuk menggunakan enkripsi, Anda perlu memberikan rantai sertifikat SSL yang valid untuk domain Anda. Anda bisa mendapatkan sertifikat gratis di <0>{{link}}</0> atau Anda dapat membelinya dari salah satu Otoritas Sertifikat tepercaya.",
    "encryption_certificates_input": "Salin / rekatkan sertifikat PEM yang disandikan di sini.",
@@ -402,7 +417,8 @@
    "dns_privacy": "DNS Privasi",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Harap dicatat bahwa protokol DNS terenkripsi hanya didukung pada Android 9. Jadi Anda perlu memasang perangkat lunak tambahan untuk sistem operasi lain.</0><0>Berikut daftar perangkat lunak yang dapat Anda gunakan.</0>",
+    "setup_dns_privacy_3": "<0>Berikut daftar perangkat lunak yang dapat Anda gunakan.</0>",
+    "setup_dns_privacy_4": "Di perangkat iOS 14 atau macOS Big Sur, Anda dapat mengunduh file '.mobileconfig' khusus yang menambahkan server <highlight>DNS-over-HTTPS</highlight> atau <highlight>DNS-over-TLS</highlight> ke pengaturan DNS.",
    "setup_dns_privacy_android_1": "Android 9 mendukung DNS-over-TLS secara asli. Untuk mengkonfigurasinya, buka Pengaturan → Jaringan & internet → Tingkat Lanjut → DNS Pribadi dan masukkan nama domain Anda di sana.",
    "setup_dns_privacy_android_2": "<0>AdGuard untuk Android</0> mendukung <1>DNS-over-HTTPS</1> dan <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> menambahkan dukungan <1>DNS-over-HTTPS</1> untuk Android.",
@@ -515,6 +531,7 @@
    "check_reason": "Alasan: {{reason}}",
    "check_rule": "Aturan: {{rule}}",
    "check_service": "Nama layanan: {{service}}",
+    "service_name": "Nama layanan",
    "check_not_found": "Tidak di temukan di daftar penyaringan anda",
    "client_confirm_block": "Apa anda yakin ingin mem-blokir klien ini \"{{ip}}\"?",
    "client_confirm_unblock": "Apa anda yakin ingin meng-unblock klien ini \"{{ip}}\"?",
@@ -549,10 +566,12 @@
    "cache_size_desc": "Ukuran DNS cache (dalam bit)",
    "cache_ttl_min_override": "Tumpuk TTL minimum",
    "cache_ttl_max_override": "Tumpuk TTL maksimum",
-    "enter_cache_size": "Masukkan ukuran cache",
-    "enter_cache_ttl_min_override": "Masukkan TTL minimum",
-    "enter_cache_ttl_max_override": "Masukkan TTL maksimum",
-    "cache_ttl_max_override_desc": "Ganti nilai TTL (maksimum) yang diterima dari server upstream",
+    "enter_cache_size": "Masukkan ukuran cache (bytes)",
+    "enter_cache_ttl_min_override": "Masukkan TTL minimum (detik)",
+    "enter_cache_ttl_max_override": "Masukkan TTL maksimum (detik)",
+    "cache_ttl_min_override_desc": "Perpanjang nilai waktu-online singkat (detik) yang diterima dari server upstream saat menyimpan respons DNS",
+    "cache_ttl_max_override_desc": "Tetapkan nilai waktu-online maksimum (detik) untuk entri di cache DNS",
+    "ttl_cache_validation": "Nilai TTL cache minimum harus kurang dari atau sama dengan nilai maksimum",
    "filter_category_general": "Umum",
    "filter_category_security": "Keamanan",
    "filter_category_regional": "Wilayah",
@@ -564,5 +583,8 @@
    "setup_config_to_enable_dhcp_server": "Setel konfigurasi untuk aktifkan server DHCP",
    "original_response": "Respon asli",
    "click_to_view_queries": "Klik untuk lihat permintaan",
-    "port_53_faq_link": "Port 53 sering ditempati oleh layanan \"DNSStubListener\" atau \"systemd-resolved\". Silakan baca <0>instruksi ini</0> tentang cara menyelesaikan ini."
+    "port_53_faq_link": "Port 53 sering ditempati oleh layanan \"DNSStubListener\" atau \"systemd-resolved\". Silakan baca <0>instruksi ini</0> tentang cara menyelesaikan ini.",
+    "adg_will_drop_dns_queries": "AdGuard Home akan menghapus semua permintaan DNS dari klien ini.",
+    "client_not_in_allowed_clients": "Klien tidak diizinkan karena tidak ada dalam daftar \"Klien yang diizinkan\".",
+    "experimental": "Eksperimental"
 }
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -1,12 +1,13 @@
 {
    "client_settings": "Impostazioni client",
    "example_upstream_reserved": "Puoi specificare un server DNS<0>per uno specifico dominio(i)</0>",
+    "example_upstream_comment": "Puoi specificare il commento",
    "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server",
    "parallel_requests": "Richieste parallele",
    "load_balancing": "Bilanciamento del carico",
    "load_balancing_desc": "Interroga un server per volta. AdGuard Home utilizzerà un algoritmo casuale per la selezione del server, in maniera tale da propendere il maggior numero di volte per quello più veloce.",
-    "bootstrap_dns": "Server DNS di avvio",
-    "bootstrap_dns_desc": "Server DNS utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
+    "bootstrap_dns": "Server DNS bootstrap",
+    "bootstrap_dns_desc": "Server DNS bootstrap sono utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
    "check_dhcp_servers": "Controlla la presenza di server DHCP",
    "save_config": "Salva configurazione",
    "enabled_dhcp": "Server DHCP attivo",
@@ -114,7 +115,7 @@
    "average_processing_time": "Tempo di elaborazione medio",
    "average_processing_time_hint": "Tempo medio in millisecondi per elaborare una richiesta DNS",
    "block_domain_use_filters_and_hosts": "Blocca domini utilizzando filtri e file hosts",
-    "filters_block_toggle_hint": "Puoi impostare le regole di blocco nelle impostazioni dei <a href='#filters'>Filtri</a>.",
+    "filters_block_toggle_hint": "Puoi impostare le regole di blocco nelle impostazioni dei <a>Filtri</a>.",
    "use_adguard_browsing_sec": "Utilizza il servizio web AdGuard \"sicurezza di navigazione\"",
    "use_adguard_browsing_sec_hint": "AdGuard Home verificherà se il dominio è stato bloccato dal servizio web \"sicurezza di navigazione\". Per eseguire il controllo utilizzerà delle API privacy-friendly: verrà inviato al server solo un breve prefisso dell'hash SHA256 del nome del dominio.",
    "use_adguard_parental": "Utilizza il Controllo Parentale di AdGuard",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Blocca IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Scarica .mobileconfig per DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Scarica .mobileconfig per DNS-over-TLS",
    "plain_dns": "DNS semplice",
    "form_enter_rate_limit": "Imposta limite delle richieste",
    "rate_limit": "Limite delle richieste",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Il numero di richieste al secondo che un singolo client può fare (0: illimitato)",
    "blocking_ipv4_desc": "Indirizzo IP per una richiesta DNS IPv4 bloccata",
    "blocking_ipv6_desc": "Indirizzo IP restituito per una richiesta DNS IPv6 bloccata",
-    "blocking_mode_default": "Predefinito: Rispondi con REFUSED quando bloccato da una regola di blocco annunci; rispondi con l'indirizzo IP specificato nella regola quando bloccato dalla regola / etc / hosts-style",
+    "blocking_mode_default": "Predefinito: Rispondi con IP address zero (0.0.0.0 per A; :: per AAAA) quando bloccato da una regola di blocco annunci; rispondi con l'indirizzo IP specificato nella regola quando bloccato dalla regola /etc/hosts-style",
    "blocking_mode_refused": "REFUSED: Risposta con codice di REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Rispondi con il codice NXDOMAIN",
    "blocking_mode_null_ip": "IP nullo: Rispondi con indirizzo IP zero (0.0.0.0 per A; :: per AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "Privacy DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Utilizza la stringa <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Utilizza la stringa <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Nota che i protocolli DNS crittografati sono supportati solo su Android 9. Quindi è necessario installare software aggiuntivo per altri sistemi operativi.</0><0>Ecco un elenco di software che è possibile utilizzare.</0>",
+    "setup_dns_privacy_3": "<0>Ecco un elenco di software che è possibile utilizzare.</0>",
+    "setup_dns_privacy_4": "Si usa un dispositivo iOS 14 o macOS Big Sur puoi scaricare uno file speciale.mobileconfig' che aggiunge i server <highlight>DNS-over-HTTPS</highlight> or <highlight>DNS-over-TLS</highlight> alle configurazioni DNS.",
    "setup_dns_privacy_android_1": "Android 9 supporta DNS-over-TLS in modo nativo. Per configurarlo, vai su Impostazioni → Rete e Internet → Avanzate → DNS privato e inserisci qui il tuo nome di dominio.",
    "setup_dns_privacy_android_2": "<0>AdGuard per Android</0> supporta <1>DNS-over-HTTPS</1> e <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> aggiunge <1>DNS-over-HTTPS</1> il supporto ad Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Motivo: {{reason}}",
    "check_rule": "Regola: {{rule}}",
    "check_service": "Nome servizio: {{service}}",
+    "service_name": "Nome servizio",
    "check_not_found": "Non trovato negli elenchi dei filtri",
    "client_confirm_block": "Sei sicuro di voler bloccare il client \"{{ip}}\"?",
    "client_confirm_unblock": "Sei sicuro di voler sbloccare il client \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Dimensioni cache DNS (in byte)",
    "cache_ttl_min_override": "Sovrascrivi TTL minimo",
    "cache_ttl_max_override": "Sovrascrivi TTL massimo",
-    "enter_cache_size": "Immetti dimensioni cache",
-    "enter_cache_ttl_min_override": "Immetti TTL minimo",
-    "enter_cache_ttl_max_override": "Immetti TTL massimo",
-    "cache_ttl_min_override_desc": "Sovrascrivi il valore TTL (minimo) ricevuto dall'upstream del server",
-    "cache_ttl_max_override_desc": "Sovrascrivi valore TTL (massimo) ricevuto dall'upstream del server",
+    "enter_cache_size": "Immetti dimensioni cache (in byte)",
+    "enter_cache_ttl_min_override": "Immetti TTL minimo (in secondi)",
+    "enter_cache_ttl_max_override": "Immetti TTL massimo (in secondi)",
+    "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
+    "cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
    "ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
    "filter_category_general": "Generali",
    "filter_category_security": "Sicurezza",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Clicca per visualizzare le richieste",
    "port_53_faq_link": "La Porta 53 è spesso occupata dai servizi \"DNSStubListener\" o \"systemd-resolved\". Si prega di leggere <0>queste istruzioni</0> per risolvere il problema.",
    "adg_will_drop_dns_queries": "AdGuard Home eliminerà tutte le richieste DNS da questo client.",
+    "client_not_in_allowed_clients": "Il client non è consentito perché non è nell'elenco \"Client consentiti\".",
    "experimental": "Sperimentale"
 }
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -114,7 +114,7 @@
    "average_processing_time": "平均処理時間",
    "average_processing_time_hint": "DNSリクエストの処理にかかる平均時間（ミリ秒単位）",
    "block_domain_use_filters_and_hosts": "フィルタとhostsファイルを使用してドメインをブロックする",
-    "filters_block_toggle_hint": "<a href='#filters'>フィルタ</a>の設定でブロックするルールを設定することができます。",
+    "filters_block_toggle_hint": "<a>フィルタ</a>の設定でブロックするルールを設定することができます。",
    "use_adguard_browsing_sec": "AdGuardブラウジングセキュリティ・ウェブサービスを使用する",
    "use_adguard_browsing_sec_hint": "AdGuard Homeは、ブラウジングセキュリティ・ウェブサービスによってドメインがブラックリストに登録されているかどうかを確認します。 これはプライバシーを考慮したAPIを使用してチェックを実行します。ドメイン名SHA256ハッシュの短いプレフィックスのみがサーバに送信されます。",
    "use_adguard_parental": "AdGuardペアレンタルコントロール・ウェブサービスを使用する",
@@ -256,7 +256,7 @@
    "rate_limit_desc": "単一のクライアントに対して許可される1秒あたりのリクエスト数（「0」に設定すると無制限になります）",
    "blocking_ipv4_desc": "ブロックされたAリクエストに対して応答されるIPアドレス",
    "blocking_ipv6_desc": "ブロックされたAAAAリクエストに対して応答されるIPアドレス",
-    "blocking_mode_default": "デフォルト：Adblockスタイルのルールによってブロックされると、REFUSEDで応答します。 /etc/hostsスタイルのルールによってブロックされると、ルールで指定されたIPアドレスで応答します",
+    "blocking_mode_default": "デフォルト：Adblock系ルールによってブロックされると、ゼロIPアドレス（Aに対しては「0.0.0.0」、AAAAに対しては「::」）で応答します。/etc/hosts系ルールによってブロックされると、ルールにて指定されているIPアドレスで応答します。",
    "blocking_mode_refused": "REFUSED: 「REFUSED」コードで応答します",
    "blocking_mode_nxdomain": "NXDOMAIN：NXDOMAINコードで応答します",
    "blocking_mode_null_ip": "Null IP：ゼロのIPアドレスで応答します（Aの場合は0.0.0.0; AAAAの場合は::）",
@@ -414,7 +414,7 @@
    "dns_privacy": "DNSプライバシー",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1>という文字列を使用してください。",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1>という文字列を使用してください。",
-    "setup_dns_privacy_3": "<0>暗号化されたDNSプロトコルはAndroid 9でのみサポートされていることに注意してください。そのため、他のオペレーティングシステムでは追加のソフトウェアをインストールする必要があります。</0> <0>使用できるソフトウェアの一覧です。</0>",
+    "setup_dns_privacy_4": "iOS 14 または macOS Big Sur デバイスにて、<highlight>DNS-over-HTTPS</highlight>または<highlight>DNS-over-TLS</highlight>サーバをDNS設定へ追加する特別な「.mobileconfig」ファイルをダウンロードできます。",
    "setup_dns_privacy_android_1": "Android 9はDNS-over-TLSをネイティブにサポートします。設定するには、設定 → ネットワークとインターネット → 詳細設定 → プライベートDNS へ遷移し、そこにドメイン名を入力してください。",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0>は、<1>DNS-over-HTTPS</1>と<1>DNS-over-TLS</1>をサポートしています。",
    "setup_dns_privacy_android_3": "<0>Intra</0>は、Androidに<1>DNS-over-HTTPS</1>サポートを追加します。",
@@ -510,7 +510,7 @@
    "fastest_addr_desc": "すべてのDNSサーバーを照会し、全応答の中で最速のIPアドレスを返します",
    "autofix_warning_text": "\"改善\"をクリックすると、AdGuardHomeはAdGuardHome DNSサーバを使用するようにシステムを構成します。",
    "autofix_warning_list": "次のタスクを実行します：<0>システムDNSStubListenerを非アクティブ化します</0> <0>DNSサーバのアドレスを127.0.0.1に設定します</0> <0>/etc/resolv.confのシンボリックリンクの対象を/run/systemd/resolve/resolv.confに置換します</0> <0>DNSStubListenerを停止します（systemd-resolvedサービスをリロードします）</0>",
-    "autofix_warning_result": "その結果、システムからのすべてのDNS要求は、デフォルトでAdGuardHomeによって処理されます。",
+    "autofix_warning_result": "その結果、システムからのすべてのDNSリクエストは、デフォルトでAdGuard Homeによって処理されます。",
    "tags_title": "タグ",
    "tags_desc": "クライアントに対応するタグを選択できます。タグはフィルタリングルールに含めることができ、より正確に適用できます。 <0>詳細</0>",
    "form_select_tags": "クライアントのタグを選択する",
@@ -561,11 +561,6 @@
    "cache_size_desc": "DNSキャッシュサイズ（バイト単位）",
    "cache_ttl_min_override": "最小TTLの上書き（秒単位）",
    "cache_ttl_max_override": "最大TTLの上書き（秒単位）",
-    "enter_cache_size": "キャッシュサイズを入力してください",
-    "enter_cache_ttl_min_override": "最小TTLを入力してください",
-    "enter_cache_ttl_max_override": "最大TTLを入力してください",
-    "cache_ttl_min_override_desc": "アップストリームサーバから受信したTTL値（最小値）をオーバーライドする",
-    "cache_ttl_max_override_desc": "上流サーバから受信したTTL値（最大）を上書き。",
    "ttl_cache_validation": "最小キャッシュTTL値は最大値以下にする必要があります",
    "filter_category_general": "一般",
    "filter_category_security": "セキュリティ",
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "클라이언트 설정",
    "example_upstream_reserved": "<0>특정 도메인에 대한</0> DNS 업스트림을 지정할 수 있습니다.",
+    "example_upstream_comment": "설명을 맞춤 지정할 수 있습니다.",
    "upstream_parallel": "쿼리 처리 속도를 높이려면 모든 업스트림 서버에서 동시에 병렬 쿼리를 사용해주세요.",
    "parallel_requests": "병렬 처리 요청",
    "load_balancing": "로드 밸런싱",
@@ -114,7 +115,7 @@
    "average_processing_time": "평균처리 시간",
    "average_processing_time_hint": "DNS 요청 처리시 평균 시간(밀리초)",
    "block_domain_use_filters_and_hosts": "필터 및 호스트 파일을 사용하여 도메인 차단",
-    "filters_block_toggle_hint": "차단규칙<a href='#filters'>필터</a>을 설정할 수 있습니다.",
+    "filters_block_toggle_hint": "차단규칙<a>필터</a>을 설정할 수 있습니다.",
    "use_adguard_browsing_sec": "AdGuard 브라우징 보안 웹 서비스 사용",
    "use_adguard_browsing_sec_hint": "AdGuard Home은 개인정보를 보호하는 API를 사용하여 브라우징 보안 웹 서비스를 통해 도메인이 블랙리스트에 올라 있는지 확인합니다. 참고: 도메인 이름의 SHA256 해시의 짧은 접두사만 서버로 전송됩니다.",
    "use_adguard_parental": "AdGuard 자녀 보호 웹 서비스 사용",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "IPv6 차단",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "DNS-over-HTTPS용 .mobileconfig 다운로드",
+    "download_mobileconfig_dot": "DNS-over-TLS용 .mobileconfig 다운로드",
    "plain_dns": "평문 DNS",
    "form_enter_rate_limit": "한도 제한 입력하기",
    "rate_limit": "한도 제한",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "단일 클라이언트에서 허용 가능한 초 당 요청 생성 숫자 (0: 무제한)",
    "blocking_ipv4_desc": "차단된 A 요청에 대해서 반환할 IP 주소",
    "blocking_ipv6_desc": "차단된 AAAA 요청에 대해서 반환할 IP 주소",
-    "blocking_mode_default": "기본: Adblock 스타일 규칙에 의해 차단되면 REFUSED으로 응답합니다; /etc/hosts 스타일 규칙에 의해 차단되면 규칙에 정의된 IP 주소로 응답합니다",
+    "blocking_mode_default": "기본: Adblock 스타일 규칙에 의해 차단되면 제로 IP 주소(A는 0.0.0.0; AAAA는 ::)로 응답합니다; /etc/hosts 스타일 규칙에 의해 차단되면 규칙에 정의된 IP 주소로 응답합니다",
    "blocking_mode_refused": "REFUSED: REFUSED 코드로 응답",
    "blocking_mode_nxdomain": "NXDOMAIN: NXDOMAIN 코드로 응답",
    "blocking_mode_null_ip": "Null IP: 제로 IP 주소 (A는 0.0.0.0; AAAA는 ::) 로 응답합니다",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS 프라이버시",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> 사용하세요.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> 사용하세요.",
-    "setup_dns_privacy_3": "<0>암호화된 DNS 프로토콜은 Android 9에서만 지원됩니다. 다른 운영 체제를 위한 추가 소프트웨어를 설치해야 합니다.</0><0>사용할 수 있는 소프트웨어 목록입니다. </0>",
+    "setup_dns_privacy_3": "<0>사용할 수 있는 소프트웨어는 다음과 같습니다.</0>",
+    "setup_dns_privacy_4": "iOS 14 또는 macOS Big Sur 기기에서 DNS 설정에 <highlight>DNS-over-HTTPS</highlight> 또는 <highlight>DNS-over-TLS</highlight> 서버를 추가하는 특수 '.mobileconfig' 파일을 다운로드할 수 있습니다.",
    "setup_dns_privacy_android_1": "Android 9는 기본적으로 DNS-over-TLS를 지원합니다. 구성하려면 설정 → 네트워크 및 인터넷 → 고급 → 개인 DNS로 이동하여 도메인 이름을 입력하세요.",
    "setup_dns_privacy_android_2": "<0>Android용 AdGuard</0>DNS-over-HTTPS <1>및</1> DNS-over-TLS <1>지원합니다</1>",
    "setup_dns_privacy_android_3": "<0>인트라</0> 안드로이드에 <1>DNS-over-HTTPS </1>지원 추가합니다.",
@@ -527,6 +531,7 @@
    "check_reason": "이유: {{reason}}",
    "check_rule": "규칙: {{rule}}",
    "check_service": "서비스 이름: {{service}}",
+    "service_name": "서비스 이름",
    "check_not_found": "필터 목록에서 찾을 수 없음",
    "client_confirm_block": "정말로 클라이언트 \"{{ip}}\"을(를) 차단하시겠습니까?",
    "client_confirm_unblock": "정말로 클라이언트 \"{{ip}}\"의 차단을 해제하시겠습니까?",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "쿼리를 보려면 클릭합니다",
    "port_53_faq_link": "53번 포트는 보통 \"DNSStubListener\"나 \"systemd-resolved\" 서비스가 이미 사용하고 있습니다. 이 문제에 대한 해결 방법을 <0>설명</0>에서 찾아보세요.",
    "adg_will_drop_dns_queries": "AdGuard Home은 이 클라이언트에서 모든 DNS 쿼리를 삭제합니다.",
+    "client_not_in_allowed_clients": "이 클라이언트는 허용된 클라이언트 목록에 없으므로 허용되지 않습니다.",
    "experimental": "실험"
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -1,6 +1,7 @@
 {
-    "client_settings": "cliënt Instellingen",
+    "client_settings": "Cliënt Instellingen",
    "example_upstream_reserved": "Je kan DNS upstream <0>specifiëren voor specifieke domein(en)</0>",
+    "example_upstream_comment": "Het commentaar kan gespecificeerd worden",
    "upstream_parallel": "Gebruik parallelle verzoeken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers",
    "parallel_requests": "Parallelle verzoeken",
    "load_balancing": "Volume balanceren",
@@ -114,7 +115,7 @@
    "average_processing_time": "Gemiddelde procestijd",
    "average_processing_time_hint": "Gemiddelde verwerkingstijd in milliseconden van een DNS aanvraag",
    "block_domain_use_filters_and_hosts": "Blokkeerd domeinen dmv filters en host bestanden",
-    "filters_block_toggle_hint": "Je kunt blokkeer regels toevoegen in de <a href='#filters'>Filters</a>instellingen",
+    "filters_block_toggle_hint": "Je kan blokkeringsregels toevoegen in de <a>Filters</a> instellingen.",
    "use_adguard_browsing_sec": "Gebruik AdGuardBrowsing Security web service",
    "use_adguard_browsing_sec_hint": "AdGuard Home controleert of het domein in de blokkeerlijst voorkomt dmv Browsing Security web service. Dit gebeurt dmv een privacy vriendelijk API verzoek:een korte prefix van de domein naam met SHA256 hash wordt verzonden naar de server.",
    "use_adguard_parental": "Gebruik AdGuard Ouderlijk toezicht web service",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Blokkeren IP6",
    "dns_over_https": "DNS-via-HTTPS",
    "dns_over_tls": "DNS-via-TLS",
+    "download_mobileconfig_doh": ".mobileconfig voor DNS-via-HTTPS downloaden",
+    "download_mobileconfig_dot": ".mobileconfig voor DNS-via-TLS downloaden",
    "plain_dns": "Gewone DNS",
    "form_enter_rate_limit": "Voer ratio limiet in",
    "rate_limit": "Ratio limiet",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0 betekent onbeperkt)",
    "blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
    "blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
-    "blocking_mode_default": "Standaard: Reageer met REFUSED wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
+    "blocking_mode_default": "Standaard: Reageer met een nul IP adres (0.0.0.0 for A; :: voor AAAA) wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer geblokkeerd door een /etc/hosts type regel",
    "blocking_mode_refused": "REFUSED: Antwoorden met REFUSED code",
    "blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
    "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
@@ -415,6 +418,7 @@
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Gebruik <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
    "setup_dns_privacy_3": "<0>Hou er rekening mee dat het beveiligde DNS protocol alleen beschikbaar is voor Android 9. U moet dus extra software installeren voor andere besturingssystemen.</0><0>Hier is een lijst van te gebruiken software.</0>",
+    "setup_dns_privacy_4": "Op een iOS 14 of macOS Big Sur apparaat kan je een speciaal '.mobileconfig'-bestand downloaden dat <highlight>DNS-via-HTTPS</highlight> of <highlight>DNS-via-TLS</highlight> servers aan de DNS-instellingen toevoegt.",
    "setup_dns_privacy_android_1": "Android 9 ondersteunt native DNS-over-TLS. Om het te configureren, ga naar Instellingen → Netwerk & internet → Geavanceerd → Privé DNS en voer daar uw domeinnaam in.",
    "setup_dns_privacy_android_2": "<0>AdGuard voor Android</0>ondersteunt<1>DNS-over-HTTPS </1>en<1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0> Intra </0> voegt <1> DNS-over-HTTPS</1> ondersteuning toe aan Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Reden: {{reason}}",
    "check_rule": "Regel: {{rule}}",
    "check_service": "Servicenaam: {{service}}",
+    "service_name": "Naam service",
    "check_not_found": "Niet in je lijst met filters gevonden",
    "client_confirm_block": "Weet je zeker dat je client \"{{ip}}\" wil blokkeren?",
    "client_confirm_unblock": "Weet je zeker dat je client \"{{ip}}\" niet meer wil blokkeren?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "DNS cache grootte (in bytes)",
    "cache_ttl_min_override": "Minimale TTL overschrijven",
    "cache_ttl_max_override": "Maximale TTL overschrijven",
-    "enter_cache_size": "Cache grootte invoeren",
-    "enter_cache_ttl_min_override": "Minimale TTL invoeren",
-    "enter_cache_ttl_max_override": "Maximale TTL invoeren",
-    "cache_ttl_min_override_desc": "Overschrijf de TTL waarde (minimum) ontvangen van de upstream server",
-    "cache_ttl_max_override_desc": "Overschrijft TTL waarde (maximaal) ontvangen van de upstream server",
+    "enter_cache_size": "Cache grootte invoeren (bytes)",
+    "enter_cache_ttl_min_override": "Minimum TTL invoeren (seconden)",
+    "enter_cache_ttl_max_override": "Maximum TTL invoeren (seconden)",
+    "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
+    "cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
    "ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
    "filter_category_general": "Algemeen",
    "filter_category_security": "Beveiliging",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Klik om queries te bekijken",
    "port_53_faq_link": "Poort 53 wordt vaak gebruikt door services als DNSStubListener- of de systeem DNS-resolver. Lees a.u.b. <0>deze instructie</0> hoe dit is op te lossen.",
    "adg_will_drop_dns_queries": "AdGuard Home zal alle DNS verzoeken van deze toepassing/dit systeem negeren.",
+    "client_not_in_allowed_clients": "De toepassing is niet toegestaan omdat deze niet in de lijst \"Toegestane toepassingen\" voorkomt.",
    "experimental": "Experimenteel"
 }
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -114,7 +114,7 @@
    "average_processing_time": "Gjennomsnittlig behandlingstid",
    "average_processing_time_hint": "Gjennomsnittstid for behandling av DNS-forespørsler i millisekunder",
    "block_domain_use_filters_and_hosts": "Blokker domener ved hjelp av filtre, «hosts»-filer, og rå domener",
-    "filters_block_toggle_hint": "Du kan sette opp blokkeringsoppføringer i <a href='#filters'>Filtre</a>-innstillingene.",
+    "filters_block_toggle_hint": "Du kan sette opp blokkeringsoppføringer i <a>Filtre</a>-innstillingene.",
    "use_adguard_browsing_sec": "Benytt AdGuard sin nettlesersikkerhetstjeneste",
    "use_adguard_browsing_sec_hint": "AdGuard Home vil sjekke om domenet har blitt svartelistet av nettlesersikkerhetstjenesten. Den vil bruke en privatlivsvennlig søke-API til å utføre sjekken: kun en kort prefiks av domenenavnet med SHA256-salting blir sendt til tjeneren.",
    "use_adguard_parental": "Benytt AdGuard sin foreldrekontroll-nettjeneste",
@@ -132,6 +132,7 @@
    "encryption_settings": "Krypteringsinnstillinger",
    "dhcp_settings": "DHCP-innstillinger",
    "upstream_dns": "Oppstrøms-DNS-tjenere",
+    "upstream_dns_help": "Skriv inn tjeneradresser, én per linje. <a>Lær mer</a> om å konfigurere oppstrøms-DNS-tjenere.",
    "upstream_dns_configured_in_file": "Satt opp i {{path}}",
    "test_upstream_btn": "Test oppstrømstilkoblinger",
    "upstreams": "Oppstrømstjenere",
@@ -252,9 +253,9 @@
    "rate_limit": "Forespørselsfrekvensgrense",
    "edns_enable": "Aktiver EDNS-klientundernett",
    "edns_cs_desc": "Hvis det er skrudd på, vil AdGuard Home sende klientenes undernett til DNS-tjenerne.",
+    "rate_limit_desc": "Antallet forespørsler per sekund som én enkelt klient har lov til å be om (0: ubegrenset)",
    "blocking_ipv4_desc": "IP-adressen som det skal svares med for blokkerte A-forespørsler",
    "blocking_ipv6_desc": "IP-adressen som det skal svares med for blokkerte AAAA-forespørsler",
-    "blocking_mode_default": "Standardmodus: Svar med REFUSED når det blokkeres med en adblockoppføring; svar med IP-adressen spesifisert i oppføringen når det blokkeres av en «Hosts»-oppføring",
    "blocking_mode_refused": "REFUSED: Svar med REFUSED-koden",
    "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-koden",
    "blocking_mode_null_ip": "Null IP: Svar med en 0-IP-adresse (0.0.0.0 for A; :: for AAAA)",
@@ -333,6 +334,7 @@
    "encryption_dot": "'DNS-over-TLS'-port",
    "encryption_dot_desc": "Dersom denne porten er satt opp, vil AdGuard Home kjøre en 'DNS-over-TLS'-tjener på denne porten.",
    "encryption_doq": "'DNS-over-QUIC'-port",
+    "encryption_doq_desc": "Dersom denne porten er satt opp, vil AdGuard Home kjøre en DNS-over-QUIC-tjener på denne porten. Den er eksperimentell og vil kanskje ikke være pålitelig. I tillegg er det ikke så altfor mange klienter som støtter det for øyeblikket.",
    "encryption_certificates": "Sertifikater",
    "encryption_certificates_desc": "For å bruke kryptering, må du skrive inn et gyldig SSL-sertifikatkjede for domenet ditt. Du kan få et gratis sertifikat hos <0>{{link}}</0>, eller kjøpe et fra en av de troverdige sertifikatsautoritetene.",
    "encryption_certificates_input": "Kopier / lim inn dine PEM-kodede sertifikater her.",
@@ -411,7 +413,6 @@
    "dns_privacy": "DNS-privatliv",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Benytt <1>{{address}}</1>-strengen.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Benytt <1>{{address}}</1>-strengen.",
-    "setup_dns_privacy_3": "<0>Vennligst bemerk at krypterte DNS-protokoller bare er støttet på Android 9. Så du må installere ytterligere programvare for andre operativsystemer.</0><0>Her er en liste over programvare som du kan bruke.</0>",
    "setup_dns_privacy_android_1": "Android 9 har innebygd støtte for DNS-over-TLS. For å sette det opp, gå til Innstillinger → Nettverk og internett → Avansert → Privat DNS, og skriv inn domenenavnet ditt der.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> støtter <1>DNS-over-HTTPS</1> og <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> legger til <1>DNS-over-HTTPS</1>-støtte i Android.",
@@ -558,10 +559,12 @@
    "cache_size_desc": "DNS-mellomlagerstørrelse (i bytes)",
    "cache_ttl_min_override": "Overstyr minimumslevetiden",
    "cache_ttl_max_override": "Overstyr maksimallevetiden",
-    "enter_cache_size": "Skriv inn mellomlagerstørrelse",
-    "enter_cache_ttl_min_override": "Skriv inn minimumslevetiden",
-    "enter_cache_ttl_max_override": "Skriv inn maksimallevetiden",
-    "cache_ttl_max_override_desc": "Overstyr levetidsverdien (maksimal) som mottas fra oppstrømstjeneren",
+    "enter_cache_size": "Skriv inn mellomlagerstørrelse (i bytes)",
+    "enter_cache_ttl_min_override": "Skriv inn minimumslevetiden (i sekunder)",
+    "enter_cache_ttl_max_override": "Skriv inn maksimallevetiden (i sekunder)",
+    "cache_ttl_min_override_desc": "Overstyr korte levetidsverdier (i sekunder) som mottas fra oppstrømstjeneren under mellomlagring av DNS-responser",
+    "cache_ttl_max_override_desc": "Velg en maks-levetidsverdi (i sekunder) for oppføringer i DNS-mellomlageret",
+    "ttl_cache_validation": "Minimums-mellomlagringslevetidsverdien må være mindre enn eller det samme som maksverdien",
    "filter_category_general": "Generelt",
    "filter_category_security": "Sikkerhet",
    "filter_category_regional": "Regional",
@@ -573,5 +576,7 @@
    "setup_config_to_enable_dhcp_server": "Oppsett for å skru på DHCP-tjeneren",
    "original_response": "Opprinnelig svar",
    "click_to_view_queries": "Klikk for å vise forespørsler",
+    "port_53_faq_link": "Port 53 er ofte opptatt av «DNSStubListener»- eller «systemd-resolved»-tjenestene. Vennligst les <0>denne instruksjonen</0> om hvordan man løser dette.",
+    "adg_will_drop_dns_queries": "AdGuard Home vil droppe alle DNS-forespørsler fra denne klienten.",
    "experimental": "Eksperimentell"
 }
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Ustawienia klienta",
    "example_upstream_reserved": "możesz określić serwer DNS <0>dla konkretnych domen</0>",
+    "example_upstream_comment": "Możesz wpisać komentarz",
    "upstream_parallel": "Używaj równoległych żądań, aby przyspieszyć rozwiązywanie adresów domen, jednocześnie wysyłając zapytania do wszystkich głównych serwerów DNS",
    "parallel_requests": "Równoległe żądania",
    "load_balancing": "Równoważenie obciążenia",
@@ -114,7 +115,7 @@
    "average_processing_time": "Średni czas przetwarzania",
    "average_processing_time_hint": "Średni czas przetwarzania żądania DNS liczony w milisekundach",
    "block_domain_use_filters_and_hosts": "Zablokuj domeny za pomocą filtrów i plików host",
-    "filters_block_toggle_hint": "Możesz skonfigurować reguły blokowania w ustawieniach <a href='#filters'>Filtry</a> ",
+    "filters_block_toggle_hint": "Możesz skonfigurować reguły blokowania w ustawieniach <a>Filtry</a>.",
    "use_adguard_browsing_sec": "Użyj usługi sieciowej Bezpieczne Przeglądanie AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home sprawdzi, czy domena jest na czarnej liście przez serwis internetowy Bezpieczne Przeglądanie. Będzie korzystać z interfejsu API przyjaznego dla prywatności w celu przeprowadzenia kontroli: na serwer wysyłany jest tylko krótki prefiks nazwy domeny SHA256.",
    "use_adguard_parental": "Użyj usługi Kontrola Rodzicielska AdGuard",
@@ -132,6 +133,8 @@
    "encryption_settings": "Ustawienia szyfrowania",
    "dhcp_settings": "Ustawienia DHCP",
    "upstream_dns": "Główne serwery DNS",
+    "upstream_dns_help": "Wpisz adresy serwerów po jednym w każdym wierszu. <a>Dowiedz się więcej </a> o konfigurowaniu głównych serwerów DNS.",
+    "upstream_dns_configured_in_file": "Skonfigurowano w {{path}}",
    "test_upstream_btn": "Test głównych serwerów DNS",
    "upstreams": "Główne serwery DNS",
    "apply_btn": "Zastosuj",
@@ -185,6 +188,7 @@
    "example_upstream_regular": "normalny DNS (przez UDP)",
    "example_upstream_dot": "zaszyfrowany <0>DNS-over-TLS</0>",
    "example_upstream_doh": "zaszyfrowany <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "zaszyfrowany <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "możesz użyć adresu <0>DNS Stamps</0> dla protokołu <1>DNSCrypt</1> lub <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "zwykły DNS (przez TCP)",
    "all_lists_up_to_date_toast": "Wszystkie listy są już aktualne",
@@ -193,6 +197,8 @@
    "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie można go użyć, sprawdź, czy napisałeś go poprawnie",
    "unblock": "Odblokuj",
    "block": "Zablokuj",
+    "disallow_this_client": "Odrzuć tego klienta",
+    "allow_this_client": "Pozwól temu klientowi",
    "block_for_this_client_only": "Zablokuj tylko tego klienta",
    "unblock_for_this_client_only": "Odblokuj tylko tego klienta",
    "time_table_header": "Czas",
@@ -243,14 +249,17 @@
    "blocking_ipv6": "Blokowanie IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Pobierz plik .mobileconfig dla DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Pobierz plik .mobileconfig dla DNS-over-TLS",
    "plain_dns": "Zwykły DNS",
    "form_enter_rate_limit": "Wpisz limit ilościowy",
    "rate_limit": "Limit ilościowy",
    "edns_enable": "Włącz podsieć klienta EDNS",
    "edns_cs_desc": "Po włączeniu AdGuard Home będzie wysyłał podsieci klientów na serwery DNS.",
+    "rate_limit_desc": "Liczba żądań na sekundę, które może wykonać pojedynczy klient (ustawienie 0 oznacza nieograniczoną liczbę)",
    "blocking_ipv4_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania A",
    "blocking_ipv6_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania AAAA",
-    "blocking_mode_default": "Domyślny: Odpowiedz kodem REFUSED, gdy zostanie zablokowany przez regułę w stylu Adblock; odpowiedz na adres IP określony w regule, gdy zostanie zablokowany przez regułę w stylu /etc/hosts",
+    "blocking_mode_default": "Domyślna: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA) po zablokowaniu przez regułę Adblock; odpowiedź adresem IP wpisanym w regule, jeśli jest blokowany przez regułę w stylu /etc/hosts",
    "blocking_mode_refused": "REFUSED: Odpowiedz kodem REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Odpowiedz kodem NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA)",
@@ -328,6 +337,8 @@
    "encryption_https_desc": "Jeśli port HTTPS jest skonfigurowany, interfejs administratora AdGuard Home będzie dostępny za pośrednictwem protokołu HTTPS i zapewni DNS przez HTTPS w lokalizacji zapytania '/dns-query'.",
    "encryption_dot": "Port DNS-over-TLS",
    "encryption_dot_desc": "Jeśli ten port jest skonfigurowany, AdGuard Home uruchomi serwer DNS-over-TLS na tym porcie.",
+    "encryption_doq": "Port DNS-over-QUIC",
+    "encryption_doq_desc": "Jeśli ten port jest skonfigurowany, AdGuard Home uruchomi serwer DNS-over-QUIC na tym porcie. Jest to funkcja eksperymentalna i może nie być stabilna. Ponadto, w tej chwili nie ma zbyt wielu klientów, którzy go obsługują.",
    "encryption_certificates": "Certyfikaty",
    "encryption_certificates_desc": "Aby korzystać z szyfrowania, musisz podać prawidłowy łańcuch certyfikatów SSL dla swojej domeny. Możesz uzyskać bezpłatny certyfikat na  <0>{{link}}</0> lub możesz go kupić od jednego z zaufanych urzędów certyfikacji.",
    "encryption_certificates_input": "Kopiuj/wklej tutaj swoje zakodowane certyfikaty PEM.",
@@ -406,7 +417,8 @@
    "dns_privacy": "Prywatny DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Skorzystaj z adresu <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Skorzystaj z adresu <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Należy pamiętać, że szyfrowane protokoły DNS są obsługiwane tylko w systemie Android 9. Musisz zainstalować dodatkowe oprogramowanie dla innych systemów operacyjnych.</0><0>Oto lista oprogramowania, którego możesz użyć.</0>",
+    "setup_dns_privacy_3": "<0>Oto lista oprogramowania, którego możesz użyć.</0>",
+    "setup_dns_privacy_4": "Na urządzeniu iOS 14 lub macOS Big Sur możesz pobrać specjalny plik '.mobileconfig', który dodaje serwery <highlight>DNS-over-HTTPS</highlight> lub <highlight>DNS-over-TLS</highlight> do ustawień DNS.",
    "setup_dns_privacy_android_1": "System Android 9 obsługuje natywnie DNS-over-TLS. Aby go skonfigurować, przejdź do Ustawienia → Sieć i Internet → Zaawansowane → Prywatny DNS i wpisz tam swoją nazwę domeny.",
    "setup_dns_privacy_android_2": "Aplikacja <0>AdGuard dla Androida</0> obsługuje <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "Aplikacja <0>Intra</0> dodaje obsługę <1>DNS-over-HTTPS</1> dla Androida.",
@@ -519,6 +531,7 @@
    "check_reason": "Powód: {{reason}}",
    "check_rule": "Reguła: {{rule}}",
    "check_service": "Nazwa usługi: {{service}}",
+    "service_name": "Nazwa usługi",
    "check_not_found": "Nie znaleziono na Twoich listach filtrów",
    "client_confirm_block": "Czy na pewno chcesz zablokować klienta \"{{ip}}\"?",
    "client_confirm_unblock": "Czy na pewno chcesz odblokować klienta \"{{ip}}\"?",
@@ -553,10 +566,12 @@
    "cache_size_desc": "Rozmiar pamięci podręcznej DNS (w bajtach)",
    "cache_ttl_min_override": "Nadpisz minimalną wartość TTL",
    "cache_ttl_max_override": "Nadpisz maksymalną wartość TTL",
-    "enter_cache_size": "Wpisz rozmiar pamięci podręcznej",
-    "enter_cache_ttl_min_override": "Wpisz minimalną wartość TTL",
-    "enter_cache_ttl_max_override": "Wpisz maksymalną wartość TTL",
-    "cache_ttl_max_override_desc": "Nadpisz wartość TTL (maksymalną) otrzymaną od serwera nadrzędnego",
+    "enter_cache_size": "Wpisz rozmiar pamięci podręcznej (w bajtach)",
+    "enter_cache_ttl_min_override": "Wpisz minimalną wartość TTL (w sekundach)",
+    "enter_cache_ttl_max_override": "Wpisz maksymalną wartość TTL (w sekundach)",
+    "cache_ttl_min_override_desc": "Zastąp wartość TTL (w sekundach) otrzymaną z serwera nadrzędnego podczas buforowania odpowiedzi DNS",
+    "cache_ttl_max_override_desc": "Ustaw maksymalną wartość TTL (w sekundach) dla wpisów w pamięci podręcznej DNS",
+    "ttl_cache_validation": "Minimalna pamięć podręczna wartości TTL musi być mniejsza lub równa maksymalnej wartości",
    "filter_category_general": "Ogólne",
    "filter_category_security": "Bezpieczeństwo",
    "filter_category_regional": "Regionalne",
@@ -569,5 +584,7 @@
    "original_response": "Oryginalna odpowiedź",
    "click_to_view_queries": "Kliknij, aby wyświetlić zapytania",
    "port_53_faq_link": "Port 53 jest często zajęty przez usługi \"DNSStubListener\" lub \"systemd-resolved\". Przeczytaj <0>tę instrukcję</0> jak to rozwiązać.",
-    "adg_will_drop_dns_queries": "AdGuard Home odrzuci zapytanie DNS od tego klienta."
+    "adg_will_drop_dns_queries": "AdGuard Home odrzuci zapytanie DNS od tego klienta.",
+    "client_not_in_allowed_clients": "Klient nie jest dozwolony, ponieważ nie ma go na liście „Dozwoleni klienci”.",
+    "experimental": "Funkcja eksperymentalna"
 }
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Configurações do cliente",
    "example_upstream_reserved": "Você pode especificar o DNS upstream <0>para o domínio(s) especifico</0>",
+    "example_upstream_comment": "Você pode especificar o comentário",
    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores upstream",
    "parallel_requests": "Solicitações paralelas",
    "load_balancing": "Balanceamento de carga",
@@ -11,6 +12,8 @@
    "save_config": "Salvar configuração",
    "enabled_dhcp": "Servidor DHCP ativado",
    "disabled_dhcp": "Servidor DHCP desativado",
+    "unavailable_dhcp": "DHCP não está disponível",
+    "unavailable_dhcp_desc": "O AdGuard Home não pode executar um servidor DHCP em seu sistema operacional",
    "dhcp_title": "Servidor DHCP (experimental)",
    "dhcp_description": "Se o seu roteador não fornecer configurações de DHCP, você poderá usar o servidor DHCP integrado do AdGuard.",
    "dhcp_enable": "Ativar servidor DHCP",
@@ -21,6 +24,8 @@
    "dhcp_static_leases": "Concessões de DHCP estático",
    "dhcp_leases_not_found": "Nenhuma concessão DHCP encontrada",
    "dhcp_config_saved": "Configurações DHCP salvas com sucesso",
+    "dhcp_ipv4_settings": "Configurações DHCP IPv4",
+    "dhcp_ipv6_settings": "Configurações DHCP IPv6",
    "form_error_required": "Campo obrigatório",
    "form_error_ip4_format": "Formato de endereço IPv4 inválido",
    "form_error_ip6_format": "Formato de endereço IPv6 inválido",
@@ -29,6 +34,7 @@
    "form_error_client_id_format": "Formato do ID de cliente inválido",
    "form_error_positive": "Deve ser maior que 0",
    "form_error_negative": "Deve ser igual ou superior a 0",
+    "range_end_error": "Deve ser maior que o início do intervalo",
    "dhcp_form_gateway_input": "IP do gateway",
    "dhcp_form_subnet_input": "Máscara de sub-rede",
    "dhcp_form_range_title": "Faixa de endereços IP",
@@ -67,7 +73,7 @@
    "filters": "Filtros",
    "filter": "Filtro",
    "query_log": "Registro de consultas",
-    "compact": "Compactar",
+    "compact": "Compacto",
    "nothing_found": "Nada encontrado",
    "faq": "FAQ",
    "version": "Versão",
@@ -109,7 +115,7 @@
    "average_processing_time": "Tempo médio de processamento",
    "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
    "block_domain_use_filters_and_hosts": "Bloquear domínios usando arquivos de filtros e hosts",
-    "filters_block_toggle_hint": "Você pode configurar as regras de bloqueio nas configurações de <a href='#filters'>Filtros</a>.",
+    "filters_block_toggle_hint": "Você pode configurar as regras de bloqueio nas configurações de <a>Filtros</a>.",
    "use_adguard_browsing_sec": "Usar o serviço de segurança da navegação do AdGuard",
    "use_adguard_browsing_sec_hint": "O AdGuard Home irá verificar se o domínio está na lista negra do serviço de segurança da navegação. Ele usará a API de pesquisa de privacidade para executar a verificação: apenas um prefixo curto do hash do nome de domínio SHA256 é enviado para o servidor.",
    "use_adguard_parental": "Usar o serviço de controle parental do AdGuard",
@@ -127,6 +133,8 @@
    "encryption_settings": "Configurações de criptografia",
    "dhcp_settings": "Configurações de DHCP",
    "upstream_dns": "Servidores DNS upstream",
+    "upstream_dns_help": "Insira os endereços dos servidores, um por linha. <a>Saber mais</a> sobre a configuração de servidores DNS primários.",
+    "upstream_dns_configured_in_file": "Configurado em {{path}}",
    "test_upstream_btn": "Testar upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Aplicar",
@@ -161,8 +169,8 @@
    "new_allowlist": "Nova lista branca",
    "edit_blocklist": "Editar lista negra",
    "edit_allowlist": "Editar lista branca",
-    "choose_blocklist": "Escolha as listas negras",
-    "choose_allowlist": "Escolha as listas brancas",
+    "choose_blocklist": "Escolher as listas negras",
+    "choose_allowlist": "Escolher as listas brancas",
    "enter_valid_blocklist": "Digite uma URL válida para a lista negra.",
    "enter_valid_allowlist": "Digite uma URL válida para a lista branca.",
    "form_error_url_format": "Formato da URL inválida",
@@ -180,6 +188,7 @@
    "example_upstream_regular": "DNS regular (através do UDP)",
    "example_upstream_dot": "<0>DNS-sobre-TLS</0> criptografado",
    "example_upstream_doh": "<0>DNS-sobre-HTTPS</0> criptografado",
+    "example_upstream_doq": "<0>DNS-sobre-QUIC</0> criptografado",
    "example_upstream_sdns": "Você pode usar <0>DNS Stamps</0>para o <1>DNSCrypt</1>ou usar os resolvedores <2>DNS-sobre-HTTPS</2>",
    "example_upstream_tcp": "DNS regular (através do TCP)",
    "all_lists_up_to_date_toast": "Todas as listas já estão atualizadas",
@@ -188,6 +197,10 @@
    "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se você escreveu corretamente",
    "unblock": "Desbloquear",
    "block": "Bloquear",
+    "disallow_this_client": "Não permitir este cliente",
+    "allow_this_client": "Permitir este cliente",
+    "block_for_this_client_only": "Bloquear apenas para este cliente",
+    "unblock_for_this_client_only": "Desbloquear apenas para este cliente",
    "time_table_header": "Data",
    "date": "Data",
    "domain_name_table_header": "Nome de domínio",
@@ -236,14 +249,17 @@
    "blocking_ipv6": "Bloqueando IPv6",
    "dns_over_https": "DNS-sobre-HTTPS",
    "dns_over_tls": "DNS-sobre-TLS",
+    "download_mobileconfig_doh": "BAixar .mobileconfig para DNS-sobre-HTTPS",
+    "download_mobileconfig_dot": "BAixar .mobileconfig para DNS-sobre-TLS",
    "plain_dns": "DNS simples",
    "form_enter_rate_limit": "Insira a taxa limite",
    "rate_limit": "Taxa limite",
    "edns_enable": "Ativar a sub-rede do cliente EDNS",
    "edns_cs_desc": "Se ativado, o AdGuard Home estará enviando as sub-redes dos clientes para os servidores DNS.",
+    "rate_limit_desc": "O número de solicitações por segundo que um único cliente pode fazer (0: ilimitado)",
    "blocking_ipv4_desc": "Endereço de IP a ser retornado para uma solicitação bloqueada",
    "blocking_ipv6_desc": "Endereço de IP a ser retornado para uma solicitação AAAA bloqueada",
-    "blocking_mode_default": "Por padrão: Responder com REFUSED quando bloqueado pela regra estilo Adblock e responde com o endereço de IP especificado na regra quando bloqueado pela regra estilo /etc/hosts-style",
+    "blocking_mode_default": "Padrão: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
    "blocking_mode_refused": "REFUSED: responder com o código REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Responder com o código NXDOMAIN",
    "blocking_mode_null_ip": "IP nulo: Responder com endereço IP zero (0.0.0.0 para A; :: para AAAA)",
@@ -321,6 +337,8 @@
    "encryption_https_desc": "Se a porta HTTPS estiver configurada, a interface administrativa do AdGuard Home será acessível via HTTPS e também fornecerá o DNS-sobre-HTTPS no local '/dns-query'.",
    "encryption_dot": "Porta DNS-sobre-TLS",
    "encryption_dot_desc": "Se essa porta estiver configurada, o AdGuard Home irá executar o servidor DNS-sobre- TSL nesta porta.",
+    "encryption_doq": "Porta DNS-sobre-QUIC",
+    "encryption_doq_desc": "Se esta porta estiver configurada, o AdGuard Home executará um servidor DNS-sobre-QUIC nesta porta. É experimental e pode não ser confiável. Além disso, não há muitos clientes que ofereçam suporte no momento.",
    "encryption_certificates": "Certificados",
    "encryption_certificates_desc": "Para usar criptografia, você precisa fornecer uma cadeia de certificados SSL válida para seu domínio. Você pode obter um certificado gratuito em <0> {{link}}</0> ou pode comprá-lo de uma das autoridades de certificação confiáveis.",
    "encryption_certificates_input": "Copie/cole aqui seu certificado codificado em PEM.",
@@ -399,7 +417,8 @@
    "dns_privacy": "Privacidade de DNS",
    "setup_dns_privacy_1": "<0>DNS-sobre-TLS:</0> Use <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-sobre-HTTPS:</0> Use <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Por favor, note que os protocolos de DNS criptografados são suportados apenas no Android 9. Então, você irá precisa instalar um software adicional em outros sistemas operacionais.</0><0>Aqui está a lista de softwares que você pode usar.</0>",
+    "setup_dns_privacy_3": "<0>Aqui está uma lista de softwares que você pode usar.</0>",
+    "setup_dns_privacy_4": "Em um dispositivo iOS 14 ou macOS Big Sur, você pode baixar o arquivo especial '.mobileconfig' que adiciona os servidores <highlight>DNS-sobre-HTTPS</highlight> ou <highlight>DNS-sobre-TLS</highlight> nas configurações de DNS.",
    "setup_dns_privacy_android_1": "O Android 9 suporta o DNS-sobre-TLS de forma nativa. Para configurá-lo, vá para Configurações → Rede e internet → Avançado → DNS privado e digite seu nome de domínio lá.",
    "setup_dns_privacy_android_2": "O <0>AdGuard para Android</0> suporta <1>DNS-sobre-HTTPS</1> e <1>DNS-sobre-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> adiciona o suporte <1>DNS-sobre-HTTPS</1> para o Android.",
@@ -480,6 +499,7 @@
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Saiba mais</0> sobre como criar as suas próprias listas negras de servidores.",
    "blocked_by_response": "Bloqueado por CNAME ou IP na resposta",
+    "blocked_by_cname_or_ip": "Bloqueado por CNAME ou IP",
    "try_again": "Tente novamente",
    "domain_desc": "Digite o nome do domínio ou wildcard que pretende reescrever.",
    "example_rewrite_domain": "reescrever respostas apenas para este nome de domínio.",
@@ -487,14 +507,14 @@
    "rewrite_ip_address": "Endereço IP: use esse IP em uma resposta A ou AAAA",
    "rewrite_domain_name": "Nome de domínio: adicione um registro CNAME",
    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registros do upstream",
-    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do upstream",
+    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do servidor DNS primário",
    "disable_ipv6": "Desativar IPv6",
    "disable_ipv6_desc": "Se este recurso estiver ativado, todas as consultas de DNS para endereços IPv6 (tipo AAAA) serão ignoradas.",
    "fastest_addr": "Endereço de IP mais rápido",
    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso irá retardar as consultas ao DNS, pois temos que esperar por respostas de todos os servidores DNS, porém melhorando a conectividade em geral.",
    "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
    "autofix_warning_list": "Ele irá realizar estas tarefas: <0>Desativar sistema DNSStubListener</0> <0>Definir endereço do servidor DNS para 127.0.0.1</0> <0>Substituir o alvo simbólico do link /etc/resolv.conf para /run/systemd/resolv.conf</0> <0>Parar DNSStubListener (recarregar serviço resolvido pelo sistema)</0>",
-    "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuardHome por padrão.",
+    "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuard Home por padrão.",
    "tags_title": "Marcadores",
    "tags_desc": "Você pode selecionar as tags que correspondem ao cliente. As tags podem ser incluídas nas regras de filtragem e permitir que você as aplique com mais precisão. <0>Saiba mais</0>",
    "form_select_tags": "Selecione as tags do cliente",
@@ -511,6 +531,7 @@
    "check_reason": "Motivo: {{reason}}",
    "check_rule": "Regra: {{rule}}",
    "check_service": "Nome do serviço: {{service}}",
+    "service_name": "Nome do serviço",
    "check_not_found": "Não encontrado em suas listas de filtros",
    "client_confirm_block": "Você tem certeza de que deseja bloquear o cliente \"{{ip}}\"?",
    "client_confirm_unblock": "Você tem certeza de que deseja desbloquear o cliente \"{{ip}}\"?",
@@ -528,6 +549,7 @@
    "dnssec_enable": "Ativar DNSSEC",
    "dnssec_enable_desc": "Definir a flag DNSSEC nas consultas de DNS em andamento e verificar o resultado (é necessário um resolvedor DNSSEC ativado)",
    "validated_with_dnssec": "Validado com DNSSEC",
+    "all_queries": "Todas as consultas",
    "show_blocked_responses": "Bloqueado",
    "show_whitelisted_responses": "Na lista branca",
    "show_processed_responses": "Processado",
@@ -544,10 +566,12 @@
    "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
    "cache_ttl_min_override": "Sobrepor o TTL mínimo",
    "cache_ttl_max_override": "Sobrepor o TTL máximo",
-    "enter_cache_size": "Digite o tamanho do cache",
-    "enter_cache_ttl_min_override": "Digite o TTL mínimo",
-    "enter_cache_ttl_max_override": "Digite o TTL máximo",
-    "cache_ttl_max_override_desc": "Substituição do valor TTL (máximo) recebido do servidor de DNS primário",
+    "enter_cache_size": "Digite o tamanho do cache (bytes)",
+    "enter_cache_ttl_min_override": "Digite o TTL máximo (segundos)",
+    "enter_cache_ttl_max_override": "Digite o TTL máximo (segundos)",
+    "cache_ttl_min_override_desc": "Prolongue os valores de curta duração (segundos) recebidos do servidor primário ao armazenar em cache as respostas DNS",
+    "cache_ttl_max_override_desc": "Defina um valor máximo de tempo de vida (segundos) para entradas no cache DNS",
+    "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
    "filter_category_general": "Geral",
    "filter_category_security": "Segurança",
    "filter_category_regional": "Regional",
@@ -556,5 +580,11 @@
    "filter_category_security_desc": "Listas especializadas em bloquear domínios de malware, phishing ou fraude",
    "filter_category_regional_desc": "Listas focadas em anúncios regionais e servidores de rastreamento",
    "filter_category_other_desc": "Outras listas negras",
-    "click_to_view_queries": "Clique para ver as consultas"
+    "setup_config_to_enable_dhcp_server": "Configure a configuração para habilitar o servidor DHCP",
+    "original_response": "Resposta original",
+    "click_to_view_queries": "Clique para ver as consultas",
+    "port_53_faq_link": "A porta 53 é frequentemente ocupada por serviços \"DNSStubListener\" ou \"systemd-resolved\". Por favor leia <0>essa instrução</0> para resolver isso.",
+    "adg_will_drop_dns_queries": "O AdGuard Home descartará todas as consultas DNS deste cliente.",
+    "client_not_in_allowed_clients": "O cliente não é permitido porque não está na lista \"Clientes permitidos\".",
+    "experimental": "Experimental"
 }
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -1,13 +1,19 @@
 {
    "client_settings": "Definições do cliente",
    "example_upstream_reserved": "pode especificar um DNS upstream <0>para domínio(s) especifico(s)</0>",
+    "example_upstream_comment": "Tu podes especificar o comentário",
    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores upstream",
+    "parallel_requests": "Solicitações paralelas",
+    "load_balancing": "Balanceamento de carga",
+    "load_balancing_desc": "Consulta um servidor de cada vez. O AdGuard Home usará o algoritmo aleatório ponderado para escolher o servidor, para que o servidor mais rápido seja usado com mais frequência.",
    "bootstrap_dns": "Servidores DNS de inicialização",
    "bootstrap_dns_desc": "Servidores DNS de inicialização são usados para resolver endereços IP dos resolvedores DoH/DoT que especifica como upstreams.",
    "check_dhcp_servers": "Verificar por servidores DHCP",
    "save_config": "Guardar configuração",
    "enabled_dhcp": "Servidor DHCP activado",
    "disabled_dhcp": "Servidor DHCP desactivado",
+    "unavailable_dhcp": "DHCP não está disponível",
+    "unavailable_dhcp_desc": "O AdGuard Home não pode executar um servidor DHCP em seu sistema operacional",
    "dhcp_title": "Servidor DHCP (experimental)",
    "dhcp_description": "Se o seu router não fornecer configurações de DHCP, poderá usar o servidor DHCP integrado do AdGuard.",
    "dhcp_enable": "Activar servidor DHCP",
@@ -18,6 +24,8 @@
    "dhcp_static_leases": "Concessões de DHCP estático",
    "dhcp_leases_not_found": "Nenhuma concessão DHCP encontrada",
    "dhcp_config_saved": "Configurações DHCP guardadas com sucesso",
+    "dhcp_ipv4_settings": "Definições DHCP IPv4",
+    "dhcp_ipv6_settings": "Definições DHCP IPv6",
    "form_error_required": "Campo obrigatório",
    "form_error_ip4_format": "Formato de endereço IPv4 inválido",
    "form_error_ip6_format": "Formato de endereço IPv6 inválido",
@@ -26,6 +34,7 @@
    "form_error_client_id_format": "Formato inválido",
    "form_error_positive": "Deve ser maior que 0",
    "form_error_negative": "Deve ser igual ou superior a 0",
+    "range_end_error": "Deve ser maior que o início do intervalo",
    "dhcp_form_gateway_input": "IP do gateway",
    "dhcp_form_subnet_input": "Máscara de sub-rede",
    "dhcp_form_range_title": "Faixa de endereços IP",
@@ -36,6 +45,7 @@
    "dhcp_interface_select": "Seleccione a interface DHCP",
    "dhcp_hardware_address": "Endereço de hardware",
    "dhcp_ip_addresses": "Endereços de IP",
+    "ip": "IP",
    "dhcp_table_hostname": "Nome do servidor",
    "dhcp_table_expires": "Expira",
    "dhcp_warning": "Se quiser activar o servidor DHCP, verifique se não há outro servidor DHCP activo na sua rede. Caso contrário, a internet pode parar de funcionar noutros dispositivos ligados!",
@@ -48,17 +58,27 @@
    "dhcp_static_leases_not_found": "Nenhuma concessão DHCP estática foi encontrada",
    "dhcp_add_static_lease": "Adicionar nova concessão estática",
    "dhcp_reset": "Tem a certeza de que deseja redefinir a configuração DHCP?",
+    "country": "País",
+    "city": "Cidade",
    "delete_confirm": "Tem a certeza de que deseja excluir \"{{key}}\"?",
    "form_enter_hostname": "Insira o hostname",
    "error_details": "Detalhes do erro",
+    "response_details": "Detalhes da resposta",
+    "request_details": "Detalhes da solicitação",
+    "client_details": "Detalhes do cliente",
+    "details": "Detalhes",
    "back": "Retroceder",
    "dashboard": "Painel",
    "settings": "Definições",
    "filters": "Filtros",
+    "filter": "Filtro",
    "query_log": "Registo de consultas",
+    "compact": "Compacto",
+    "nothing_found": "Nada encontrado",
    "faq": "Perguntas frequentes",
    "version": "Versão",
    "address": "Endereço",
+    "protocol": "Protocolo",
    "on": "LIGADO",
    "off": "DESLIGADO",
    "copyright": "Copyright",
@@ -95,7 +115,7 @@
    "average_processing_time": "Tempo médio de processamento",
    "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
    "block_domain_use_filters_and_hosts": "Bloquear domínios usando arquivos de filtros e hosts",
-    "filters_block_toggle_hint": "Pode configurar as regras de bloqueio nas configurações de <a href='#filters'>Filtros</a>.",
+    "filters_block_toggle_hint": "Pode configurar as regras de bloqueio nas configurações de <a>Filtros</a>.",
    "use_adguard_browsing_sec": "Usar o serviço de segurança da navegação do AdGuard",
    "use_adguard_browsing_sec_hint": "O AdGuard Home irá verificar se o domínio está na lista negra do serviço de segurança da navegação. Usará a API de pesquisa de privacidade para executar a verificação: apenas um prefixo curto do hash do nome de domínio SHA256 é enviado para o servidor.",
    "use_adguard_parental": "Usar o serviço de controlo parental do AdGuard",
@@ -105,9 +125,16 @@
    "no_servers_specified": "Nenhum servidor especificado",
    "general_settings": "Definições gerais",
    "dns_settings": "Definições de DNS",
+    "dns_blocklists": "Listas negra de DNS",
+    "dns_allowlists": "Listas branca de DNS",
+    "dns_blocklists_desc": "O AdGuard Home bloqueará domínios que correspondam às listas negras.",
+    "dns_allowlists_desc": "Os domínios das listas branca de DNS serão permitidos mesmo que estejam em qualquer uma das listas negra.",
+    "custom_filtering_rules": "Regras de filtragem personalizadas",
    "encryption_settings": "Configurações de criptografia",
    "dhcp_settings": "Configurações de DHCP",
    "upstream_dns": "Servidores DNS upstream",
+    "upstream_dns_help": "Insira os endereços dos servidores, um por linha. <a>Saber mais</a> sobre a configuração de servidores DNS primários.",
+    "upstream_dns_configured_in_file": "Configurado em {{path}}",
    "test_upstream_btn": "Testar upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Aplicar",
@@ -121,15 +148,33 @@
    "enabled_save_search_toast": "Pesquisa segura activada",
    "enabled_table_header": "Activados",
    "name_table_header": "Nome",
+    "list_url_table_header": "URL da lista",
    "rules_count_table_header": "Total de Regras",
    "last_time_updated_table_header": "Última actualização",
    "actions_table_header": "Acções",
+    "request_table_header": "Solicitação",
    "edit_table_action": "Editar",
    "delete_table_action": "Apagar",
+    "elapsed": "Tempo decorrido",
    "filters_and_hosts_hint": "O AdGuard Home entende regras básicas de bloqueio de anúncios e a sintaxe de arquivos de hosts.",
+    "no_blocklist_added": "Nenhuma lista negra foi adicionada",
+    "no_whitelist_added": "Nenhuma lista branca foi adicionada",
+    "add_blocklist": "Adicionar lista negra",
+    "add_allowlist": "Adicionar lista branca",
    "cancel_btn": "Cancelar",
    "enter_name_hint": "Insira o nome",
+    "enter_url_or_path_hint": "Digite a URL ou o local da lista",
    "check_updates_btn": "Verificar actualizações",
+    "new_blocklist": "Nova lista negra",
+    "new_allowlist": "Nova lista branca",
+    "edit_blocklist": "Editar lista negra",
+    "edit_allowlist": "Editar lista branca",
+    "choose_blocklist": "Escolher as listas negras",
+    "choose_allowlist": "Escolher as listas brancas",
+    "enter_valid_blocklist": "Digite uma URL válida para a lista negra.",
+    "enter_valid_allowlist": "Digite uma URL válida para a lista branca.",
+    "form_error_url_format": "Formato da URL inválida",
+    "form_error_url_or_path_format": "URL ou local da lista inválida",
    "custom_filter_rules": "Regras de filtragem personalizadas",
    "custom_filter_rules_hint": "Insira uma regra por linha. Pode usar regras de bloqueio de anúncios ou a sintaxe de arquivos de hosts.",
    "examples_title": "Exemplos",
@@ -143,18 +188,26 @@
    "example_upstream_regular": "dNS regular (através do UDP)",
    "example_upstream_dot": "<0>DNS-sobre-TLS</0> criptografado",
    "example_upstream_doh": "<0>DNS-sobre-HTTPS</0> criptografado",
+    "example_upstream_doq": "<0>DNS-sobre-QUIC</0> criptografado",
    "example_upstream_sdns": "pode usar <0>DNS Stamps</0>para o <1>DNSCrypt</1>ou usar os resolvedores <2>DNS-sobre-HTTPS</2>",
    "example_upstream_tcp": "dNS regular (através do TCP)",
+    "all_lists_up_to_date_toast": "Todas as listas já estão atualizadas",
    "updated_upstream_dns_toast": "A actualizar os servidores DNS upstream",
    "dns_test_ok_toast": "Os servidores DNS especificados estão a funcionar correctamente",
    "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se o escreveu correctamente",
    "unblock": "Desbloquear",
    "block": "Bloquear",
+    "disallow_this_client": "Não permitir este cliente",
+    "allow_this_client": "Permitir este cliente",
+    "block_for_this_client_only": "Bloquear apenas para este cliente",
+    "unblock_for_this_client_only": "Desbloquear apenas para este cliente",
    "time_table_header": "Data",
    "date": "Data",
    "domain_name_table_header": "Nome do domínio",
+    "domain_or_client": "Domínio ou cliente",
    "type_table_header": "Tipo",
    "response_table_header": "Resposta",
+    "response_code": "Código de resposta",
    "client_table_header": "Cliente",
    "empty_response_status": "Vazio",
    "show_all_filter_type": "Mostrar todos",
@@ -173,6 +226,7 @@
    "query_log_filtered": "Filtrado por {{filter}}",
    "query_log_confirm_clear": "Tem a certeza de que deseja limpar todo o registo de consulta?",
    "query_log_cleared": "O registo de consulta foi limpo com sucesso",
+    "query_log_updated": "O registro da consulta foi actualizado com sucesso",
    "query_log_clear": "Limpar registos de consulta",
    "query_log_retention": "Retenção de registos de consulta",
    "query_log_enable": "Activar registo",
@@ -180,25 +234,45 @@
    "query_log_disabled": "O registo de consulta está desactivado e pode ser configurado em <0>definições</0>",
    "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
    "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
+    "anonymize_client_ip": "Tornar anônimo o IP do cliente",
+    "anonymize_client_ip_desc": "Não salva o endereço de IP completo do cliente em registros e estatísticas",
    "dns_config": "Configuração do servidor DNS",
+    "dns_cache_config": "Configuração de cache DNS",
+    "dns_cache_config_desc": "Aqui você pode configurar o cache do DNS",
    "blocking_mode": "Modo de bloqueio",
+    "default": "Padrão",
    "nxdomain": "NXDOMAIN",
+    "refused": "REFUSED",
    "null_ip": "IP nulo",
    "custom_ip": "IP Personalizado",
    "blocking_ipv4": "A bloquear IPv4",
    "blocking_ipv6": "A bloquear IPv6",
+    "dns_over_https": "DNS-sobre-HTTPS",
+    "dns_over_tls": "DNS-sobre-TLS",
+    "download_mobileconfig_doh": "Transferir .mobileconfig para DNS-sobre-HTTPS",
+    "download_mobileconfig_dot": "Transferir .mobileconfig para DNS-sobre-TLS",
+    "plain_dns": "DNS simples",
    "form_enter_rate_limit": "Insira o limite de taxa",
    "rate_limit": "Limite de taxa",
    "edns_enable": "Activar sub-rede do cliente EDNS",
    "edns_cs_desc": "Se activado, o AdGuard Home enviará sub-redes dos clientes para os servidores DNS.",
+    "rate_limit_desc": "O número de solicitações por segundo que um único cliente pode fazer (0: ilimitado)",
    "blocking_ipv4_desc": "Endereço IP a ser devolvido para uma solicitação A bloqueada",
    "blocking_ipv6_desc": "Endereço IP a ser devolvido para uma solicitação AAAA bloqueada",
+    "blocking_mode_default": "Padrão: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
+    "blocking_mode_refused": "REFUSED: responder com o código REFUSED",
+    "blocking_mode_nxdomain": "NXDOMAIN: Responder com o código NXDOMAIN",
+    "blocking_mode_null_ip": "IP nulo: Responder com endereço IP zero (0.0.0.0 para A; :: para AAAA)",
+    "blocking_mode_custom_ip": "IP personalizado: Responder com um endereço IP definido manualmente",
    "upstream_dns_client_desc": "Se mantiver esse campo vazio, o AdGuard Home usará os servidores configurados nas <0>Definições de DNS</0>.",
+    "tracker_source": "Fonte do rastreador",
    "source_label": "Fonte",
    "found_in_known_domain_db": "Encontrado no banco de dados de domínios conhecido.",
    "category_label": "Categoria",
    "rule_label": "Regra",
+    "list_label": "Lista",
    "unknown_filter": "Filtro desconhecido {{filterId}}",
+    "known_tracker": "Rastreador conhecido",
    "install_welcome_title": "Bem-vindo ao AdGuard Home!",
    "install_welcome_desc": "O AdGuard Home é um servidor de DNS para bloqueio de anúncios e monitorização em toda a rede. A sua finalidade é permitir que controle toda a sua rede e os seus dispositivos sem precisar de ter um programa instalado.",
    "install_settings_title": "Interface web de administrador",
@@ -227,6 +301,7 @@
    "install_devices_router_list_1": "Abra as configurações do seu router. No navegador insira o IP do router, o padrão é (http://192.168.0.1/ ou http://192.168.1.1/), e o login e a palavra-passe é admin/admin; Se não se lembra da palavra-passe, pode redefinir a palavra-passe rapidamente pressionando um botão no próprio router. Alguns routers têm um aplicação específica que já deve estar instalada no seu computador/telefone.",
    "install_devices_router_list_2": "Encontre as configurações de DNS. Procure as letras DNS ao lado de um campo que permite dois ou três conjuntos de números, cada um dividido em quatro grupos de um a três números.",
    "install_devices_router_list_3": "Insira aqui seu servidor do AdGuard Home.",
+    "install_devices_router_list_4": "Você não pode definir um servidor DNS personalizado em alguns tipos de roteadores. Nesse caso, pode ajudar se você configurar o AdGuard Home como um <0>servidor DHCP</0>. Caso contrário, você deve procurar o manual sobre como personalizar os servidores DNS para o seu modelo de roteador específico.",
    "install_devices_windows_list_1": "Abra o Painel de Controlo através do Menu Iniciar ou pela Pesquisa do Windows.",
    "install_devices_windows_list_2": "Entre na categoria Rede e Internet e depois clique em Central de Rede e Partilha.",
    "install_devices_windows_list_3": "No lado esquerdo da janela clique em Alterar as definições do adaptador.",
@@ -262,6 +337,8 @@
    "encryption_https_desc": "Se a porta HTTPS estiver configurada, a interface administrativa do AdGuard Home será acessível via HTTPS e também fornecerá o DNS-sobre-HTTPS no local '/dns-query'.",
    "encryption_dot": "Porta DNS-sobre-TLS",
    "encryption_dot_desc": "Se essa porta estiver configurada, o AdGuard Home irá executar o servidor DNS-sobre- TSL nesta porta.",
+    "encryption_doq": "Porta DNS-sobre-QUIC",
+    "encryption_doq_desc": "Se esta porta estiver configurada, o AdGuard Home executará um servidor DNS-sobre-QUIC nesta porta. É experimental e pode não ser confiável. Além disso, não há muitos clientes que ofereçam suporte no momento.",
    "encryption_certificates": "Certificados",
    "encryption_certificates_desc": "Para usar criptografia, precisa de fornecer uma cadeia de certificados SSL válida para o seu domínio. Pode obter um certificado gratuito em <0> {{link}}</0> ou pode comprá-lo numa das autoridades de certificação confiáveis.",
    "encryption_certificates_input": "Copie/cole aqui o seu certificado codificado em PEM.",
@@ -295,7 +372,7 @@
    "fix": "Corrigido",
    "dns_providers": "Aqui está uma <0>lista de provedores de DNS conhecidos</0> para escolher.",
    "update_now": "Actualizar agora",
-    "update_failed": "A atualização automática falhou. Por favor, <a>siga estes passos</a> para actualizar manualmente.",
+    "update_failed": "A actualização automática falhou. Por favor, <a>siga estes passos</a> para actualizar manualmente.",
    "processing_update": "Por favor espere, o AdGuard Home está a actualizar-se",
    "clients_title": "Clientes",
    "clients_desc": "Configure os dispositivos ligados ao AdGuard",
@@ -322,6 +399,7 @@
    "client_updated": "Cliente \"{{key}}\" actualizado com sucesso",
    "clients_not_found": "Nenhum cliente foi encontrado",
    "client_confirm_delete": "Tem a certeza de que deseja excluir o cliente \"{{key}}\"?",
+    "list_confirm_delete": "Você tem certeza de que deseja excluir essa lista?",
    "auto_clients_title": "Clientes (tempo de execução)",
    "auto_clients_desc": "Dados dos clientes que usam o AdGuard Home, que não são armazenados na configuração",
    "access_title": "Configurações de acesso",
@@ -339,7 +417,8 @@
    "dns_privacy": "Privacidade de DNS",
    "setup_dns_privacy_1": "<0>DNS-sobre-TLS:</0> Use <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-sobre-HTTPS:</0> Use <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Por favor, note que os protocolos de DNS criptografados são suportados apenas no Android 9. Então, irá precisar de instalar um software adicional noutros sistemas operacionais.</0><0>Aqui está a lista de software que pode usar.</0>",
+    "setup_dns_privacy_3": "<0>Aqui está uma lista de softwares que você pode usar.</0>",
+    "setup_dns_privacy_4": "Em um dispositivo iOS 14 ou macOS Big Sur, você pode transferir o ficheiro especial '.mobileconfig' que adiciona os servidores <highlight>DNS-sobre-HTTPS</highlight> ou <highlight>DNS-sobre-TLS</highlight> nas definições de DNS.",
    "setup_dns_privacy_android_1": "O Android 9 suporta o DNS-sobre-TLS de forma nativa. Para o configurar, vá a Definições → Rede e internet → Avançado → DNS privado e digite o seu nome de domínio.",
    "setup_dns_privacy_android_2": "O <0>AdGuard para Android</0> suporta <1>DNS-sobre-HTTPS</1> e <1>DNS-sobre-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> adiciona o suporte <1>DNS-sobre-HTTPS</1> para o Android.",
@@ -359,6 +438,7 @@
    "rewrite_confirm_delete": "Tem a certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
    "rewrite_applied": "Regra de reescrita aplicada",
+    "rewrite_hosts_applied": "Reescrito pela regra do arquivo de hosts",
    "dns_rewrites": "Reescritas de DNS",
    "form_domain": "Inserir domínio",
    "form_answer": "Insira o endereço de IP ou nome de domínio",
@@ -388,6 +468,8 @@
    "domain": "Domínio",
    "answer": "Resposta",
    "filter_added_successfully": "O filtro foi adicionado com sucesso",
+    "filter_removed_successfully": "A lista foi removida com sucesso",
+    "filter_updated": "O filtro atualizado com sucesso",
    "statistics_configuration": "Configuração das estatísticas",
    "statistics_retention": "Retenção de estatísticas",
    "statistics_retention_desc": "Se diminuir o valor do intervalo, alguns dados serão perdidos",
@@ -417,12 +499,92 @@
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Saiba mais</0>sobre como criar as suas próprias listas negras de servidores.",
    "blocked_by_response": "Bloqueado por CNAME ou IP em resposta",
+    "blocked_by_cname_or_ip": "Bloqueado por CNAME ou IP",
    "try_again": "Tente novamente",
    "domain_desc": "Insere o nome do domínio para ser reescrito.",
    "example_rewrite_domain": "reescrever resposta apenas para este domínio.",
    "example_rewrite_wildcard": "reescrever resposta para todos <0>example.org</0> sub-domínios.",
+    "rewrite_ip_address": "Endereço IP: use esse IP em uma resposta A ou AAAA",
+    "rewrite_domain_name": "Nome de domínio: adicione um registro CNAME",
+    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registros do upstream",
+    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do servidor DNS primário",
+    "disable_ipv6": "Desactivar IPv6",
+    "disable_ipv6_desc": "Se este recurso estiver ativado, todas as consultas de DNS para endereços IPv6 (tipo AAAA) serão ignoradas.",
+    "fastest_addr": "Endereço de IP mais rápido",
+    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso irá retardar as consultas ao DNS, pois temos que esperar por respostas de todos os servidores DNS, porém melhorando a conectividade em geral.",
+    "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
+    "autofix_warning_list": "Ele irá realizar estas tarefas: <0>Desactivar sistema DNSStubListener</0> <0>Definir endereço do servidor DNS para 127.0.0.1</0> <0>Substituir o alvo simbólico do link /etc/resolv.conf para /run/systemd/resolv.conf</0> <0>Parar DNSStubListener (recarregar serviço resolvido pelo sistema)</0>",
+    "autofix_warning_result": "Como resultado, todos as solicitações DNS do seu sistema serão processadas pelo AdGuard Home por padrão.",
+    "tags_title": "Etiquetas",
+    "tags_desc": "Você pode selecionar as etiquetas que correspondem ao cliente. As tags podem ser incluídas nas regras de filtragem e permitir que você as aplique com mais precisão. <0>Saiba mais</0>",
+    "form_select_tags": "Seleccione as tags do cliente",
+    "check_title": "Verifique a filtragem",
+    "check_desc": "Verificar se o nome do host está sendo filtrado",
+    "check": "Verificar",
    "form_enter_host": "Insira o hostname",
+    "filtered_custom_rules": "Filtrado pelas regras de filtragem personalizadas",
+    "choose_from_list": "Escolher na lista",
+    "add_custom_list": "Adicionar uma lista personalizada",
+    "host_whitelisted": "O host está na lista branca",
+    "check_ip": "Endereços de IP: {{ip}}",
+    "check_cname": "CNAME: {{cname}}",
+    "check_reason": "Motivo: {{reason}}",
+    "check_rule": "Regra: {{rule}}",
+    "check_service": "Nome do serviço: {{service}}",
+    "service_name": "Nome do serviço",
+    "check_not_found": "Não encontrado nas tuas listas de filtros",
+    "client_confirm_block": "Você tem certeza de que deseja bloquear o cliente \"{{ip}}\"?",
+    "client_confirm_unblock": "Você tem certeza de que deseja desbloquear o cliente \"{{ip}}\"?",
+    "client_blocked": "Cliente \"{{ip}}\" foi bloqueado com sucesso",
+    "client_unblocked": "Cliente \"{{ip}}\" foi desbloqueado com sucesso",
+    "static_ip": "Endereço de IP estático",
+    "static_ip_desc": "O AdGuard Home é um servidor, portanto, ele precisa de um endereço de IP estático para funcionar corretamente. Caso contrário, em algum momento, seu roteador poderá atribuir um novo endereço de IP neste dispositivo.",
+    "set_static_ip": "Definir um endereço de IP estático",
+    "install_static_ok": "Boas notícias! O endereço de IP estático já está configurado",
+    "install_static_error": "O AdGuard Home não pode configurar automaticamente para esta interface de rede. Por favor, procure uma instrução sobre como fazer isso manualmente.",
+    "install_static_configure": "Detectamos que um endereço de IP dinâmico é sendo usado — <0>{{ip}}</0>. Deseja utilizar como seu endereço estático?",
+    "confirm_static_ip": "O AdGuard Home irá configurar {{ip}} para ser seu endereço IP estático. Deseja continuar?",
+    "list_updated": "{{count}} lista actualizada",
+    "list_updated_plural": "{{count}} listas actualizadas",
+    "dnssec_enable": "Activar DNSSEC",
+    "dnssec_enable_desc": "Definir a flag DNSSEC nas consultas de DNS em andamento e verificar o resultado (é necessário um resolvedor DNSSEC ativado)",
+    "validated_with_dnssec": "Validado com DNSSEC",
+    "all_queries": "Todas as consultas",
    "show_blocked_responses": "Bloqueado",
    "show_whitelisted_responses": "Lista Branca",
-    "show_processed_responses": "Processado"
+    "show_processed_responses": "Processado",
+    "blocked_safebrowsing": "Bloqueado pela navegação segura",
+    "blocked_adult_websites": "Sítios adultos bloqueados",
+    "blocked_threats": "Ameaças bloqueadas",
+    "allowed": "Permitido",
+    "filtered": "Filtrado",
+    "rewritten": "Reescrito",
+    "safe_search": "Pesquisa segura",
+    "blocklist": "Lista negra",
+    "milliseconds_abbreviation": "ms",
+    "cache_size": "Tamanho do cache",
+    "cache_size_desc": "Tamanho do cache do DNS (em bytes)",
+    "cache_ttl_min_override": "Sobrepor o TTL mínimo",
+    "cache_ttl_max_override": "Sobrepor o TTL máximo",
+    "enter_cache_size": "Digite o tamanho do cache (bytes)",
+    "enter_cache_ttl_min_override": "Digite o TTL máximo (segundos)",
+    "enter_cache_ttl_max_override": "Digite o TTL máximo (segundos)",
+    "cache_ttl_min_override_desc": "Prolongue os valores de curta duração (segundos) recebidos do servidor primário ao armazenar em cache as respostas DNS",
+    "cache_ttl_max_override_desc": "Defina um valor máximo de tempo de vida (segundos) para entradas no cache DNS",
+    "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
+    "filter_category_general": "Geral",
+    "filter_category_security": "Segurança",
+    "filter_category_regional": "Regional",
+    "filter_category_other": "Outro",
+    "filter_category_general_desc": "Listas que bloqueiam o rastreamento e a publicidade na maioria dos dispositivos",
+    "filter_category_security_desc": "Listas especializadas em bloquear domínios de malware, phishing ou fraude",
+    "filter_category_regional_desc": "Listas focadas em anúncios regionais e servidores de rastreamento",
+    "filter_category_other_desc": "Outras listas negras",
+    "setup_config_to_enable_dhcp_server": "Configure a configuração para habilitar o servidor DHCP",
+    "original_response": "Resposta original",
+    "click_to_view_queries": "Clique para ver as consultas",
+    "port_53_faq_link": "A porta 53 é frequentemente ocupada por serviços \"DNSStubListener\" ou \"systemd-resolved\". Por favor leia <0>essa instrução</0> para resolver isso.",
+    "adg_will_drop_dns_queries": "O AdGuard Home descartará todas as consultas DNS deste cliente.",
+    "client_not_in_allowed_clients": "O cliente não é permitido porque não está na lista \"Clientes permitidos\".",
+    "experimental": "Experimental"
 }
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Setări client",
    "example_upstream_reserved": "Puteți preciza un DNS upstream <0>de domeniu(ii) specific(e)</0>",
+    "example_upstream_comment": "Puteți specifica comentariul",
    "upstream_parallel": "Folosiți interogări paralele pentru rezolvări rapide interogând simultan toate serverele în amonte",
    "parallel_requests": "Solicitări paralele",
    "load_balancing": "Echilibrare-sarcini",
@@ -114,7 +115,7 @@
    "average_processing_time": "Timpul mediu de procesare",
    "average_processing_time_hint": "Timp mediu în milisecunde la procesarea unei cereri DNS",
    "block_domain_use_filters_and_hosts": "Blocați domenii folosind filtre și fișiere hosts",
-    "filters_block_toggle_hint": "Puteți configura regulile de blocare în setările <a href='#filters'> Filtre </a>.",
+    "filters_block_toggle_hint": "Puteți configura regulile de blocare în setările <a>Filtre</a>.",
    "use_adguard_browsing_sec": "Utilizați serviciul Navigarea în Securitate AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home va verifica dacă domeniul este în lista negră a serviciul web de securitate de navigare. Pentru acesta va utiliza un lookup API discret: un prefix scurt al numelui de domeniu SHA256 hash este trimis serverului.",
    "use_adguard_parental": "Utilizați Controlul Parental AdGuard",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Blocarea IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Descărcați .mobileconfig pentru DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Descărcați .mobileconfig pentru DNS-over-TLS",
    "plain_dns": "DNS simplu",
    "form_enter_rate_limit": "Introduceți limita ratei",
    "rate_limit": "Limita ratei",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Numărul de solicitări pe secundă pe care un singur client este permis să le facă (setând-o la 0 înseamnă nelimitat)",
    "blocking_ipv4_desc": "Adresa IP de returnat pentru o cerere A de blocare",
    "blocking_ipv6_desc": "Adresa IP de returnat pentru o cerere AAAA de blocare",
-    "blocking_mode_default": "Implicit: Răspunde cu REFUSED când sunt blocate de regulă tip Adblock; răspunde cu adresa IP specificată în regulă când sunt blocate de regula tip /etc/hosts",
+    "blocking_mode_default": "Implicit: Răspunde cu adresa IP (0.0.0.0 for A; :: pentru AAAA) când sunt blocate de regulă tip Adblock; răspunde cu adresa IP specificată în regulă când sunt blocate de regula tip /etc/hosts",
    "blocking_mode_refused": "REFUZAT: Răspunde cu codul REFUZAT",
    "blocking_mode_nxdomain": "NXDOMAIN: Răspunde cu codul NXDOMAIN",
    "blocking_mode_null_ip": "IP nul: răspunde cu o adresă IP zero (0.0.0.0 pentru A; :: pentru AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "Confidențialitate DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Folosiți stringul <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Folosiți stringul <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Rețineți că protocoalele DNS criptate sunt acceptate numai pe Android 9. Așadar, trebuie să instalați programe suplimentare pentru alte sisteme de operare.</0><0>Iată o listă de software pe care o puteți utiliza.</0>",
+    "setup_dns_privacy_3": "<0>lată o listă de software pe care le puteți utiliza.</0>",
+    "setup_dns_privacy_4": "Pe un dispozitiv iOS 14 sau macOS Big Sur puteți descărca fișierul special '.mobileconfig' care adaugă servere <highlight>DNS-over-HTTPS</highlight> sau <highlight>DNS-over-TLS</highlight> la setările DNS.",
    "setup_dns_privacy_android_1": "Android 9 acceptă DNS-over-TLS nativ. Pentru a-l configura, accesați Setări → Rețea și internet → Advanced → Private DNS și introduceți numele de domeniu acolo.",
    "setup_dns_privacy_android_2": "<0>AdGuard pentru Android</0> acceptă <1>DNS-over-HTTPS</1> și <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> adaugă <1>DNS-over-HTTPS</1> suport pentru Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Cauza: {{reason}}",
    "check_rule": "Regula: {{rule}}",
    "check_service": "Nume servici: {{service}}",
+    "service_name": "Numele serviciului",
    "check_not_found": "Nu se găsește în listele de filtre",
    "client_confirm_block": "Sunteți sigur că doriți să blocați clientul \"{{ip}}\"?",
    "client_confirm_unblock": "Sunteți sigur că doriți să deblocați clientul \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Mărime cache DNS (în octeți)",
    "cache_ttl_min_override": "Suprascrieți minimum TTL",
    "cache_ttl_max_override": "Suprascrieți maximum TTL",
-    "enter_cache_size": "Introduceți mărime cache",
-    "enter_cache_ttl_min_override": "Introduceți minimum TTL",
-    "enter_cache_ttl_max_override": "Introduceți maximum TTL",
-    "cache_ttl_min_override_desc": "Suprascrie valoarea TTL (minimum) primită de la serverul din amonte",
-    "cache_ttl_max_override_desc": "Suprascrie valoarea TTL (maximum) primită de la serverul din amonte",
+    "enter_cache_size": "Introduceți mărimea cache-ului (bytes)",
+    "enter_cache_ttl_min_override": "Introduceți minimum TTL (secunde)",
+    "enter_cache_ttl_max_override": "Introduceți maximum TTL (secunde)",
+    "cache_ttl_min_override_desc": "Extinde valorile timp-de-viață scurte (secunde) primite de la serverul din amonte la stocarea în cache a răspunsurilor DNS",
+    "cache_ttl_max_override_desc": "Setează o valoare maximă a timpului-de-viață (secunde) pentru intrările din memoria cache DNS",
    "ttl_cache_validation": "Valoarea TTL cache minimă trebuie să fie mai mică sau egală cu valoarea maximă",
    "filter_category_general": "General",
    "filter_category_security": "Securitate",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Clicați pentru a vizualiza interogări",
    "port_53_faq_link": "Portul 53 este adesea ocupat de serviciile \"DNSStubListener\" sau \"systemd-resolved\". Vă rugăm să citiți <0>această instrucțiune</0> despre cum să rezolvați aceasta.",
    "adg_will_drop_dns_queries": "AdGuard Home va renunța la toate interogările DNS de la acest client.",
+    "client_not_in_allowed_clients": "Clientul nu este permis deoarece nu este în lista de \"Clienți permiși\".",
    "experimental": "Experimental"
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Настройки клиентов",
    "example_upstream_reserved": "Вы можете указать DNS-сервер <0>для конкретного домена(-ов)</0>",
+    "example_upstream_comment": "Вы можете указать комментарий",
    "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса",
    "parallel_requests": "Параллельные запросы",
    "load_balancing": "Распределение нагрузки\n",
@@ -114,7 +115,7 @@
    "average_processing_time": "Среднее время обработки запроса",
    "average_processing_time_hint": "Среднее время для обработки запроса DNS  в миллисекундах",
    "block_domain_use_filters_and_hosts": "Блокировать домены с использованием фильтров и файлов хостов",
-    "filters_block_toggle_hint": "Вы можете настроить правила блокировки в <a href='#filters'> \"Фильтрах\"</a>.",
+    "filters_block_toggle_hint": "Вы можете настроить правила блокировки в <a>\"Фильтрах\"</a>.",
    "use_adguard_browsing_sec": "Включить Безопасную навигацию AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home проверит, включен ли домен в веб-службу безопасности браузера. Он будет использовать API, чтобы выполнить проверку: на сервер отправляется только короткий префикс имени домена SHA256.",
    "use_adguard_parental": "Включить модуль Родительского контроля AdGuard ",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Блокировка IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Скачать .mobileconfig для DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Скачать .mobileconfig для DNS-over-TLS",
    "plain_dns": "Нешифрованный DNS",
    "form_enter_rate_limit": "Введите rate limit",
    "rate_limit": "Rate limit",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Ограничение на количество запросов в секунду для каждого клиента (0 — неограниченно)",
    "blocking_ipv4_desc": "IP-адрес, возвращаемый при блокировке A-запроса",
    "blocking_ipv6_desc": "IP-адрес, возвращаемый при блокировке AAAA-запроса",
-    "blocking_mode_default": "Стандартный: Отвечает с REFUSED, когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле /etc/hosts",
+    "blocking_mode_default": "Стандартный: Отвечает с нулевым IP-адресом, (0.0.0.0 для A; :: для AAAA) когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле /etc/hosts-style",
    "blocking_mode_refused": "REFUSED: Отвечает с кодом REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Отвечает с кодом NXDOMAIN\n",
    "blocking_mode_null_ip": "Нулевой IP: Отвечает с нулевым IP-адресом (0.0.0.0 для A; :: для AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "Зашифрованный DNS",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Используйте строку <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Используйте строку <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Обратите внимание, что зашифрованный DNS-протокол поддерживается только на Android 9. Для других операционных систем вам нужно будет установить дополнительное ПО.</0><0>Вот список ПО, которое вы можете использовать.</0>",
+    "setup_dns_privacy_3": "<0>Вот список ПО, которое вы можете использовать.</0>",
+    "setup_dns_privacy_4": "На устройствах с iOS 14 и macOS Big Sur вы можете скачать специальный файл '.mobileconfig', который добавляет <highlight>DNS-over-HTTPS</highlight> или <highlight>DNS-over-TLS</highlight> серверы в настройки DNS.",
    "setup_dns_privacy_android_1": "Android 9 нативно поддерживает DNS-over-TLS. Для настройки, перейдите в Настройки → Сеть и Интернет → Дополнительно → Персональный DNS сервер, и введите туда ваше доменное имя.",
    "setup_dns_privacy_android_2": "<0>AdGuard для Android</0> поддерживает <1>DNS-over-HTTPS</1> и <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> добавляет поддержка <1>DNS-over-HTTPS</1> на Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Причина: {{reason}}",
    "check_rule": "Правило: {{rule}}",
    "check_service": "Название сервиса: {{service}}",
+    "service_name": "Имя сервиса",
    "check_not_found": "Не найдено в вашем списке фильтров",
    "client_confirm_block": "Вы уверены, что хотите заблокировать клиента \"{{ip}}\"?",
    "client_confirm_unblock": "Вы уверены, что хотите разблокировать клиента \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Размера кеша DNS (в байтах)",
    "cache_ttl_min_override": "Переопределить минимальный TTL (в секундах)",
    "cache_ttl_max_override": "Переопределить максимальный TTL (в секундах)",
-    "enter_cache_size": "Введите размер кеша",
-    "enter_cache_ttl_min_override": "Введите минимальный TTL",
-    "enter_cache_ttl_max_override": "Введите максимальный TTL",
-    "cache_ttl_min_override_desc": "Переопределить TTL-значение (минимальное), полученное с upstream-сервера",
-    "cache_ttl_max_override_desc": "Переопределить TTL-значение (максимальное), полученное с upstream-сервера",
+    "enter_cache_size": "Введите размер кеша (в байтах)",
+    "enter_cache_ttl_min_override": "Введите минимальный TTL (в секундах)",
+    "enter_cache_ttl_max_override": "Введите максимальный TTL (в секундах)",
+    "cache_ttl_min_override_desc": "Расширить короткие TTL-значения (в секундах), полученные с upstream-сервера при кешировании DNS-ответов",
+    "cache_ttl_max_override_desc": "Установить максимальное TTL-значение (в секундах) для записей в DNS-кэше",
    "ttl_cache_validation": "Минимальное значение TTL кеша должно быть меньше или равно максимальному значению",
    "filter_category_general": "Общие",
    "filter_category_security": "Безопасность",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
    "port_53_faq_link": "Порт 53 часто занят службами \"DNSStubListener\" или \"systemd-resolved\". Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить.",
    "adg_will_drop_dns_queries": "AdGuard Home AdGuard Home сбросит все DNS-запросы от этого клиента.",
+    "client_not_in_allowed_clients": "Клиент не разрешён, так как его нет в списке \"Разрешённых клиентов\".",
    "experimental": "Экспериментальный"
 }
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -1,14 +1,19 @@
 {
    "client_settings": "අනුග්‍රාහක සැකසුම්",
-    "check_dhcp_servers": "DHCP සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
+    "parallel_requests": "සමාන්තර ඉල්ලීම්",
+    "load_balancing": "ධාරිතාව තුලනය",
+    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
    "save_config": "වින්‍යාසය සුරකින්න",
-    "enabled_dhcp": "DHCP සේවාදායකය සබල කර ඇත",
-    "disabled_dhcp": "DHCP සේවාදායකය අබල කර ඇත",
+    "enabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය සබල කර ඇත",
+    "disabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය අබල කර ඇත",
+    "unavailable_dhcp_desc": "ඇඩ්ගාර්ඩ් හෝම් හට ඔබගේ මෙහෙයුම් පද්ධතියේ ග.ධා.වි.කෙ. සේවාදායකයක් ධාවනය කළ නොහැක",
    "dhcp_title": "ග.ධා.වි.කෙ. සේවාදායකය (පර්යේෂණාත්මක!)",
-    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට AdGuardHome හි ඇති ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
-    "dhcp_enable": "DHCP සේවාදායකය සබල කරන්න",
-    "dhcp_disable": "DHCP සේවාදායකය අබල කරන්න",
-    "dhcp_config_saved": "DHCP වින්‍යාසය සාර්ථකව සුරකින ලදි",
+    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට ඇඩ්ගාර්ඩ් හි ඇති ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
+    "dhcp_enable": "ග.ධා.වි.කෙ. සේවාදායකය සබල කරන්න",
+    "dhcp_disable": "ග.ධා.වි.කෙ. සේවාදායකය අබල කරන්න",
+    "dhcp_config_saved": "ග.ධා.වි.කෙ. වින්‍යාසය සාර්ථකව සුරකින ලදි",
+    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. IPv4 සැකසුම්",
+    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. IPv6 සැකසුම්",
    "form_error_required": "අවශ්‍ය ක්ෂේත්‍රයකි",
    "form_error_ip4_format": "වලංගු නොවන IPv4 ආකෘතියකි",
    "form_error_ip6_format": "වලංගු නොවන IPv6 ආකෘතියකි",
@@ -20,17 +25,17 @@
    "dhcp_form_range_title": "අ.ජා. කෙ. (IP) ලිපින පරාසය",
    "dhcp_form_range_start": "පරාසය ආරම්භය",
    "dhcp_form_range_end": "පරාසය අවසානය",
-    "dhcp_interface_select": "ග.ධා.වි.කෙ. (DHCP) අතුරුමුහුණත තෝරන්න",
+    "dhcp_interface_select": "ග.ධා.වි.කෙ. අතුරුමුහුණත තෝරන්න",
    "dhcp_hardware_address": "දෘඩාංග ලිපිනය",
    "dhcp_ip_addresses": "අ.ජා. කෙ. (IP) ලිපින",
    "ip": "අ.ජා. කෙ. (IP)",
    "dhcp_table_hostname": "ධාරක නාමය",
    "dhcp_table_expires": "කල් ඉකුත් වීම",
-    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. (DHCP) සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. එසේ නොමැති නම්, එය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
-    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. (DHCP) සේවාදායකයක් තිබේද යන්න අපට තීරණය කළ නොහැකි විය.",
-    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. (DHCP) සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට අප අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
-    "dhcp_dynamic_ip_found": "ඔබේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. (DHCP) සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ ග.ධා.වි.කෙ. සබල කරන්න බොත්තම එබුවහොත් අපි ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසන්නෙමු.",
-    "dhcp_reset": "ග.ධා.වි.කෙ. (DHCP) වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
+    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. එසේ නොමැති නම්, එය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
+    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. සේවාදායකයක් තිබේද යන්න අපට තීරණය කළ නොහැකි විය.",
+    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට අප අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
+    "dhcp_dynamic_ip_found": "ඔබේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ ග.ධා.වි.කෙ. සබල කරන්න බොත්තම එබුවහොත් අපි ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසන්නෙමු.",
+    "dhcp_reset": "ග.ධා.වි.කෙ. වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
    "country": "රට",
    "city": "නගරය",
    "delete_confirm": "\"{{key}}\" මකා දැමීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
@@ -46,6 +51,7 @@
    "filters": "පෙරහන්",
    "filter": "පෙරහන",
    "query_log": "විමසුම් ලොගය",
+    "compact": "සංක්ෂිප්ත",
    "nothing_found": "කිසිවක් සොයාගත නොහැක",
    "faq": "නිති අසන පැණ",
    "version": "අනුවාදය",
@@ -74,32 +80,38 @@
    "requests_count": "ඉල්ලීම් ගණන",
    "top_blocked_domains": "ජනප්‍රිය අවහිර කළ වසම්",
    "top_clients": "ජනප්‍රිය අනුග්‍රාහකයන්",
-    "general_statistics": "පොදු සංඛ්යාලේඛන",
-    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කරන ලද DNS ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard browsing security ඒකකය මගින් අවහිර කරන ලද DNS ඉල්ලීම් ගණන",
+    "general_statistics": "පොදු සංඛ්‍යාලේඛන",
+    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
+    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard browsing security ඒකකය මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි ගණන",
    "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන ලද",
-    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා DNS ඉල්ලීම් ගණන",
+    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
    "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
-    "average_processing_time_hint": "DNS ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
+    "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
    "block_domain_use_filters_and_hosts": "පෙරහන් සහ ධාරක ගොනු භාවිතා කරමින් වසම් අවහිර කරන්න",
-    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a href='#filters'>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
-    "use_adguard_browsing_sec": "AdGuard browsing security web service භාවිතා කරන්න",
+    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
+    "use_adguard_browsing_sec": "AdGuard browsing security වෙබ් සේවාව භාවිතා කරන්න",
    "use_adguard_parental": "AdGuard parental control වෙබ් සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි AdGuard Home විසින් පරීක්ෂා කරනු ඇත. එය browsing security වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී API භාවිතා කරයි.",
+    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය browsing security වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
    "enforce_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන්න",
-    "enforce_save_search_hint": "AdGuard Home හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: Google, Youtube, Bing, DuckDuckGo සහ Yandex.",
+    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
    "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
    "general_settings": "පොදු සැකසුම්",
    "dns_settings": "DNS සැකසුම්",
    "dns_blocklists": "DNS අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
    "dns_allowlists": "DNS අවසර දීමේ ලැයිස්තු",
-    "dns_allowlists_desc": "DNS අවසර දීමේ ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව අඩංගු වුවද එය න‌ොසලකා හැර අවසර දෙනු ලැබේ.",
+    "dns_blocklists_desc": "ඇඩ්ගාර්ඩ් හෝම් විසින් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු වලට ගැලපෙන වසම් අවහිර කරනු ඇත.",
+    "dns_allowlists_desc": "අවසර දීමේ ව.නා.ප. ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක අඩංගු වුවද එය නොසලකා හැර අවසර දෙනු ලැබේ.",
    "custom_filtering_rules": "අභිරුචි පෙරීමේ නීති",
    "encryption_settings": "සංකේතාංකන සැකසුම්",
    "dhcp_settings": "DHCP සැකසුම්",
+    "upstream_dns": "Upstream ව.නා.ප. (DNS) සේවාදායකයන්",
+    "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුළත් කරන්න. upstream ව.නා.ප. සේවාදායකයන් වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
+    "apply_btn": "යොදන්න",
    "disabled_filtering_toast": "පෙරීම අබල කර ඇත",
    "enabled_filtering_toast": "පෙරීම සබල කර ඇත",
+    "disabled_safe_browsing_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
+    "enabled_safe_browsing_toast": "ආරක්ෂිත සෙවීම සබල කර ඇත",
    "disabled_parental_toast": "Parental control අබල කර ඇත",
    "enabled_parental_toast": "Parental control සබල කර ඇත",
    "disabled_safe_search_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
@@ -113,6 +125,8 @@
    "request_table_header": "ඉල්ලීම",
    "edit_table_action": "සංස්කරණය කරන්න",
    "delete_table_action": "මකන්න",
+    "elapsed": "ගත වූූූ කාලය",
+    "filters_and_hosts_hint": "ඇඩ්ගාර්ඩ් හෝම් මූලික දැන්වීම් වාරණ නීති සහ ධාරක ගොනු පද ගැලපුම් තේරුම් ගනී.",
    "no_blocklist_added": "අවහිර කිරීමේ ලැයිස්තු එකතු කර නැත",
    "no_whitelist_added": "අවසර දීමේ ලැයිස්තු එකතු කර නැත",
    "add_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක් එකතු කරන්න",
@@ -125,28 +139,36 @@
    "new_allowlist": "නව අවසර දීමේ ලැයිස්තුව",
    "edit_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව සංස්කරණය කරන්න",
    "edit_allowlist": "අවසර දීමේ ලැයිස්තුව සංස්කරණය කරන්න",
+    "choose_blocklist": "අවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
+    "choose_allowlist": "අනවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
    "enter_valid_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
    "enter_valid_allowlist": "අවසර දීමේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
    "form_error_url_format": "වලංගු නොවන URL ආකෘතියකි",
    "form_error_url_or_path_format": "ලැයිස්තුවක වලංගු නොවන URL හෝ ස්ථීර මාර්ගයකි",
    "custom_filter_rules": "අභිරුචි පෙරීමේ නීති",
+    "custom_filter_rules_hint": "පේළියකට එක් නීතියක් බැගින් ඇතුළත් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ ධාරක ගොනු පද ගැලපුම් භාවිතා කළ හැකිය.",
    "examples_title": "උදාහරණ",
-    "example_meaning_filter_block": "example.org වසමට සහ එහි සියලුම උප වසම් වලට පිවිසීම අවහිර කරන්න",
-    "example_meaning_filter_whitelist": "example.org වසමට සහ එහි සියලුම උප වසම් වලට ප්‍රවේශය අවහිර නොකරන්න",
-    "example_meaning_host_block": "AdGuard Home දැන් example.org වසම සඳහා 127.0.0.1 ලිපිනය ලබා දෙනු ඇත (නමුත් එහි උප ලිපින නොවේ).",
+    "example_meaning_filter_block": "example.org වසමට සහ එහි සියලුම උප වසම් වලට පිවිසීම අවහිර කරයි",
+    "example_meaning_filter_whitelist": "example.org වසමට සහ එහි සියලුම උප වසම් වලට ප්‍රවේශය අවහිර නොකරයි",
+    "example_meaning_host_block": "ඇඩ්ගාර්ඩ් හෝම් දැන් example.org වසම සඳහා 127.0.0.1 ලිපිනය ලබා දෙනු ඇත (නමුත් එහි උප ලිපින නොවේ).",
    "example_comment": "! මෙතැන අදහස් දැක්වීමක්",
-    "example_comment_meaning": "විස්තර කිිරීමක්",
+    "example_comment_meaning": "විස්තර කිරීමක්",
    "example_comment_hash": "# එසේම අදහස් දැක්වීමක්",
-    "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත පිවිසීම අවහිර කරන්න",
+    "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත පිවිසීම අවහිර කරයි",
    "example_upstream_regular": "සාමාන්‍ය DNS (UDP හරහා)",
    "example_upstream_dot": "සංකේතාංකනය කළ <0>DNS-over-TLS</0>",
    "example_upstream_doh": "සංකේතාංකනය කළ <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "සංකේතාංකනය කළ <0>DNS-over-QUIC</0>",
    "example_upstream_tcp": "සාමාන්‍ය DNS (TCP හරහා)",
    "all_lists_up_to_date_toast": "සියලුම ලැයිස්තු දැනටමත් යාවත්කාලීනයි",
-    "dns_test_ok_toast": "සඳහන් කළ DNS සේවාදායකයන් නිවැරදිව ක්‍රියා කරයි",
-    "dns_test_not_ok_toast": "සේවාදායකය \"{{key}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
-    "unblock": "අනවහිර කරන්න",
-    "block": "අවහිර කරන්න",
+    "dns_test_ok_toast": "සඳහන් කළ ව.නා.ප. සේවාදායකයන් නිවැරදිව ක්‍රියා කරයි",
+    "dns_test_not_ok_toast": "සේවාදායක \"{{key}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
+    "unblock": "අනවහිර",
+    "block": "අවහිර",
+    "disallow_this_client": "මෙම අනුග්‍රාහකයට අවසර නොදෙන්න",
+    "allow_this_client": "මෙම අනුග්‍රාහකයට අවසර දෙන්න",
+    "block_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අවහිර කරන්න",
+    "unblock_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අනවහිර කරන්න",
    "time_table_header": "වේලාව",
    "date": "දිනය",
    "domain_name_table_header": "වසම් නාමය",
@@ -177,11 +199,14 @@
    "query_log_strict_search": "ඉතා නිවැරදිව සෙවීම සඳහා ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
    "query_log_retention_confirm": "විමසුම් ලොගය රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
    "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා. කෙ. (IP) නිර්නාමික කරන්න",
-    "dns_config": "DNS සේවාදායක වින්‍යාසය",
+    "anonymize_client_ip_desc": "ලොග සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ සම්පූර්ණ අ.ජා. කෙ. ලිපිනය සුරකීමෙන් වලකින්න",
+    "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
+    "blocking_mode": "අවහිර කරන ආකාරය",
    "default": "සුපුරුදු",
    "nxdomain": "නොපවතින වසම",
-    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ. (IP)",
-    "custom_ip": "අභිරුචි අ.ජා. කෙ. (IP)",
+    "refused": "REFUSED",
+    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ.",
+    "custom_ip": "අභිරුචි අ.ජා. කෙ.",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුළත් කරන්න",
@@ -189,26 +214,31 @@
    "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
    "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
    "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
+    "blocking_mode_default": "පොදු: දැන්වීම් අවහිර කරන ආකාරයේ නීතියක් මගින් අවහිර කළ විට REFUSED සමඟ ප්‍රතිචාර දක්වයි; /etc/host-style ආකාරයේ නීතියක් මගින් අවහිර කළ විට නීතියේ දක්වා ඇති අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි",
+    "blocking_mode_refused": "REFUSED: REFUSED කේතය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_nxdomain": "නොපවතින වසම (NXDOMAIN): NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
-    "blocking_mode_null_ip": "අභිශූන්‍යය අන්තර්ජාල කෙටුම්පත: ශුන්‍ය අ.ජා. කෙ. (IP) ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
-    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. (IP) ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, AdGuard Home විසින් <0>DNS සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
+    "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා. කෙ. : ශුන්‍ය අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
+    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
+    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>DNS සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
+    "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
    "source_label": "මූලාශ්‍රය",
+    "found_in_known_domain_db": "දැනුවත් වසම් දත්ත ගබඩාවේ හමු විය.",
    "category_label": "ප්‍රවර්ගය",
    "rule_label": "නීතිය",
    "list_label": "ලැයිස්තුව",
    "unknown_filter": "{{filterId}} නොදන්නා පෙරහනකි",
-    "known_tracker": "දන්නා ලුහුබැඳීමක්",
-    "install_welcome_title": "AdGuard Home වෙත සාදරයෙන් පිළිගනිමු!",
-    "install_welcome_desc": "AdGuard Home යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන DNS සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
+    "known_tracker": "දැනුවත් ලුහුබැඳීමක්",
+    "install_welcome_title": "ඇඩ්ගාර්ඩ් හෝම් වෙත සාදරයෙන් පිළිගනිමු!",
+    "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
    "install_settings_title": "පරිපාලක වෙබ් අතුරු මුහුණත",
    "install_settings_listen": "සවන් දෙන අතුරු මුහුණත",
    "install_settings_port": "කවුළුව",
    "form_error_port": "වලංගු කවුළුවක අගයක් ඇතුළත් කරන්න",
-    "install_settings_dns": "DNS සේවාදායකය",
+    "install_settings_dns": "ව.නා.ප. සේවාදායකය",
+    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ රවුටරය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
    "install_settings_all_interfaces": "සියලුම අතුරුමුහුණත්",
    "install_auth_title": "සත්‍යාපනය",
-    "install_auth_desc": "ඔබගේ AdGuard Home පරිපාලක වෙබ් අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌ය‌ෙ‌න් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
+    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වෙබ් අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
    "install_auth_username": "පරිශීලක නාමය",
    "install_auth_password": "මුරපදය",
    "install_auth_confirm": "මුරපදය තහවුරු කරන්න",
@@ -216,47 +246,51 @@
    "install_auth_password_enter": "මුරපදය ඇතුළත් කරන්න",
    "install_step": "පියවර",
    "install_devices_title": "ඔබගේ උපාංග වින්‍යාසගත කරන්න",
-    "install_devices_desc": "AdGuard Home භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කිරීම අවශ්‍ය වේ.",
+    "install_devices_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කිරීම අවශ්‍ය වේ.",
    "install_submit_title": "සුභ පැතුම්!",
-    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ AdGuard Home භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
+    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ ඇඩ්ගාර්ඩ් හෝම් භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
    "install_devices_router": "මාර්ගකාරකය",
    "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධ සියලුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒවා අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවනු ඇත.",
-    "install_devices_router_list_3": "ඔබගේ AdGuard Home සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
-    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ රවුටර වල අභිරුචි ව.නා.ප. (DNS) සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී AdGuard Home <0>ග.ධා.වි.කෙ. (DHCP) සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබග‌ේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
+    "install_devices_router_list_1": "ඔබේ මාර්ගකාරකය සඳහා වූ මනාපයන් විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ බ්‍රව්සරයෙන් URL එකක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) පිවිසිය හැකිය. මුරපදය ඇතුළත් කිරීමට ඔබෙන් ඉල්ලා සිටිය හැකිය. ඔබට එය මතක නැතිනම්, බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසිය හැක. සමහර මාර්ගකාරක සඳහා විශේෂිත යෙදුමක් අවශ්‍ය වන අතර, එය දැනටමත් ඔබේ පරිගණකයේ/දුරකථනයේ ස්ථාපනය කර තිබිය යුතුය.",
+    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. ඉලක්කම් කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අක්ෂර සොයන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
+    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
+    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ රවුටර වල අභිරුචි ව.නා.ප. (DNS) සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත සෙවිය යුතුය.",
    "install_devices_windows_list_1": "ආරම්භක මෙනුව හෝ වින්ඩෝස් සෙවුම හරහා පාලක පැනලය විවෘත කරන්න.",
    "install_devices_windows_list_2": "ජාල සහ අන්තර්ජාල ප්‍රවර්ගයට ගොස් පසුව ජාල සහ බෙදාගැනීමේ මධ්‍යස්ථානය වෙත යන්න.",
    "install_devices_windows_list_3": "උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම තිරයේ වම් පසින් සොයාගෙන එය මත ක්ලික් කරන්න.",
    "install_devices_windows_list_4": "ඔබගේ ක්‍රියාකාරී සම්බන්ධතාවය තෝරන්න, එය මත දකුණු-ක්ලික් කර ගුණාංග තෝරන්න.",
    "install_devices_windows_list_5": "ලැයිස්තුවේ ඇති අන්තර්ජාල කෙටුම්පත් අනුවාදය 4 (TCP/IP) සොයාගෙන එය තෝරා ඉන්පසු ගුණාංග මත නැවත ක්ලික් කරන්න.",
-    "install_devices_windows_list_6": "'පහත දැක්වෙන DNS සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_windows_list_6": "'පහත සඳහන් ව.නා.ප. සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
    "install_devices_macos_list_1": "ඇපල් අයිකනය මත ක්ලික් කර පද්ධති මනාපයන් වෙත යන්න.",
    "install_devices_macos_list_2": "ජාලය මත ක්ලික් කරන්න.",
    "install_devices_macos_list_3": "ඔබගේ ලැයිස්තුවේ පළමු සම්බන්ධතාවය තෝරා උසස් මත ක්ලික් කරන්න.",
-    "install_devices_macos_list_4": "DNS තීරුව තෝරා ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_macos_list_4": "ව.නා.ප. (DNS) තීරුව තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
    "install_devices_android_list_1": "ඇන්ඩ්‍රොයිඩ් මෙනුවෙහි මුල් තිරයෙන්, සැකසීම් මත තට්ටු කරන්න.",
-    "install_devices_android_list_2": "මෙනුවේ Wi-Fi මත තට්ටු කරන්න. පවතින සියලුම ජාල ලැයිස්තුගත කර ඇති තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි DNS සැකසිය නොහැක).",
+    "install_devices_android_list_2": "මෙනුවේ වයි-ෆයි මත තට්ටු කරන්න. පවතින සියලුම ජාල ලැයිස්තුගත කර ඇති තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි ව.නා.ප. සැකසිය නොහැක).",
    "install_devices_android_list_3": "ඔබ සම්බන්ධ වී ඇති ජාලය මත දිගු වේලාවක් ඔබන්න, ඉන්පසුව ජාලය වෙනස් කිරීම මත තට්ටු කරන්න.",
-    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල වැඩිදුර සැකසුම් බැලීමට \"උසස්\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් DNS සැකසුම් වෙනස් කිරීමට, අ.ජා. කෙ. (IP) සැකසුම් ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
-    "install_devices_android_list_5": "DNS 1 සහ DNS 2 පිහිටුවීම් අගයන් ඔබගේ AdGuard Home සේවාදායක ලිපින වලට වෙනස් කරන්න.",
+    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල වැඩිදුර සැකසුම් බැලීමට \"උසස්\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් ව.නා.ප. (DNS) සැකසුම් වෙනස් කිරීමට අ.ජා. කෙ. (IP) සැකසුම්, ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
+    "install_devices_android_list_5": "ව.නා.ප. 1 සහ ව.නා.ප. 2 පිහිටුවීම් අගයන් ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින වලට වෙනස් කරන්න.",
    "install_devices_ios_list_1": "මුල් තිරයේ සිට, සැකසුම් මත තට්ටු කරන්න.",
-    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි Wi-Fi තෝරන්න (ජංගම දුරකථන සඳහා DNS වින්‍යාසගත කිරීමට නොහැකිය).",
+    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි වයි-ෆයි තෝරන්න (ජංගම දුරකථන සඳහා ව.නා.ප. වින්‍යාසගත කිරීමට නොහැකිය).",
    "install_devices_ios_list_3": "දැනට ක්‍රියාකාරී ජාලයයහෙි නම මත තට්ටු කරන්න.",
-    "install_devices_ios_list_4": "DNS ක්ෂේත්‍රය තුළ ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_ios_list_4": "ව.නා.ප. (DNS) ක්ෂේත්‍රය තුළ ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
    "get_started": "ආරම්භ කර ගන්න",
    "next": "ඊළඟ",
    "open_dashboard": "උපකරණ පුවරුව විවෘත කරන්න",
    "install_saved": "සාර්ථකව සුරකින ලදි",
    "encryption_title": "සංකේතාංකනය",
-    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා DNS සහ පරිපාලක වෙබ් අතුරු මුහුණත සහය දක්වයි",
+    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වෙබ් අතුරු මුහුණත සහය දක්වයි",
    "encryption_config_saved": "සංකේතාංකන වින්‍යාසය සුරකින ලදි",
    "encryption_server": "සේවාදායක‌‌‌‌යේ නම",
    "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුළත් කරන්න",
    "encryption_redirect": "ස්වයංක්‍රීයව HTTPS වෙත හරවා යවන්න",
-    "encryption_redirect_desc": "සබල කර ඇත්නම්, AdGuard Home ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
+    "encryption_redirect_desc": "සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
    "encryption_https": "HTTPS කවුළුව",
-    "encryption_https_desc": "HTTPS කවුළුව වින්‍යාසගත කර ඇත්නම්, AdGuard Home පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/ dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
+    "encryption_https_desc": "HTTPS කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
    "encryption_dot": "DNS-over-TLS කවුළුව",
-    "encryption_dot_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත.",
+    "encryption_dot_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත.",
+    "encryption_doq": "DNS-over-QUIC කවුළුව",
+    "encryption_doq_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-QUIC සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත. එය පර්යේෂණාත්මක වන අතර විශ්වාසදායක නොවිය හැකිය. එසේම, මේ වන විට එයට සහාය දක්වන බොහෝ අනුග්‍රාහකයින් නොමැත.",
    "encryption_certificates": "සහතික",
    "encryption_certificates_input": "ඔබගේ PEM-කේතාංකනය කළ සහතික පිටපත් කර මෙහි අලවන්න.",
    "encryption_status": "තත්ත්වය",
@@ -264,7 +298,7 @@
    "encryption_key": "පුද්ගලික යතුර",
    "encryption_key_input": "ඔබගේ සහතිකය සඳහා PEM-කේතාංකනය කළ පුද්ගලික යතුර පිටපත් කර මෙහි අලවන්න.",
    "encryption_enable": "සංකේතාංකනය සබල කරන්න (HTTPS, DNS-over-HTTPS සහ DNS-over-TLS)",
-    "encryption_enable_desc": "සංකේතාංකනය සබල කර ඇත්නම්, AdGuard Home පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර DNS සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
+    "encryption_enable_desc": "සංකේතාංකනය සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර ව.නා.ප. සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
    "encryption_key_valid": "මෙය වලංගු {{type}} පුද්ගලික යතුරකි",
    "encryption_key_invalid": "මෙය වලංගු නොවන {{type}} පුද්ගලික යතුරකි",
    "encryption_subject": "මාතෘකාව",
@@ -278,18 +312,19 @@
    "form_error_equal": "සමාන නොවිය යුතුය",
    "form_error_password": "මුරපදය නොගැලපුුුුුුණි",
    "reset_settings": "සැකසුම් යළි පිහිටුවන්න",
-    "update_announcement": "AdGuard Home {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
+    "update_announcement": "ඇඩ්ගාර්ඩ් හෝම් {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
    "setup_guide": "පිහිටුවීමේ මාර්ගෝපදේශය",
    "dns_addresses": "DNS ලිපින",
-    "dns_start": "DNS සේවාදායකය ආරම්භ වෙමින් පවතී",
+    "dns_start": "ව.නා.ප. සේවාදායකය ආරම්භ වෙමින් පවතී",
+    "dns_status_error": "ව.නා.ප. සේවාදායකයේ තත්වය පරීක්ෂා කිරීමේදී දෝෂයකි",
    "down": "පහත",
    "fix": "නිරාකරණය කරන්න",
-    "dns_providers": "මෙහි තෝරා ගැනීමට <0>දන්නා DNS සපයන්නන්ගේ ලැයිස්තුවක්</0> ඇත.",
+    "dns_providers": "මෙහි තෝරා ගැනීමට <0>දැනුවත් ව.නා.ප. සපයන්නන්ගේ ලැයිස්තුවක්</0> ඇත.",
    "update_now": "දැන් \tයාවත්කාල කරන්න",
    "update_failed": "ස්වයංක්‍රීය යාවත්කාල කිරීම අසාර්ථක විය. අතින් යාවත්කාල කිරීමට කරුණාකර <a>පියවර අනුගමනය කරන්න</a>.",
-    "processing_update": "කරුණාකර රැඳී සිටින්න, AdGuard Home යාවත්කාලීන වෙමින් පවතී",
+    "processing_update": "කරුණාකර රැඳී සිටින්න, ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීන වෙමින් පවතී",
    "clients_title": "අනුග්‍රාහකයන්",
-    "clients_desc": "AdGuard Home වෙත සම්බන්ධ කර ඇති උපාංග වින්‍යාසගත කරන්න",
+    "clients_desc": "ඇඩ්ගාර්ඩ් හෝම් වෙත සම්බන්ධ කර ඇති උපාංග වින්‍යාසගත කරන්න",
    "settings_global": "ගෝලීය",
    "settings_custom": "අභිරුචි",
    "table_client": "අනුග්‍රාහකය",
@@ -300,7 +335,7 @@
    "client_edit": "අනුග්‍රාහකය සංස්කරණය කරන්න",
    "client_identifier": "හඳුන්වනය",
    "ip_address": "අ.ජා. කෙ. (IP) ලිපිනය",
-    "client_identifier_desc": "අනුග්‍රාහකයන් අ.ජා. කෙ. (IP) ලිපිනයක් හෝ මා.ප්‍ර.පා. (MAC) ලිපිනයක් මගින් හඳුනාගත හැකිය. මා.ප්‍ර.පා. හඳුන්වනයක් ලෙස  භාවිතා කළ හැක්කේ AdGuard Home ද <0>DHCP සේවාදායකයක්</0> නම් පමණක් බව කරුණාවෙන් සලකන්න. ",
+    "client_identifier_desc": "අනුග්‍රාහකයන් අ.ජා. කෙ. (IP) ලිපිනයක් හෝ මා.ප්‍ර.පා. (MAC) ලිපිනයක් මගින් හඳුනාගත හැකිය. මා.ප්‍ර.පා. හඳුන්වනයක් ලෙස  භාවිතා කළ හැක්කේ ඇඩ්ගාර්ඩ් හෝම් ද <0>DHCP සේවාදායකයක්</0> නම් පමණක් බව කරුණාවෙන් සලකන්න. ",
    "form_enter_ip": "අ.ජා. කෙ. (IP) ඇතුළත් කරන්න",
    "form_enter_mac": "MAC ඇතුළත් කරන්න",
    "form_enter_id": "හඳුන්වනය ඇතුළත් කරන්න",
@@ -313,30 +348,32 @@
    "client_updated": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව යාවත්කාල කරන ලදි",
    "client_confirm_delete": "\"{{key}}\" අනුග්‍රාහකය ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "list_confirm_delete": "මෙම ලැයිස්තුව ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "auto_clients_desc": "AdGuard Home භාවිතා කරන අනුග්‍රාහකයන්‌ග‌ේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
+    "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන අනුග්‍රාහකයන්‌ගේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
    "access_title": "ප්‍රවේශවීමට සැකසුම්",
-    "access_desc": "මෙහිදී ඔබට AdGuard Home DNS සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
+    "access_desc": "මෙහිදී ඔබට ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
    "access_allowed_title": "අවසර ලත් අනුග්‍රාහකයන්",
-    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. (IP) ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
+    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
    "access_disallowed_title": "අවසර නොලත් අනුග්‍රාහකයන්",
-    "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. (IP) ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
+    "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
    "access_blocked_title": "අවහිර කළ වසම්",
    "access_settings_saved": "ප්‍රවේශ වීමේ සැකසුම් සාර්ථකව සුරකින ලදි",
    "updates_checked": "යාවත්කාලීන කිරීම් සාර්ථකව පරික්ෂා කර ඇත",
-    "updates_version_equal": "AdGuard Home යාවත්කාලීනයි",
+    "updates_version_equal": "ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීනයි",
    "check_updates_now": "යාවත්කාල කිරීම සඳහා දැන් පරීක්ෂා කරන්න",
    "dns_privacy": "DNS රහස්‍යතා",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> තන්තුව භාවිතා කරයි.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> තන්තුව භාවිතා කරයි.",
-    "setup_dns_privacy_3": "<0>සංකේතාංකන ව.නා.ප. (DNS) කෙටුම්පත් සඳහා සහය දක්වන්නේ ඇන්ඩ්‍රොයිඩ් 9 පමණක් බව කරුණාවෙන් සලකන්න. එබැවින් ඔබ වෙනත් මෙහෙයුම් පද්ධති සඳහා අතිරේක මෘදුකාංග ස්ථාපනය කළ යුතුය.</0><0> ඔබට භාවිතා කළ හැකි මෘදුකාංග ලැයිස්තුවක් පහත දැක්‌වේ.</0>",
    "setup_dns_privacy_android_2": "<1>DNS-over-HTTPS</1> සහ <1>DNS-over-TLS</1> සඳහා <0>AdGuard for Android</0> සහය දක්වයි.",
    "setup_dns_privacy_ios_2": "<1>DNS-over-HTTPS</1> සහ <1>DNS-over-TLS</1> පිහිටුවීම් සඳහා <0>AdGuard for iOS</0> සහය දක්වයි.",
    "setup_dns_privacy_other_2": "<0>dnsproxy</0> දන්නා සියලුම ආරක්ෂිත DNS කෙටුම්පත් සඳහා සහය දක්වයි.",
    "setup_dns_privacy_other_3": "<1>DNS-over-HTTPS</1> සඳහා <0>dnscrypt-පෙරකලාසිය</0> සහය දක්වයි.",
    "setup_dns_privacy_other_4": "<1>DNS-over-HTTPS</1> සඳහා <0>මොසිල්ලා ෆයර්ෆොක්ස්</0> සහය දක්වයි.",
-    "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතා කිරීම සඳහා AdGuard Home සැකසුම් තුළ <0>සංකේතාංකනය වින්‍යාසගත</0> කිරීමට අවශ්‍ය වේ.",
+    "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතා කිරීම සඳහා ඇඩ්ගාර්ඩ් හෝම් සැකසුම් තුළ <0>සංකේතාංකනය වින්‍යාසගත</0> කිරීමට අවශ්‍ය වේ.",
    "rewrite_add": "DNS නැවත ලිවීමක් එකතු කරන්න",
    "rewrite_confirm_delete": "\"{{key}}\" සඳහා DNS නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
+    "rewrite_desc": "විශේෂිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
+    "rewrite_applied": "නැවත ලිවීමේ නීතිය යොදා ඇත",
+    "rewrite_hosts_applied": "ධාරක ගොනු නීතිය මගින් නැවත ලියා ඇත",
    "dns_rewrites": "DNS නැවත ලිවීම්",
    "form_domain": "වසම ඇතුළත් කරන්න",
    "form_answer": "අ.ජා. කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුළත් කරන්න ",
@@ -350,8 +387,8 @@
    "blocked_services_saved": "අවහිර කළ සේවාවන් සාර්ථකව සුරකින ලදි",
    "blocked_services_global": "ගෝලීය අවහිර කළ සේවාවන් භාවිතා කරන්න",
    "blocked_service": "අවහිර කළ සේවාව",
-    "block_all": "සියල්ල අවහිර කරන්න",
-    "unblock_all": "සියල්ල අනවහිර කරන්න",
+    "block_all": "සියල්ල අවහිර",
+    "unblock_all": "සියල්ල අනවහිර",
    "encryption_certificate_path": "සහතිකයේ මාර්ගය",
    "encryption_private_key_path": "පුද්ගලික යතුරෙහි මාර්ගය",
    "encryption_certificates_source_path": "සහතික ගොනු‌ව‌ෙහි මාර්ගය සකසන්න",
@@ -394,14 +431,16 @@
    "network": "ජාලය",
    "descr": "විස්තරය",
    "whois": "Whois",
-    "blocked_by_response": "ප්‍රතිචාරය අන්වර්ථ නාමයක් (CNAME) හෝ අ.ජා. කෙ. (IP) මගින් අවහිර කර ඇත",
+    "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
+    "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
    "try_again": "නැවත උත්සහා කරන්න",
    "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
-    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියන්න.",
+    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
+    "rewrite_domain_name": "වසම් නාමය: අන්. නා. (CNAME) වාර්තාවක් එක් කරන්න",
    "disable_ipv6": "IPv6 අබල කරන්න",
-    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම DNS විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
+    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම ව.නා.ප. විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
    "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" මත ක්ලික් කළහොත්, AdGuard Home ඔබගේ පද්ධතිය AdGuard Home DNS සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
+    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" බොත්තම එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
    "tags_title": "හැඳුනුම් සංකේත",
    "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>වැඩිදුර ඉගෙන ගන්න</0>",
    "form_select_tags": "අනුග්‍රාහක හැඳුනුම් සංකේත",
@@ -409,8 +448,11 @@
    "check": "පරීක්ෂා කරන්න",
    "form_enter_host": "ධාරක නාමයක් ඇතුළත් කරන්න",
    "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
+    "choose_from_list": "ලැයිස්තුවෙන් තෝරන්න",
+    "add_custom_list": "අභිරුචි ලැයිස්තුවක් එකතු කරන්න",
+    "host_whitelisted": "ධාරකය සුදු ලැයිස්තු ගත කර ඇත",
    "check_ip": "අ.ජා. කෙ. (IP) ලිපින: {{ip}}",
-    "check_cname": "CNAME: {{cname}}",
+    "check_cname": "අන්. නාමය (CNAME): {{cname}}",
    "check_reason": "හේතුව: {{reason}}",
    "check_rule": "නීතිය: {{rule}}",
    "check_service": "සේවාවෙහි නම: {{service}}",
@@ -420,17 +462,19 @@
    "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කරන ලදි",
    "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කරන ලදි",
    "static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය",
-    "static_ip_desc": "AdGuard Home යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
+    "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
    "set_static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනයක් සකසන්න",
    "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
-    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා AdGuard Home හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
+    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා ඇඩ්ගාර්ඩ් හෝම් හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
    "install_static_configure": "ගතික අ.ජා. කෙ. (IP) ලිපිනයක් භාවිතා කරන බව අපි අනාවරණය කර ‌ග‌ෙන ඇත්තෙමු - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
-    "confirm_static_ip": "AdGuard Home ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
+    "confirm_static_ip": "ඇඩ්ගාර්ඩ් හෝම් ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
    "list_updated": "{{count}} ලැයිස්තුව යාවත්කාලීන කරන ලදි",
    "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාලීන කරන ලදි",
    "dnssec_enable": "DNSSEC සබල කරන්න",
    "validated_with_dnssec": "DNSSEC සමඟ තහවුරු කර ඇත",
+    "all_queries": "සියලුම විමසුම්",
    "show_blocked_responses": "අවහිර කර ඇත",
+    "show_whitelisted_responses": "සුදු ලැයිස්තුගත කර ඇත",
    "blocked_safebrowsing": "ආරක්ෂිත සෙවීම මගින් අවහිර කරන ලද",
    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි",
    "blocked_threats": "අවහිර කළ තර්ජන",
@@ -439,5 +483,21 @@
    "rewritten": "නැවත ලියන ලද",
    "safe_search": "ආරක්ෂිත සෙවීම",
    "blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
-    "milliseconds_abbreviation": "මිලි තත්."
+    "milliseconds_abbreviation": "මිලි තත්.",
+    "enter_cache_ttl_min_override": "අවම පව. කා. (TTL) ඇතුළත් කරන්න",
+    "enter_cache_ttl_max_override": "උපරිම පව. කා. (TTL) ඇතුළත් කරන්න",
+    "filter_category_general": "පොදු",
+    "filter_category_security": "ආරක්ෂණ",
+    "filter_category_regional": "ප්‍රාදේශ්‍රීය",
+    "filter_category_other": "වෙනත්",
+    "filter_category_general_desc": "බොහෝ උපාංගවල ලුහුබැඳීම් සහ දැන්වීම් අවහිර කරන ලැයිස්තු",
+    "filter_category_security_desc": "අනිෂ්ට මෘදුකාංග, තතුබෑම් හෝ වංචනික වසම් අවහිර කිරීමට විශේෂ වූ ලැයිස්තු",
+    "filter_category_regional_desc": "ප්‍රාදේශ්‍රීය දැන්වීම් සහ ලුහුබැඳීමේ සේවාදායකයන් කෙරෙහි අවධානය යොමු කරන ලැයිස්තු",
+    "filter_category_other_desc": "වෙනත් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
+    "setup_config_to_enable_dhcp_server": "ග.ධා.වි.කෙ. සේවාදායකය සක්‍රීය කිරීම සඳහා වින්‍යාසය පිහිටුවන්න",
+    "original_response": "මුල් ප්‍රතිචාරය",
+    "click_to_view_queries": "විමසුම් බැලීමට ඔබන්න",
+    "port_53_faq_link": "53 කවුළුව බොහෝ විට \"DNSStubListener\" හෝ \"systemd-resolved\" සේවාවන් භාවිතයට ගනු ලැබේ. කරුණාකර මෙය විසඳන්නේ කෙසේද යන්න පිළිබඳ <0>මෙම උපදෙස්</0> කියවන්න.",
+    "adg_will_drop_dns_queries": "ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම අනුග්‍රාහකයේ සියලුම ව.නා.ප. විමසුම් අතහැර දමනු ඇත.",
+    "experimental": "පරීක්ෂණාත්මක"
 }
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Nastavenie klienta",
    "example_upstream_reserved": "Môžete zadať DNS upstream <0>pre konkrétnu doménu (domény)</0>",
+    "example_upstream_comment": "Môžete napísať komentár",
    "upstream_parallel": "Používať paralelné dopyty na zrýchlenie súčasným dopytovaním všetkých serverov",
    "parallel_requests": "Paralelné dopyty",
    "load_balancing": "Vyrovnávanie záťaže",
@@ -114,7 +115,7 @@
    "average_processing_time": "Priemerný čas spracovania",
    "average_processing_time_hint": "Priemerný čas spracovania DNS dopytu v milisekundách",
    "block_domain_use_filters_and_hosts": "Blokovať domény pomocou filtrov a zoznamov adries",
-    "filters_block_toggle_hint": "Pravidlá blokovania môžete nastaviť v nastaveniach <a href='#filters'>Filtre</a>.",
+    "filters_block_toggle_hint": "Pravidlá blokovania môžete nastaviť v nastaveniach <a>Filtre</a>.",
    "use_adguard_browsing_sec": "Použiť  AdGuard službu Bezpečného prehliadania",
    "use_adguard_browsing_sec_hint": "AdGuard Home skontroluje, či je doména na čiernej listine službou Bezpečného prehliadania. Použije API vyhľadávania priateľské k ochrane súkromia na vykonanie kontroly: na server je poslaná iba krátka predpona názvu domény SHA256 hash.",
    "use_adguard_parental": "Použiť AdGuard službu Rodičovská kontrola",
@@ -248,14 +249,17 @@
    "blocking_ipv6": "Blokovanie IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Prevziať .mobileconfig pre DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Prevziať .mobileconfig pre DNS-over-TLS",
    "plain_dns": "Obyčajné DNS",
    "form_enter_rate_limit": "Zadajte rýchlostný limit",
    "rate_limit": "Rýchlostný limit",
    "edns_enable": "Povoliť klientsku podsiete EDNS",
    "edns_cs_desc": "Ak je zapnuté, program AdGuard Home bude odosielať podsiete klientov na DNS servery.",
+    "rate_limit_desc": "Počet požiadaviek za sekundu, ktoré môže jeden klient vykonať (nastavenie na hodnotu 0 znamená neobmedzene)",
    "blocking_ipv4_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti A",
    "blocking_ipv6_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti AAAA",
-    "blocking_mode_default": "Predvolená hodnota: Odpovedať pomocou REFUSED, ak je blokovaný pravidlom v štýle Adblock; odpovedať pomocou IP adresy určenej v pravidle, ak je blokovaná pravidlom v štýle /etc/hosts",
+    "blocking_mode_default": "Predvolené: Odpovedať nulovou adresou IP (0,0.0.0 pre A; :: pre AAAA), keď je blokovaná pravidlom v štýle Adblock; odpovedať IP adresou uvedenou v pravidle, keď je blokovaná pravidlom v štýle /etc/hosts",
    "blocking_mode_refused": "REFUSED: Odpovedať kódom REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Odpovedať kódom NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: Odpoveď s nulovou IP adresou (0.0.0.0 pre A; :: pre AAAA)",
@@ -413,7 +417,8 @@
    "dns_privacy": "DNS súkromie",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Použiť <1>{{address}}</1> reťazec.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Použiť <1>{{address}}</1> reťazec.",
-    "setup_dns_privacy_3": "<0>Upozorňujeme, že šifrované protokoly DNS sú podporované iba v systéme Android 9. Preto je potrebné nainštalovať ďalší softvér pre iné operačné systémy.</0><0>Tu je zoznam softvéru, ktorý môžete používať.</0>",
+    "setup_dns_privacy_3": "<0>Tu je zoznam softvéru, ktorý môžete použiť.</0>",
+    "setup_dns_privacy_4": "Na zariadení so systémom iOS 14 alebo macOS Big Sur si môžete stiahnuť špeciálny súbor „.mobileconfig“, ktorý do nastavení DNS pridáva servery <highlight> DNS-over-HTTPS </highlight> alebo <highlight> DNS-over-TLS </highlight>.",
    "setup_dns_privacy_android_1": "Android 9 podporuje DNS-over-TLS natívne. Ak ho chcete konfigurovať, prejdite na Nastavenia → Sieť a internet → Pokročilé → Súkromné DNS a zadajte tam meno Vašej domény.",
    "setup_dns_privacy_android_2": "<0>AdGuard pre Android</0> podporuje <1>DNS-over-HTTPS</1> a <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> pridáva <1>DNS-over-HTTPS</1> podporu pre Android.",
@@ -526,6 +531,7 @@
    "check_reason": "Dôvod: {{reason}}",
    "check_rule": "Pravidlo: {{rule}}",
    "check_service": "Meno služby: {{service}}",
+    "service_name": "Názov služby",
    "check_not_found": "Nenašlo sa vo Vašom zozname filtrov",
    "client_confirm_block": "Naozaj chcete zablokovať klienta \"{{ip}}\"?",
    "client_confirm_unblock": "Naozaj chcete odblokovať klienta \"{{ip}}\"?",
@@ -560,10 +566,11 @@
    "cache_size_desc": "Veľkosť DNS cache (v bajtoch)",
    "cache_ttl_min_override": "Prepísať minimálne TTL",
    "cache_ttl_max_override": "Prepísať maximálne TTL",
-    "enter_cache_size": "Zadať veľkosť cache",
-    "enter_cache_ttl_min_override": "Zadať minimálne TTL",
-    "enter_cache_ttl_max_override": "Zadať maximálne TTL",
-    "cache_ttl_max_override_desc": "Prepíše hodnotu TTL (maximálnu) prijatú z upstream servera",
+    "enter_cache_size": "Zadať veľkosť cache (v bajtoch)",
+    "enter_cache_ttl_min_override": "Zadať minimálne TTL (v sekundách)",
+    "enter_cache_ttl_max_override": "Zadať maximálne TTL (v sekundách)",
+    "cache_ttl_min_override_desc": "Predĺži krátke hodnoty TTL (v sekundách) prijaté od servera typu upstream pri ukladaní odpovedí DNS do cache pamäte",
+    "cache_ttl_max_override_desc": "Nastaví maximálnu hodnotu TTL (v sekundách) pre záznamy v DNS cache pamäti",
    "ttl_cache_validation": "Minimálna hodnota TTL cache musí byť menšia alebo rovná maximálnej hodnote",
    "filter_category_general": "Všeobecné",
    "filter_category_security": "Bezpečnosť",
@@ -578,5 +585,6 @@
    "click_to_view_queries": "Kliknite pre zobrazenie dopytov",
    "port_53_faq_link": "Port 53 je často obsadený službami \"DNSStubListener\" alebo \"systemd-resolved\". Prečítajte si <0>tento návod</0> o tom, ako to vyriešiť.",
    "adg_will_drop_dns_queries": "AdGuard Home zruší všetky DNS dopyty od tohto klienta.",
+    "client_not_in_allowed_clients": "Klient nemá povolenie, pretože sa nenachádza v zozname „Povolení klienti“.",
    "experimental": "Experimentálne"
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Nastavitve odjemalca",
    "example_upstream_reserved": "lahko določite nazgornji DNS <0>za določene domene</0>",
+    "example_upstream_comment": "Lahko določite komentar",
    "upstream_parallel": "Uporabite vzporedne zahteve za pospešitev reševanja s hkratnim poizvedovanjem vseh gorvodnih strežnikov",
    "parallel_requests": "Vzporedne zahteve",
    "load_balancing": "Uravnavanje obremenitve",
@@ -114,7 +115,7 @@
    "average_processing_time": "Povprečni čas obdelave",
    "average_processing_time_hint": "Povprečni čas v milisekundah pri obdelavi zahteve DNS",
    "block_domain_use_filters_and_hosts": "Onemogoči domene s filtri in gostiteljskimi datotekami",
-    "filters_block_toggle_hint": "Pravila zaviranja lahko nastavite v nastavitvah <a href='#filters'>Filtri</a>.",
+    "filters_block_toggle_hint": "Pravila zaviranja lahko nastavite v nastavitvah <a>Filtri</a>.",
    "use_adguard_browsing_sec": "Uporabi AdGuardovo spletno storitev 'Varnost brskanja'",
    "use_adguard_browsing_sec_hint": "AdGuard Home bo preveril s spletno storitivijo 'Varnost brskanja', ali je domena na seznamu nedovoljenih. Za preverjanje bo uporabila za zasebnost prijazno API povezavo: strežniku se pošlje le kratka predpona imena domene SHA256 hash.",
    "use_adguard_parental": "Uporabi AdGuardovo spletno storitev 'Starševski nadzor'",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "Onemogočanje IPv6",
    "dns_over_https": "DNS-prek-HTTPS",
    "dns_over_tls": "DNS-prek-TLS",
+    "download_mobileconfig_doh": "Prenos .mobileconfig za DNS-preko-HTTPS",
+    "download_mobileconfig_dot": "Prenos .mobileconfig za DNS-preko-TLS",
    "plain_dns": "Navadni DNS",
    "form_enter_rate_limit": "Vnesite omejitev hitrosti",
    "rate_limit": "Omejitev hitrosti",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "Število zahtev na sekundo, ki jih sme narediti posamezen odjemalec (nastavitev na 0 pomeni neomejeno)",
    "blocking_ipv4_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo A",
    "blocking_ipv6_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo AAAA",
-    "blocking_mode_default": "Privzeto: odziv z REFUSED, kadar je onemogočen s slogom pravila zaviranja oglasov; odziv z navedenim naslovom IP v pravilu, kadar je onemogočen s pravilom /etc/gostitelji",
+    "blocking_mode_default": "Privzeto: odgovori z ničelnim naslovom IP (0.0.0.0 za A; :: za AAAA), ko je onemogočen s pravilom v slogu Adblocka; odgovor z naslovom IP, določenim v pravilu, ko je onemogočen s pravilom /etc/hosts",
    "blocking_mode_refused": "REFUSED: Odziv s kodo REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Odziv s kodo NXDOMAIN",
    "blocking_mode_null_ip": "Prazen IP: Odziv z ničelnim naslovom IP (0.0.0.0 za A; :: za AAAA)",
@@ -414,7 +417,8 @@
    "dns_privacy": "Zasebnost DNS",
    "setup_dns_privacy_1": "<0>DNS-prek-TLS:</0> Uporabite niz <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-prek-HTTPS:</0> Uporabite niz <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Upoštevajte, da so šifrirani protokoli DNS podprti samo v sistemu Android 9. Zato morate namestiti dodatni program za druge operacijske sisteme.</0><0>Tu je seznam programov, ki jih lahko uporabite..</0>",
+    "setup_dns_privacy_3": "<0>Tu je seznam programov, ki jo lahko uporabite.</0>",
+    "setup_dns_privacy_4": "Na napravo iOS 14 ali macOS Big Sur lahko prenesete posebno datoteko '.mobileconfig', ki v nastavitve DNS doda strežnike <highlight>DNS-preko-HTTPS</highlight> ali <highlight>DNS-preko-TLS</highlight>.",
    "setup_dns_privacy_android_1": "Android 9 izvirno podpira DNS-prek-TLS. Če ga želite konfigurirati, pojdite v Nastavitve → Omrežje in internet → Napredno → Zasebni DNS, in tam vnesite svoje ime domene.",
    "setup_dns_privacy_android_2": "<0>AdGuard za Android</0> podpira <1>DNS-prek-HTTPS</1> in <1>DNS-prek-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> doda podporo <1>DNS-prek-HTTPS</1> za Android.",
@@ -527,6 +531,7 @@
    "check_reason": "Razlog: {{reason}}",
    "check_rule": "Pravilo: {{rule}}",
    "check_service": "Ime storitve: {{service}}",
+    "service_name": "Ime storitve",
    "check_not_found": "Ni najdeno na vašem seznamu filtrov",
    "client_confirm_block": "Ali ste prepričani, da želite onemogočiti odjemalca \"{{ip}}\"?",
    "client_confirm_unblock": "Ali ste prepričani, da želite omogočiti odjemalca \"{{ip}}\"?",
@@ -561,11 +566,11 @@
    "cache_size_desc": "Velikost predpomnilnika DNS (v bajtih)",
    "cache_ttl_min_override": "Preglasi najmanjši TTL",
    "cache_ttl_max_override": "Preglasi največji TTL",
-    "enter_cache_size": "Vnesite velikost predpomnilnika",
-    "enter_cache_ttl_min_override": "Vnesite najmanjši TTL",
-    "enter_cache_ttl_max_override": "Vnesite največji TTL",
-    "cache_ttl_min_override_desc": "Vrednost preglasovanja TTL (najmanjša), prejeta od zgornjega strežnika",
-    "cache_ttl_max_override_desc": "Vrednost preglasovanja TTL (največja), prejeta od zgornjega strežnika",
+    "enter_cache_size": "Vnesite velikost predpomnilnika (v bajtih)",
+    "enter_cache_ttl_min_override": "Vnesite najmanjši TTL (v sekundah)",
+    "enter_cache_ttl_max_override": "Vnesite največji TTL (v sekundah)",
+    "cache_ttl_min_override_desc": "Razširite kratke vrednosti časa v živo (v sekundah), ki jih prejme strežnik za predpomnjenje, ko predpomni odzive DNS",
+    "cache_ttl_max_override_desc": "Nastavi največjo vrednost časa v živo (v sekundah) za vnose v predpomnilnik DNS",
    "ttl_cache_validation": "Najmanjša vrednost predpomnilnika TTL mora biti manjša ali enaka največji vrednosti",
    "filter_category_general": "Splošno",
    "filter_category_security": "Varnost",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "Kliknite za prikaz poizvedb",
    "port_53_faq_link": "Vrata 53 pogosto zasedajo storitve 'DNSStubListener' ali 'Sistemsko razrešene storitve'. Preberite <0>to navodilo</0> o tem, kako to rešiti.",
    "adg_will_drop_dns_queries": "AdGuard Home bo izpustil vse poizvedbe DNS iz tega odjemalca.",
+    "client_not_in_allowed_clients": "Odjemalec ni dovoljen, ker ga ni na seznamu \"Dovoljeni odjemalci\".",
    "experimental": "Eksperimentalno"
 }
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "Postavke klijenta",
    "example_upstream_reserved": "možete odrediti DNS upstream <0>za određene domene</0>",
+    "example_upstream_comment": "Možete upisati komentar",
    "upstream_parallel": "Koristite paralelne zahteve da ubrzate rešavanje istovremenim zahtevanjem svih servera",
    "parallel_requests": "Paralelni zahtevi",
    "load_balancing": "Load-balancing",
@@ -114,7 +115,7 @@
    "average_processing_time": "Prosečno vreme obrade",
    "average_processing_time_hint": "Prosečno vreme u milisekundama za obradu DNS zahteva",
    "block_domain_use_filters_and_hosts": "Blokiraj domene koristeći filtere i hosts datoteke",
-    "filters_block_toggle_hint": "Možete postaviti pravila blokiranja u <a href='#filters'>Filters</a> postavkama.",
+    "filters_block_toggle_hint": "Možete postaviti pravila blokiranja u <a>Filters</a> postavkama.",
    "use_adguard_browsing_sec": "Koristi AdGuard-ovu uslugu bezbednog pregledanja",
    "use_adguard_browsing_sec_hint": "AdGuard Home će proveriti da li je domen blokiran od strane usluge za bezbednosno pregledanje. Koristiće prijateljski API privatni pregled da izvrši proveru. Samo će se kratak prefiks domena SHA256 hash poslati na server.",
    "use_adguard_parental": "Koristi AdGuard-ovu uslugu roditeljske kontrole",
@@ -132,6 +133,8 @@
    "encryption_settings": "Postavke šifrovanja",
    "dhcp_settings": "DHCP postavke",
    "upstream_dns": "Upstream DNS serveri",
+    "upstream_dns_help": "Unesite adrese servera, jednu po redu. <a>Saznajte više</a> o konfigurisanju upstream DNS servera.",
+    "upstream_dns_configured_in_file": "Konfiguriši u {{path}}",
    "test_upstream_btn": "Testiraj upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Primeni",
@@ -185,6 +188,7 @@
    "example_upstream_regular": "uobičajeno DNS (preko UDP)",
    "example_upstream_dot": "šifrovano <0>DNS-over-TLS</0>",
    "example_upstream_doh": "šifrovano <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "šifrovano <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "možete koristiti <0>DNS brojeve</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "uobičajeni DNS (preko TCP)",
    "all_lists_up_to_date_toast": "Sve liste su već ažurirane",
@@ -193,6 +197,10 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": se ne može koristiti. Proverite da li ste ga ispravno uneli",
    "unblock": "Odblokiraj",
    "block": "Blokiraj",
+    "disallow_this_client": "Zabrani ovaj klijent",
+    "allow_this_client": "Dozvoli ovaj klijent",
+    "block_for_this_client_only": "Blokiraj samo za ovaj klijent",
+    "unblock_for_this_client_only": "Odblokiraj samo za ovaj klijent",
    "time_table_header": "Vreme",
    "date": "Datum",
    "domain_name_table_header": "Ime domena",
@@ -234,20 +242,25 @@
    "blocking_mode": "Način blokiranja",
    "default": "Podrazumevano",
    "nxdomain": "NXDOMAIN",
+    "refused": "Odbijeno",
    "null_ip": "Null IP",
    "custom_ip": "Prilagođeni IP",
    "blocking_ipv4": "Blokiranje IPv4",
    "blocking_ipv6": "Blokiranje IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "Preuzimanja",
+    "download_mobileconfig_dot": "Preuzmi .mobileconfig za DNS-over-TLS",
    "plain_dns": "Plain DNS",
    "form_enter_rate_limit": "Unesite ograničenje brzine",
    "rate_limit": "Ograničenje brzine",
    "edns_enable": "Uključi EDNS Client Subnet",
    "edns_cs_desc": "Ako je uključeno, AdGuard Home će slati klijente na DNS servere.",
+    "rate_limit_desc": "Broj zahteva po sekundi koje pojedinačni klijent dozvoljava (0: neograničeno)",
    "blocking_ipv4_desc": "IP adresa koja će biti vraćena za blokirane zahteve",
    "blocking_ipv6_desc": "IP adresa koja će biti vraćena za blokirane AAAA zahteve",
    "blocking_mode_default": "Podrazumevano: Odgovara sa REFUSED kada je blokirano od Adblock-style pravila; odgovara sa IP adresom koja je određena u pravilu kada je blokiran od /etc/hosts-style pravila",
+    "blocking_mode_refused": "Odbijeno: Odgovor sa kodom odbijanja",
    "blocking_mode_nxdomain": "NXDOMAIN: Odgovara sa NXDOMAIN kodom",
    "blocking_mode_null_ip": "Null IP: Odgovara sa zero IP adresom (0.0.0.0 za A; :: za AAAA)",
    "blocking_mode_custom_ip": "Prilagođeni IP: Odgovara sa ručno podešenom IP adresom",
@@ -324,6 +337,8 @@
    "encryption_https_desc": "Ako je HTTPS port konfigurisan, AdGuard Home administratorskom okruženju će se moći pristupati preko HTTPS, a to će takođe omogućiti DNS-over-HTTPS na '/dns-query' lokaciji.",
    "encryption_dot": "DNS-over-TLS port",
    "encryption_dot_desc": "Ako je ovaj port konfigurisan, AdGuard Home će pokretati DNS-over-TLS server na ovom portu.",
+    "encryption_doq": "DNS-over-QUIC port",
+    "encryption_doq_desc": "Ako je ovaj port konfigurisan, AdGuard Home će pokrenuti DNS-over-QUIC server na tom portu. To je eksperiment i možda neće biti stabilno. Takođe, u ovom trenutku ne postoji puno klijenata koji ovo podržavaju.",
    "encryption_certificates": "Sertifikati",
    "encryption_certificates_desc": "Da biste koristili šifrovanje, morate obezbediti važeći lanac SSL sertifikata za vaš domen. Besplatan sertifikat možete nabaviti na <0>{{link}}</0> ili ga možete kupiti od nekog od pouzdanih izdavalaca sertifikata.",
    "encryption_certificates_input": "Kopirajte/nalepite vaše PEM-kodirane sertifikate ovde.",
@@ -402,7 +417,8 @@
    "dns_privacy": "DNS privatnost",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> koristi <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> koristi <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Imajte na umu da su protokoli šifrovanog DNS-a podržani samo od Androida 9. Biće potrebno da instalirate dodatni softver za druge operativne sisteme.</0><0>Ovde je spisak softvera koje možete koristiti.</0>",
+    "setup_dns_privacy_3": "<0>Ovde je lista softvera koje možete koristiti.</0>",
+    "setup_dns_privacy_4": "Na iOS 14 ili macOS Big Sur uređaju možete preuzeti posebnu '.mobileconfig' datotteku koja dodaje <highlight>DNS-over-HTTPS</highlight> ili <highlight>DNS-over-TLS</highlight> servere u DNS postavke.",
    "setup_dns_privacy_android_1": "Android 9 podržava DNS-over-TLS. Za konfiguraciju, idite u postavke → mreža i internet → Napredno → Privatni DNS i tamo unesite ime vašeg domena.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> podržava <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> dodaje <1>DNS-over-HTTPS</1> podršku za Android.",
@@ -515,6 +531,7 @@
    "check_reason": "Razlog: {{reason}}",
    "check_rule": "Pravilo: {{rule}}",
    "check_service": "Ime usluge: {{service}}",
+    "service_name": "Ime usluge",
    "check_not_found": "Nije pronađeno na vašoj listi filtera",
    "client_confirm_block": "Jeste li sigurni da želite da blokirate klijent \"{{ip}}\"?",
    "client_confirm_unblock": "Jeste li sigurni da želite da odblokirate klijent \"{{ip}}\"?",
@@ -552,7 +569,9 @@
    "enter_cache_size": "Unesite veličinu predmemorije",
    "enter_cache_ttl_min_override": "Unesite najmanji TTL",
    "enter_cache_ttl_max_override": "Unesite najveći TTL",
+    "cache_ttl_min_override_desc": "Prepiši TTL vrednost (minimum) dobijen od apstrim servera. Ova vrednost ne može biti veća od 3600 (1 sat)",
    "cache_ttl_max_override_desc": "Prepiši TTL vrednost (maksimum) dobijen od apstrim servera",
+    "ttl_cache_validation": "Minimalna TTL vrednost mora biti manja ili jednaka najvišij vrednosti",
    "filter_category_general": "Opšte",
    "filter_category_security": "Bezbednost",
    "filter_category_regional": "Region",
@@ -564,5 +583,8 @@
    "setup_config_to_enable_dhcp_server": "Podesite konfiguraciju kako biste omogućili DHCP server",
    "original_response": "Izvorni odgovor",
    "click_to_view_queries": "Kliknite da pogledate zahteve",
-    "port_53_faq_link": "Port 53 je najčešće zauzet od \"DNSStubListener\" ili \"systemd-resolved\" usluga. Pročitajte <0>ovo uputstvo</0> kako da to rešite."
+    "port_53_faq_link": "Port 53 je najčešće zauzet od \"DNSStubListener\" ili \"systemd-resolved\" usluga. Pročitajte <0>ovo uputstvo</0> kako da to rešite.",
+    "adg_will_drop_dns_queries": "AdGuard Home će odbacivati sve DNS unose od ovog klijenta.",
+    "client_not_in_allowed_clients": "Klijent nije dozvoljen zato što se ne nalazi na spisku dozvoljenih klijenata.",
+    "experimental": "Eksperimentalno"
 }
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -90,7 +90,7 @@
    "average_processing_time": "Genomsnittlig processtid",
    "average_processing_time_hint": "Genomsnittlig processtid i millisekunder för DNS-förfrågning",
    "block_domain_use_filters_and_hosts": "Blockera domäner med filter- och värdfiler",
-    "filters_block_toggle_hint": "Du kan ställa in egna blockerings regler i <a href='#filters'>Filterinställningar</a>.",
+    "filters_block_toggle_hint": "Du kan ställa in egna blockerings regler i <a>Filterinställningar</a>.",
    "use_adguard_browsing_sec": "Amvänd AdGuards webbservice för surfsäkerhet",
    "use_adguard_browsing_sec_hint": "AdGuard Home kommer att kontrollera om en domän är svartlistad i webbservicens surfsäkerhet. Med en integritetsvänlig metod görs en API-lookup för att kontrollera : endast en kort prefix i domännamnet SHA256 hash skickas till servern.",
    "use_adguard_parental": "Använda AdGuards webbservice för färäldrakontroll",
@@ -314,7 +314,6 @@
    "dns_privacy": "DNS-Integritet",
    "setup_dns_privacy_1": "<0>DNS-över-TLS:</0> Använd: <1>{{address}}</1>",
    "setup_dns_privacy_2": "<0>DNS-över-HTTPS:</0> Använd: <1>{{address}}</1>",
-    "setup_dns_privacy_3": "<0>Notera att krypterade DNS-protokoll endast stöds på Android 9. Du behöver därför installera ytterligare mjukvara för andra operativsystem.</0><0>Här är en lista över program du kan använda.</0>",
    "setup_dns_privacy_android_1": "Android 9 har inbyggt stöd för DNS-över-TLS. Konfigurera och uppge domännamn under Inställningar → Nätverk & Internet → Avancerat → Privat DNS.",
    "setup_dns_privacy_android_2": "<0>AdGuard för Android</0> stödjer <1>DNS-över-HTTPS</1> samt <1>DNS-över-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> lägger till stöd för <1>DNS-ÖVER-HTTPS</1> till Android.",
--- a/client/src/__locales/th.json
+++ b/client/src/__locales/th.json
@@ -95,7 +95,7 @@
    "average_processing_time": "เวลาประมวลผลโดยเฉลี่ย",
    "average_processing_time_hint": "เวลาเฉลี่ยเป็นมิลลิวินาทีในการประมวลผลคำขอ DNS",
    "block_domain_use_filters_and_hosts": "ปิดกั้นโดเมนโดยใช้ตัวกรองและไฟล์โฮสต์",
-    "filters_block_toggle_hint": "คุณสามารถตั้งค่ากฎการปิดกั้นในการตั้งค่า<a href='#filters'>ตัวกรอง</a>",
+    "filters_block_toggle_hint": "คุณสามารถตั้งค่ากฎการปิดกั้นในการตั้งค่า<a>ตัวกรอง</a>",
    "use_adguard_browsing_sec": "ใช้บริการเว็บการรักษาความปลอดภัยการเรียกดู AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home จะตรวจสอบว่าโดเมนอยู่ในรายการที่ไม่อนุญาตโดยเว็บเซอร์วิสความปลอดภัยการสืบค้นหรือไม่ จะใช้ API การค้นหาที่เป็นมิตรกับข้อมูลส่วนบุคคลเพื่อทำการตรวจสอบ: มีการส่งคำนำหน้าสั้น ๆ ของชื่อโดเมน SHA256 แฮชไปยังเซิร์ฟเวอร์",
    "use_adguard_parental": "ใช้บริการเว็บการควบคุมโดยผู้ปกครองของ AdGuard",
@@ -193,7 +193,6 @@
    "edns_cs_desc": "หากเปิดใช้งาน AdGuard Home จะส่งซับเน็ตของไคลเอนต์ไปยังเซิร์ฟเวอร์ DNS",
    "blocking_ipv4_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอที่ถูกปิดกั้น",
    "blocking_ipv6_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอ AAAA ที่ถูกปิดกั้น",
-    "blocking_mode_default": "เริ่มต้น: ตอบสนองด้วย REFUSED เมื่อถูกปิดกั้นโดยกฎสไตล์ปิดกั้นโฆษณา; ตอบกลับด้วยที่อยู่ IP ที่ระบุในกฎเมื่อถูกปิดกั้นโดยกฎ /etc/hosts-hosts",
    "blocking_mode_nxdomain": "NXDOMAIN: ตอบสนองด้วยรหัส NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: ตอบกลับด้วยที่อยู่เลขศูนย์ IP (0.0.0.0 สำหรับ A; :: สำหรับ AAAA)",
    "blocking_mode_custom_ip": "IP ที่กำหนดเอง: ตอบกลับด้วยที่อยู่ IP ที่ตั้งค่าด้วยตนเอง",
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "İstemci ayarları",
    "example_upstream_reserved": "<0>Belirli alan adları için</0> DNS üst sunucusu tanımlayabilirsiniz.",
+    "example_upstream_comment": "Bir yorum belirtebilirsiniz",
    "upstream_parallel": "Tüm üst sunucuları eş zamanlı sorgulayarak çözümü hızlandırmak için paralel sorguları kullan",
    "parallel_requests": "Paralel istekler",
    "bootstrap_dns": "DNS Önyükleme sunucuları",
@@ -109,7 +110,7 @@
    "average_processing_time": "Ortalama işlem süresi",
    "average_processing_time_hint": "Bir DNS isteğinin mili saniye cinsinden ortalama işlem süresi",
    "block_domain_use_filters_and_hosts": "Filtreleri ve hosts listelerini kullanarak alan adlarını engelle",
-    "filters_block_toggle_hint": "<a href='#filters'>Filtreler</a> sayfasından engelleme kurallarını ayarlayabilirsiniz.",
+    "filters_block_toggle_hint": "<a>Filtreler</a> sayfasından engelleme kurallarını ayarlayabilirsiniz.",
    "use_adguard_browsing_sec": "AdGuard gezinti koruması web hizmetini kullan",
    "use_adguard_browsing_sec_hint": "AdGuard Home, alan adının gezinti koruması web hizmetinde kara listede olup olmadığını kontrol edecek. Kontrol işlemi gizlilik dostu API kullanılarak yapılacak: yalnızca alan adının kısa bir ön eki SHA256 ile şifrelenip sunucuya gönderilecek.",
    "use_adguard_parental": "AdGuard ebeveyn kontrolü web hizmetini kullan",
@@ -127,6 +128,8 @@
    "encryption_settings": "Şifreleme ayarları",
    "dhcp_settings": "DHCP ayarları",
    "upstream_dns": "Üst DNS sunucusu",
+    "upstream_dns_help": "Her satıra bir sunucu adresi girin. Üst DNS sunucularını yapılandırma hakkında <a>daha fazla bilgi edinin</a>.",
+    "upstream_dns_configured_in_file": "{{path}} içinde yapılandırıldı",
    "test_upstream_btn": "Üst sunucuyu test et",
    "upstreams": "Upstreams",
    "apply_btn": "Uygula",
@@ -178,8 +181,9 @@
    "example_comment_hash": "# Bir yorum daha ekledim",
    "example_regex_meaning": "belirtilen düzenli ifadelerle eşleşen alan adlarına erişimi engelle",
    "example_upstream_regular": "normal DNS (UDP üzerinden)",
-    "example_upstream_dot": "<0>DNS-over-TLS</0> şifrelemesi",
-    "example_upstream_doh": "<0>DNS-over-HTTPS</0> şifrelemesi",
+    "example_upstream_dot": "şifrelenmiş <0>DNS-over-TLS</0>",
+    "example_upstream_doh": "şifrelenmiş <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "şifrelenmiş <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "<1>DNSCrypt</1> veya <2>DNS-over-HTTPS</2> çözücüleri için <0>DNS Damgaları</0> kullanabilirsiniz.",
    "example_upstream_tcp": "normal DNS (TCP üzerinden)",
    "all_lists_up_to_date_toast": "Tüm listeler zaten güncel",
@@ -237,13 +241,16 @@
    "blocking_ipv4": "IPv4 engelleme",
    "blocking_ipv6": "IPv6 engelleme",
    "dns_over_https": "DNS üzerinden HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "DNS-over-HTTPS için .mobileconfig dosyasını indir",
+    "download_mobileconfig_dot": "DNS-over-TLS için .mobileconfig dosyasını indir",
    "form_enter_rate_limit": "Sıklık limitini girin",
    "rate_limit": "Sıklık limiti",
    "edns_enable": "EDNS İstemci Alt Ağını Etkinleştir",
    "edns_cs_desc": "Etkinleştirilirse, AdGuard Home, istemcilerin alt ağlarını DNS sunucularına gönderir.",
    "blocking_ipv4_desc": "Engellenen bir A isteği için geri döndürülecek IP adresi",
    "blocking_ipv6_desc": "Engellenen bir AAAA isteği için geri döndürülecek IP adresi",
-    "blocking_mode_default": "Varsayılan: Reklam Engelleme tarzı kural tarafından engellendiğinde REDDEDİLDİ ile yanıt verin; /etc/hosts-style kuralı tarafından engellendiğinde kuralda belirtilen IP adresiyle yanıt verin",
+    "blocking_mode_default": "Varsayılan: Reklam engelleme stili kuralı tarafından engellendiğinde sıfır IP adresiyle (A için 0.0.0.0; AAAA için) yanıt verin; /etc/hosts-style kuralı tarafından engellendiğinde, kuralda belirtilen IP adresiyle yanıt verin",
    "blocking_mode_refused": "REFUSED: REFUSED kod ile yanıt verin",
    "blocking_mode_nxdomain": "NXDOMAIN: NXDOMAIN koduyla yanıt",
    "blocking_mode_null_ip": "Boş IP: Sıfır IP adresiyle yanıt verin (A için 0.0.0.0; :: AAAA için)",
@@ -319,8 +326,10 @@
    "encryption_redirect_desc": "Etkinleştirirseniz AdGuard Home sizi HTTP yerine HTTPS adreslerine yönlendirir.",
    "encryption_https": "HTTPS bağlantı noktası",
    "encryption_https_desc": "Eğer HTTPS portu yapılandırılmışsa, AdGuard Home yönetici arayüzü HTTPS ile ulaşılabilir olacak, ayrıca '/dns-query' üzerinden DNS-over-HTTPS hizmeti de çalışacak.",
-    "encryption_dot": "DNS-over-TLS portu",
+    "encryption_dot": "DNS-over-TLS bağlantı noktası",
    "encryption_dot_desc": "Eğer bu portu yapılandırırsanız AdGuard Home bu port üzerinden DNS-over-TLS sunucusu çalıştıracak.",
+    "encryption_doq": "DNS-over-QUIC bağlantı noktası",
+    "encryption_doq_desc": "Bu bağlantı noktası yapılandırılırsa, AdGuard Home bu bağlantı noktasında DNS-over-QUIC sunucusu çalıştıracaktır. Deneysel ve güvenilir olmayabilir. Ayrıca, şu anda bunu destekleyen çok fazla istemci yok.",
    "encryption_certificates": "Sertifikalar",
    "encryption_certificates_desc": "Şifrelemeyi kullanmak için alan adınız için geçerli bir SSL sertifika zinciri temin etmeniz gerekir. <0>{{link}}</0> adresinden ücretsiz temin edebilirsiniz veya güvenilir Sertifika Otoritelerinden satın alabilirsiniz.",
    "encryption_certificates_input": "PEM formatındaki sertifikalarınızı buraya yapıştırın.",
@@ -329,7 +338,7 @@
    "encryption_key": "Özel anahtar",
    "encryption_key_input": "Sertifikanızın PEM formatı özel anahtarını buraya yapıştırın.",
    "encryption_enable": "Şifrelemeyi etkinleştir (HTTPS, DNS-over-HTTPS ve DNS-over-TLS)",
-    "encryption_enable_desc": "Şifrelemeyi etkinleştirirseniz AdGuard Home yönetici arayüzü HTTPS ile çalışacak, ayrıca DNS sunucusu  DNS-over-HTTPS ve DNS-over-TLS üzerinden gelen istekleri dinleyecektir.",
+    "encryption_enable_desc": "Şifrelemeyi etkinleştirirseniz, AdGuard Home yönetici arayüzü HTTPS üzerinden çalışır ve DNS sunucusu DNS-over-HTTPS ve DNS-over-TLS üzerinden gelen istekleri dinler.",
    "encryption_chain_valid": "Sertifika zinciri geçerli",
    "encryption_chain_invalid": "Sertifika zinciri geçersiz",
    "encryption_key_valid": "Bu geçerli bir {{type}} özel anahtar",
@@ -396,9 +405,8 @@
    "updates_version_equal": "AdGuard Home yazılımı  günceldir",
    "check_updates_now": "Güncellemeleri şimdi denetle",
    "dns_privacy": "DNS Gizliliği",
-    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Kullanımı <1>{{address}}</1> string.",
-    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Kullanımı <1>{{address}}</1> string.",
-    "setup_dns_privacy_3": "<0>Lütfen şifrelenmiş DNS protokollerinin yalnızca Android 9'da desteklendiğini unutmayın. Bu yüzden diğer işletim sistemleri için ek yazılım yüklemeniz gerekir..</0><0>İşte kullanabileceğiniz yazılımların bir listesi.</0>",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> dizesini kullan.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> dizesini kullan.",
    "setup_dns_privacy_android_1": "Android 9 aslen DNS-over-TLS desteklemektedir. Yapılandırmak için, Ayarlar → Ağ ve internet → Gelişmiş → Özel DNS seçeneğine gidin ve alan adınızı buraya girin.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0>, <1>DNS-over-HTTPS</1> ve <1>DNS-over-TLS</1> desteklemektedir.",
    "setup_dns_privacy_android_3": "<0>Intra</0> Android'e <1>DNS-over-HTTPS</1> desteğini ekler.",
@@ -474,6 +482,7 @@
    "location": "Konum",
    "orgname": "Organizasyon adı",
    "netname": "Ağ adı",
+    "network": "Ağ",
    "descr": "Açıklama",
    "whois": "Whois",
    "filtering_rules_learn_more": "Ana makinelere dair kendi kara listelerinizi oluşturmakla alakalı <0>daha fazla bilgi edinin</0>.",
@@ -487,7 +496,7 @@
    "disable_ipv6": "IPv6'yı Devre Dışı Bırak",
    "disable_ipv6_desc": "Bu özelliği etkinleştirirseniz, IPv6 adresleri (AAAA tipi) için gönderilen tüm DNS istekleri cevapsız bırakılacaktır.",
    "fastest_addr": "En hızlı IP adresi",
-    "fastest_addr_desc": "Tüm DNS sunucularını sorgulayın ve tüm yanıtlar arasından en hızlı IP adresini döndürün",
+    "fastest_addr_desc": "Tüm DNS sunucularını sorgulayın ve tüm yanıtlar arasından en hızlı IP adresini döndürün. Bu, tüm DNS sunucularından yanıt beklememiz gerektiğinden DNS sorgularını yavaşlatacak ancak genel bağlantıyı iyileştirecektir.",
    "autofix_warning_text": "\"Düzelt\" i tıklatırsanız, AdGuardHome sisteminizi AdGuardHome DNS sunucusunu kullanacak şekilde yapılandırır.",
    "autofix_warning_list": "Bu görevleri gerçekleştirecektir: <0> sistemi DNSStubListener'ı devre dışı bırakma </0> <0> DNS sunucu adresini 127.0.0.1 olarak ayarlayın </0> <0> /etc/resolv.conf / / run / systemd sembolik bağlantı hedefini değiştirin /resolve/resolv.conf </0> <0> durdur DNSStubListener (sistemde yeniden çözülmüş hizmeti yeniden yükle) </0>",
    "autofix_warning_result": "Sonuç olarak, sisteminizden gelen tüm DNS istekleri varsayılan olarak AdGuardHome tarafından işlenir.",
@@ -507,6 +516,7 @@
    "check_reason": "Sebep: {{reason}}",
    "check_rule": "Kural: {{rule}}",
    "check_service": "Hizmet adı: {{service}}",
+    "service_name": "Servis adı",
    "check_not_found": "Filtre listelerinizde bulunamadı",
    "client_confirm_block": "\"{{ip}}\" istemcisini engellemek istediğinizden emin misiniz?",
    "client_confirm_unblock": "\"{{ip}}\" istemcisinin engellemesini kaldırmak istediğinizden emin misiniz?",
@@ -539,15 +549,17 @@
    "cache_size_desc": "DNS önbelleği boyutu (byte cinsinden)",
    "cache_ttl_min_override": "Minimum TTL'yi değiştir",
    "cache_ttl_max_override": "Maksimum TTL'yi değiştir",
-    "enter_cache_size": "Önbellek boyutunu girin",
-    "enter_cache_ttl_min_override": "Minimum TTL değerini girin",
-    "enter_cache_ttl_max_override": "Maksimum TTL değerini girin",
-    "cache_ttl_max_override_desc": "Üst sunucudan alınan (maksimum) TTL değerini değiştirin",
+    "enter_cache_size": "Önbellek boyutunu girin (byte)",
+    "enter_cache_ttl_min_override": "Minimum TTL değerini girin (saniye)",
+    "enter_cache_ttl_max_override": "Maksimum TTL değerini girin (saniye)",
+    "cache_ttl_min_override_desc": "DNS yanıtlarını önbelleğe alırken üst sunucusundan alınan kullanım süresi değerini (saniye) uzatın",
+    "cache_ttl_max_override_desc": "DNS önbelleğindeki girişler için maksimum kullanım süresi değerini (saniye) ayarlayın",
    "ttl_cache_validation": "Minimum önbellek TTL değeri, maksimum değerden küçük veya bu değere eşit olmalıdır",
    "filter_category_general": "Genel",
    "filter_category_security": "Güvenlik",
    "filter_category_regional": "Bölgesel",
    "filter_category_other": "Diğer",
+    "filter_category_general_desc": "Çoğu cihazda izlemeyi ve reklamları engelleyen listeler",
    "filter_category_security_desc": "Kötü amaçlı yazılım, kimlik avı veya dolandırıcılık alanlarını engelleme konusunda özelleştirilmiş listeler",
    "filter_category_other_desc": "Diğer engelleme listeleri",
    "setup_config_to_enable_dhcp_server": "DHCP sunucusunu etkinleştirmek için kurulum yapılandırması",
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -114,7 +114,7 @@
    "average_processing_time": "Thời gian xử lý trung bình",
    "average_processing_time_hint": "Thời gian trung bình cho một yêu cầu DNS tính bằng mili giây",
    "block_domain_use_filters_and_hosts": "Chặn tên miền sử dụng các bộ lọc và file hosts",
-    "filters_block_toggle_hint": "Bạn có thể thiết lập quy tắc chặn tại cài đặt <a href='#filters'>Bộ lọc</a>.",
+    "filters_block_toggle_hint": "Bạn có thể thiết lập quy tắc chặn tại cài đặt <a>Bộ lọc</a>.",
    "use_adguard_browsing_sec": "Sử dụng dịch vụ bảo vệ duyệt web AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home sẽ kiểm tra tên miền với dịch vụ bảo vệ duyệt web. Tính năng sử dụng một API thân thiện với quyền riêng tư: chỉ một phần ngắn tiền tố mã băm SHA256 được gửi đến máy chủ",
    "use_adguard_parental": "Sử dụng dịch vụ quản lý của phụ huynh AdGuard",
@@ -401,7 +401,6 @@
    "dns_privacy": "DNS Riêng Tư",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
-    "setup_dns_privacy_3": "<0>Xin lưu ý rằng các giao thức DNS được mã hóa chỉ được hỗ trợ trên Android 9. Vì vậy, bạn cần cài đặt phần mềm bổ sung cho các hệ điều hành khác.</0><0>Đây là danh sách các phần mềm bạn có thể sử dụng.</0>",
    "setup_dns_privacy_android_1": "Android 9 hỗ trợ DNS trên TLS nguyên bản. Để định cấu hình, hãy đi tới Cài đặt → Mạng & internet → Nâng cao → DNS Riêng Tư và nhập tên miền của bạn vào đó.",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> hỗ trợ <1>DNS-over-HTTPS</1> và <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_android_3": "<0>Intra</0> thêm <1>DNS-over-HTTPS</1> hỗ trợ cho Android.",
@@ -546,10 +545,6 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "Kích thước cache",
    "cache_size_desc": "Kích thước cache DNS (bytes)",
-    "enter_cache_size": "Nhập kích thước cache",
-    "enter_cache_ttl_min_override": "Nhập TTL tối thiểu",
-    "enter_cache_ttl_max_override": "Nhập TTL tối đa",
-    "cache_ttl_max_override_desc": "Ghi đè giá trị TTL (tối đa) nhận được từ máy chủ ngược dòng",
    "filter_category_general": "Chung",
    "filter_category_security": "Bảo mật",
    "filter_category_regional": "Khu vực",
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "客户端设置",
    "example_upstream_reserved": "您可以将上游DNS 服务器<0>指定为特定域名</0>",
+    "example_upstream_comment": "您可以指定注解",
    "upstream_parallel": "通过同时查询所有上游服务器，使用并行请求以加速解析",
    "parallel_requests": "并行请求",
    "load_balancing": "负载均衡",
@@ -114,7 +115,7 @@
    "average_processing_time": "平均处理时间",
    "average_processing_time_hint": "处理 DNS 请求的平均时间（毫秒）",
    "block_domain_use_filters_and_hosts": "使用过滤器和 Hosts 文件以拦截指定域名",
-    "filters_block_toggle_hint": "你可以在 <a href='#filters'>过滤器</a> 设置中添加过滤规则。",
+    "filters_block_toggle_hint": "你可以在 <a>过滤器</a> 设置中添加过滤规则。",
    "use_adguard_browsing_sec": "使用 AdGuard【浏览安全】网页服务",
    "use_adguard_browsing_sec_hint": "AdGuard Home 将检查域名是否被浏览安全服务列入黑名单。它将使用隐私性强的检索 API 来执行检查，只有域名的 SHA256 的短前缀会被发送到服务器。",
    "use_adguard_parental": "使用 AdGuard 【家长控制】服务",
@@ -201,7 +202,7 @@
    "block_for_this_client_only": "仅拦截这个客户端",
    "unblock_for_this_client_only": "仅解除对此客户端的拦截",
    "time_table_header": "时间",
-    "date": "日起",
+    "date": "日期",
    "domain_name_table_header": "域名",
    "domain_or_client": "域名或客户端",
    "type_table_header": "类型",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "拦截 IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "下载适用于 DNS-over-HTTPS 的 .mobileconfig",
+    "download_mobileconfig_dot": "下载适用于 DNS-over-TLS 的 .mobileconfig",
    "plain_dns": "无加密DNS",
    "form_enter_rate_limit": "输入限制速率",
    "rate_limit": "速度限制",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "每个客户端每秒钟查询次数的限制 (设置为 0 意味着不限制)",
    "blocking_ipv4_desc": "拦截 A 记录请求返回的 IP 地址",
    "blocking_ipv6_desc": "拦截 AAAA 记录请求返回的 IP 地址",
-    "blocking_mode_default": "默认：被Adblock规则拦截时以REFUSED码响应；被/etc/hosts规则拦截时返回规则中指定IP",
+    "blocking_mode_default": "默认：被 Adblock 规则拦截时反应为零 IP 地址（A记录：0.0.0.0；AAAA记录：::）；被/etc/hosts 规则拦截时反应为规则中指定 IP 地址",
    "blocking_mode_refused": "REFUSED：以 REFUSED 码响应请求",
    "blocking_mode_nxdomain": "NXDOMAIN：以NXDOMAIN码响应",
    "blocking_mode_null_ip": "空IP：以零IP地址响应(A记录 0.0.0.0；AAAA记录 ::)",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS 隐私",
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> 使用 <1>{{address}}</1> 字符串。",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> 使用 <1>{{address}}</1> 字符串。",
-    "setup_dns_privacy_3": "<0>请注意，加密的 DNS 协议仅适用于 Android 9。所以您需要为其他操作系统上安装额外的软件。</0><0>以下是您可以使用软件的列表。</0>",
+    "setup_dns_privacy_3": "<0>以下是您可以使用软件的列表</0>",
+    "setup_dns_privacy_4": "在 iOS 14 或 macOS Big Sur 设备上，您可以下载特定的 '.mobileconfig' 文件。此文件将<highlight>DNS-over-HTTPS</highlight> 或 <highlight>DNS-over-TLS</highlight> 服务器添加于 DNS 设置。",
    "setup_dns_privacy_android_1": "Android 9 原生支持 DNS-over-TLS。 要进行配置，请转到 设置 → 网络和互联网 → 高级 → 私有 DNS，然后在那里输入您的域名。",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> 支持 <1>DNS-over-HTTPS</1> 和 <1>DNS-over-TLS</1>。",
    "setup_dns_privacy_android_3": "<0>Intra</0> 为 Android 提供了 <1>DNS-over-HTTPS</1> 的支持。",
@@ -527,6 +531,7 @@
    "check_reason": "原因：{{reason}}",
    "check_rule": "规则：{{rule}}",
    "check_service": "服务名称：{{service}}",
+    "service_name": "服务名称",
    "check_not_found": "未在您的筛选列表中找到",
    "client_confirm_block": "您确定要阻止客户端\"{{ip}}\"?",
    "client_confirm_unblock": "您确定要解除对客户端\"{{ip}}\"的封锁吗？",
@@ -561,11 +566,11 @@
    "cache_size_desc": "DNS缓存大小 （单位：字节）",
    "cache_ttl_min_override": "覆盖最小TTL值",
    "cache_ttl_max_override": "覆盖最大TTL值",
-    "enter_cache_size": "输入缓存大小",
-    "enter_cache_ttl_min_override": "输入最小TTL值",
-    "enter_cache_ttl_max_override": "输入最大TTL值",
-    "cache_ttl_min_override_desc": "覆盖从上游服务器接收到的 TTL 值 (最小值)",
-    "cache_ttl_max_override_desc": "覆盖从上游服务器接收到的TTL值(最大)",
+    "enter_cache_size": "输入缓存大小（字节）",
+    "enter_cache_ttl_min_override": "输入最小 TTL 值（秒）",
+    "enter_cache_ttl_max_override": "输入最大 TTL 值（秒）",
+    "cache_ttl_min_override_desc": "缓存 DNS 响应时，延长从上游服务器接收到的 TTL 值 (秒)",
+    "cache_ttl_max_override_desc": "设定 DNS 缓存条目的最大 TTL 值（秒）",
    "ttl_cache_validation": "最小缓存TTL值必须小于或等于最大值",
    "filter_category_general": "常规",
    "filter_category_security": "安全",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "点击查看查询",
    "port_53_faq_link": "53端口常被DNSStubListener或systemdn解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>",
    "adg_will_drop_dns_queries": "AdGuard Home 会终止所有来自此客户端的DNS查询。",
+    "client_not_in_allowed_clients": "此客户端不被允许，因为它不在“允许的客户端”列表中。",
    "experimental": "实验性的"
 }
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -114,7 +114,7 @@
    "average_processing_time": "平均的處理時間",
    "average_processing_time_hint": "處理 DNS 請求的平均時間(毫秒)",
    "block_domain_use_filters_and_hosts": "使用過濾器與 hosts 檔案阻擋網域查詢",
-    "filters_block_toggle_hint": "您可在<a href='#filters'>過濾器</a>設定中設定封鎖規則。",
+    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設定封鎖規則。",
    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查查詢網域是否在瀏覽安全服務黑名單內。它使用尊重個人隱私的 API 來進行檢查：會先透過 SHA256 將網域編碼後取簡短前置字串傳送到伺服器核對。",
    "use_adguard_parental": "使用 AdGuard 家長監護功能",
@@ -249,7 +249,6 @@
    "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
    "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
    "blocking_ipv6_desc": "回覆指定 IPv6 位址給被封鎖的網域的 AAAA 紀錄查詢",
-    "blocking_mode_default": "預設：符合「adblock 樣式」的規則將回應 REFUSED，而「hosts 檔案」則回應設定的 IP 位址。",
    "blocking_mode_nxdomain": "NXDOMAIN：回應 NXDOMAIN 狀態碼",
    "blocking_mode_null_ip": "Null IP：回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）",
    "blocking_mode_custom_ip": "自訂 IP 位址：回應一個自訂的 IP 位址",
@@ -406,7 +405,6 @@
    "dns_privacy": "DNS 隱私",
    "setup_dns_privacy_1": "<0>DNS-over-TLS：</0>使用 <1>{{address}}</1>。",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS：</0>使用 <1>{{address}}</1>。",
-    "setup_dns_privacy_3": "<0>注意：加密 DNS 僅適用於 Android 9 或以上，除此之外您可能需要安裝其他軟體。</0><0>這些是您可以使用的軟體清單</0>",
    "setup_dns_privacy_android_1": "Android 9 原生支援 DNS-over-TLS。前網「設定」→「網路 & 網際網路」→「進階」→「私人 DNS」設定。",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> 支援  <1>DNS-over-HTTPS</1> 與 <1>DNS-over-TLS</1>。",
    "setup_dns_privacy_android_3": "<0>Intra</0> 對 Android 新增支援 <1>DNS-over-HTTPS</1>。",
@@ -553,11 +551,6 @@
    "cache_size_desc": "DNS 快取大小（bytes）",
    "cache_ttl_min_override": "覆寫最小 TTL 值",
    "cache_ttl_max_override": "覆寫最大 TTL 值",
-    "enter_cache_size": "輸入快取大小",
-    "enter_cache_ttl_min_override": "輸入最小 TTL 值",
-    "enter_cache_ttl_max_override": "輸入最大 TTL 值",
-    "cache_ttl_min_override_desc": "從上游查詢結果中修改 TTL 值（最小）",
-    "cache_ttl_max_override_desc": "從上游查詢結果中修改 TTL 最大值",
    "filter_category_general": "一般",
    "filter_category_security": "安全性",
    "filter_category_regional": "區域性",
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -1,6 +1,7 @@
 {
    "client_settings": "用戶端設定",
    "example_upstream_reserved": "您可明確指定<0>用於特定的網域</0>之 DNS 上游",
+    "example_upstream_comment": "您可明確指定註解",
    "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析網域",
    "parallel_requests": "並行的請求",
    "load_balancing": "負載平衡",
@@ -114,7 +115,7 @@
    "average_processing_time": "平均的處理時間",
    "average_processing_time_hint": "在處理一項 DNS 請求時以毫秒（ms）計的平均時間",
    "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域",
-    "filters_block_toggle_hint": "您可在<a href='#filters'>過濾器</a>設定中設置封鎖規則。",
+    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設置封鎖規則。",
    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查網域是否被瀏覽安全網路服務列入黑名單。它將使用友好的隱私查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到伺服器。",
    "use_adguard_parental": "使用 AdGuard 家長監控之網路服務",
@@ -210,7 +211,7 @@
    "client_table_header": "用戶端",
    "empty_response_status": "空無的",
    "show_all_filter_type": "顯示全部",
-    "show_filtered_type": "顯示已過濾的",
+    "show_filtered_type": "顯示受過濾的",
    "no_logs_found": "無已發現之記錄",
    "refresh_btn": "重新整理",
    "previous_btn": "上一頁",
@@ -248,6 +249,8 @@
    "blocking_ipv6": "封鎖 IPv6",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "download_mobileconfig_doh": "下載用於 DNS-over-HTTPS 的 .mobileconfig",
+    "download_mobileconfig_dot": "下載用於 DNS-over-TLS 的 .mobileconfig",
    "plain_dns": "一般的 DNS",
    "form_enter_rate_limit": "輸入速率限制",
    "rate_limit": "速率限制",
@@ -256,7 +259,7 @@
    "rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（設定它為 0 表示無限制的）",
    "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
    "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
-    "blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以 REFUSED 回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
+    "blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
    "blocking_mode_refused": "已拒絕（REFUSED）：以 REFUSED 碼回覆",
    "blocking_mode_nxdomain": "不存在的網域（NXDOMAIN）：以 NXDOMAIN 碼回覆",
    "blocking_mode_null_ip": "無效的 IP：以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆",
@@ -301,12 +304,12 @@
    "install_devices_router_list_4": "您無法於某些類型的路由器上設定自訂的 DNS 伺服器。在這種情況下，如果您設置 AdGuard Home 作為 <0>DHCP 伺服器</0>，其可能有所幫助。否則，您應搜尋有關如何為您的特定路由器型號自訂 DNS 伺服器之用法說明。",
    "install_devices_windows_list_1": "通過開始功能表或 Windows 搜尋，開啟控制台。",
    "install_devices_windows_list_2": "去網路和網際網路類別，然後去網路和共用中心。",
-    "install_devices_windows_list_3": "於畫面之左側上找到變更介面卡設定並於它上點擊。",
-    "install_devices_windows_list_4": "選擇您現行的連線，於它上點擊滑鼠右鍵，然後選擇內容。",
-    "install_devices_windows_list_5": "在清單中找到網際網路通訊協定第 4 版（TCP/IPv4），選擇它，然後再次於內容上點擊。",
+    "install_devices_windows_list_3": "於畫面之左側上找到變更介面卡設定並向它點擊。",
+    "install_devices_windows_list_4": "選擇您現行的連線，向它點擊滑鼠右鍵，然後選擇內容。",
+    "install_devices_windows_list_5": "在清單中找到網際網路通訊協定第 4 版（TCP/IPv4），選擇它，然後再次向內容點擊。",
    "install_devices_windows_list_6": "選擇使用下列的 DNS 伺服器位址，然後輸入您的 AdGuard Home 伺服器位址。",
-    "install_devices_macos_list_1": "於 Apple 圖像上點擊，然後去系統偏好設定。",
-    "install_devices_macos_list_2": "於網路上點擊。",
+    "install_devices_macos_list_1": "向 Apple 圖像點擊，然後去系統偏好設定。",
+    "install_devices_macos_list_2": "向網路點擊。",
    "install_devices_macos_list_3": "選擇在您的清單中之首要的連線，然後點擊進階的。",
    "install_devices_macos_list_4": "選擇該 DNS 分頁，然後輸入您的 AdGuard Home 伺服器位址。",
    "install_devices_android_list_1": "從 Android 選單主畫面中，輕觸設定。",
@@ -414,7 +417,8 @@
    "dns_privacy": "DNS 隱私",
    "setup_dns_privacy_1": "<0>DNS-over-TLS：</0>使用 <1>{{address}}</1> 字串。",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS：</0>使用 <1>{{address}}</1> 字串。",
-    "setup_dns_privacy_3": "<0>請注意，加密的 DNS 協定僅於 Android 9 上被支援。所以您需要安裝額外的軟體供其它的作業系統。</0><0>這裡是您可使用的軟體之清單。</0>",
+    "setup_dns_privacy_3": "<0>這裡是您可使用的軟體之清單。</0>",
+    "setup_dns_privacy_4": "於 iOS 14 或 macOS Big Sur 裝置上，您可下載增加 <highlight>DNS-over-HTTPS</highlight> 或 <highlight>DNS-over-TLS</highlight> 伺服器到 DNS 設定之特殊的 '.mobileconfig' 檔案。",
    "setup_dns_privacy_android_1": "Android 9 原生地支援 DNS-over-TLS。為了配置它，去設定 → 網路 & 網際網路 → 進階 → 私人 DNS 並在那輸入您的域名。",
    "setup_dns_privacy_android_2": "<0>AdGuard for Android</0> 支援 <1>DNS-over-HTTPS</1> 和 <1>DNS-over-TLS</1>。",
    "setup_dns_privacy_android_3": "<0>Intra</0> 對 Android 增加 <1>DNS-over-HTTPS</1> 支援。",
@@ -527,6 +531,7 @@
    "check_reason": "原因：{{reason}}",
    "check_rule": "規則：{{rule}}",
    "check_service": "服務名稱：{{service}}",
+    "service_name": "服務名稱",
    "check_not_found": "未在您的過濾器中被找到",
    "client_confirm_block": "您確定您想要封鎖該用戶端 \"{{ip}}\" 嗎？",
    "client_confirm_unblock": "您確定您想要解除封鎖該用戶端 \"{{ip}}\" 嗎？",
@@ -552,20 +557,20 @@
    "blocked_adult_websites": "已封鎖的成人網站",
    "blocked_threats": "已封鎖的威脅",
    "allowed": "已允許的",
-    "filtered": "已過濾的",
+    "filtered": "受過濾的",
    "rewritten": "已改寫的",
    "safe_search": "安全搜尋",
    "blocklist": "封鎖清單",
    "milliseconds_abbreviation": "ms",
    "cache_size": "快取大小",
    "cache_size_desc": "DNS 快取大小（以位元組）",
-    "cache_ttl_min_override": "覆寫最小的存活時間（TTL）（以秒數）",
-    "cache_ttl_max_override": "覆寫最大的存活時間（TTL）（以秒數）",
-    "enter_cache_size": "輸入快取大小",
-    "enter_cache_ttl_min_override": "輸入最小的存活時間（TTL）",
-    "enter_cache_ttl_max_override": "輸入最大的存活時間（TTL）",
-    "cache_ttl_min_override_desc": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最小值）",
-    "cache_ttl_max_override_desc": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最大值）",
+    "cache_ttl_min_override": "覆寫最小的存活時間（TTL）",
+    "cache_ttl_max_override": "覆寫最大的存活時間（TTL）",
+    "enter_cache_size": "輸入快取大小（位元組）",
+    "enter_cache_ttl_min_override": "輸入最小的存活時間（秒）",
+    "enter_cache_ttl_max_override": "輸入最大的存活時間（秒）",
+    "cache_ttl_min_override_desc": "當快取 DNS 回應時，延長從上游的伺服器收到的短存活時間數值（秒）",
+    "cache_ttl_max_override_desc": "設定最大的存活時間數值（秒）供在 DNS 快取中的項目",
    "ttl_cache_validation": "最小的快取存活時間（TTL）數值必須小於或等於最大的數值",
    "filter_category_general": "一般的",
    "filter_category_security": "安全性",
@@ -580,5 +585,6 @@
    "click_to_view_queries": "點擊以檢視查詢",
    "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。",
    "adg_will_drop_dns_queries": "AdGuard Home 將持續排除來自此用戶端之所有的 DNS 查詢。",
+    "client_not_in_allowed_clients": "因為該用戶端不在\"已允許的用戶端\"清單中，它未被允許。",
    "experimental": "實驗性的"
 }
--- a/client/src/tests/helpers.test.js
+++ b/client/src/tests/helpers.test.js
@@ -1,136 +1,5 @@
-import {
-    countClientsStatistics, findAddressType, getIpMatchListStatus, sortIp,
-} from '../helpers/helpers';
-import { ADDRESS_TYPES, IP_MATCH_LIST_STATUS } from '../helpers/constants';
-
-describe('getIpMatchListStatus', () => {
-    describe('IPv4', () => {
-        test('should return EXACT on find the exact ip match', () => {
-            const list = `127.0.0.2
-2001:db8:11a3:9d7:0:0:0:0
-192.168.0.1/8
-127.0.0.1
-127.0.0.3`;
-            expect(getIpMatchListStatus('127.0.0.1', list))
-                .toEqual(IP_MATCH_LIST_STATUS.EXACT);
-        });
-
-        test('should return CIDR on find the cidr match', () => {
-            const list = `127.0.0.2
-2001:db8:11a3:9d7:0:0:0:0
-192.168.0.1/8
-127.0.0.0/24
-127.0.0.3`;
-            expect(getIpMatchListStatus('127.0.0.1', list))
-                .toEqual(IP_MATCH_LIST_STATUS.CIDR);
-        });
-
-        test('should return NOT_FOUND if the ip is not in the list', () => {
-            const list = `127.0.0.1
-2001:db8:11a3:9d7:0:0:0:0
-192.168.0.1/8
-127.0.0.2
-127.0.0.3`;
-            expect(getIpMatchListStatus('127.0.0.4', list))
-                .toEqual(IP_MATCH_LIST_STATUS.NOT_FOUND);
-        });
-
-        test('should return the first EXACT or CIDR match in the list', () => {
-            const list1 = `2001:db8:11a3:9d7:0:0:0:0
-127.0.0.1
-127.0.0.8/24
-127.0.0.3`;
-            expect(getIpMatchListStatus('127.0.0.1', list1))
-                .toEqual(IP_MATCH_LIST_STATUS.EXACT);
-
-            const list2 = `2001:db8:11a3:9d7:ffff:ffff:ffff:ffff
-2001:0db8:11a3:09d7:0000:0000:0000:0000/64
-127.0.0.0/24
-127.0.0.1
-127.0.0.8/24
-127.0.0.3`;
-            expect(getIpMatchListStatus('127.0.0.1', list2))
-                .toEqual(IP_MATCH_LIST_STATUS.CIDR);
-        });
-    });
-
-    describe('IPv6', () => {
-        test('should return EXACT on find the exact ip match', () => {
-            const list = `127.0.0.0
-2001:db8:11a3:9d7:0:0:0:0
-2001:db8:11a3:9d7:ffff:ffff:ffff:ffff
-127.0.0.1`;
-            expect(getIpMatchListStatus('2001:db8:11a3:9d7:0:0:0:0', list))
-                .toEqual(IP_MATCH_LIST_STATUS.EXACT);
-        });
-
-        test('should return EXACT on find the exact ip match of short and long notation', () => {
-            const list = `127.0.0.0
-192.168.0.1/8
-2001:db8::
-127.0.0.2`;
-            expect(getIpMatchListStatus('2001:db8:0:0:0:0:0:0', list))
-                .toEqual(IP_MATCH_LIST_STATUS.EXACT);
-        });
-
-        test('should return CIDR on find the cidr match', () => {
-            const list1 = `2001:0db8:11a3:09d7:0000:0000:0000:0000/64
-127.0.0.1
-127.0.0.2`;
-            expect(getIpMatchListStatus('2001:db8:11a3:9d7:0:0:0:0', list1))
-                .toEqual(IP_MATCH_LIST_STATUS.CIDR);
-
-            const list2 = `2001:0db8::/16
-127.0.0.0
-2001:db8:11a3:9d7:0:0:0:0
-2001:db8::
-2001:db8:11a3:9d7:ffff:ffff:ffff:ffff
-127.0.0.1`;
-            expect(getIpMatchListStatus('2001:db1::', list2))
-                .toEqual(IP_MATCH_LIST_STATUS.CIDR);
-        });
-
-        test('should return NOT_FOUND if the ip is not in the list', () => {
-            const list = `2001:db8:11a3:9d7:0:0:0:0
-2001:0db8:11a3:09d7:0000:0000:0000:0000/64
-127.0.0.1
-127.0.0.2`;
-            expect(getIpMatchListStatus('::', list))
-                .toEqual(IP_MATCH_LIST_STATUS.NOT_FOUND);
-        });
-
-        test('should return the first EXACT or CIDR match in the list', () => {
-            const list1 = `2001:db8:11a3:9d7:0:0:0:0
-2001:0db8:11a3:09d7:0000:0000:0000:0000/64
-127.0.0.3`;
-            expect(getIpMatchListStatus('2001:db8:11a3:9d7:0:0:0:0', list1))
-                .toEqual(IP_MATCH_LIST_STATUS.EXACT);
-
-            const list2 = `2001:0db8:11a3:09d7:0000:0000:0000:0000/64
-2001:db8:11a3:9d7:0:0:0:0
-127.0.0.3`;
-            expect(getIpMatchListStatus('2001:db8:11a3:9d7:0:0:0:0', list2))
-                .toEqual(IP_MATCH_LIST_STATUS.CIDR);
-        });
-    });
-
-    describe('Empty list or IP', () => {
-        test('should return NOT_FOUND on empty ip', () => {
-            const list = `127.0.0.0
-2001:db8:11a3:9d7:0:0:0:0
-2001:db8:11a3:9d7:ffff:ffff:ffff:ffff
-127.0.0.1`;
-            expect(getIpMatchListStatus('', list))
-                .toEqual(IP_MATCH_LIST_STATUS.NOT_FOUND);
-        });
-
-        test('should return NOT_FOUND on empty list', () => {
-            const list = '';
-            expect(getIpMatchListStatus('127.0.0.1', list))
-                .toEqual(IP_MATCH_LIST_STATUS.NOT_FOUND);
-        });
-    });
-});
+import { sortIp, countClientsStatistics, findAddressType } from '../helpers/helpers';
+import { ADDRESS_TYPES } from '../helpers/constants';

 describe('sortIp', () => {
    describe('ipv4', () => {
--- a/client/src/actions/access.js
+++ b/client/src/actions/access.js
@@ -3,7 +3,6 @@ import i18next from 'i18next';

 import apiClient from '../api/Api';
 import { addErrorToast, addSuccessToast } from './toasts';
-import { BLOCK_ACTIONS } from '../helpers/constants';
 import { splitByNewLine } from '../helpers/helpers';

 export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
@@ -49,19 +48,16 @@ export const toggleClientBlockRequest = createAction('TOGGLE_CLIENT_BLOCK_REQUES
 export const toggleClientBlockFailure = createAction('TOGGLE_CLIENT_BLOCK_FAILURE');
 export const toggleClientBlockSuccess = createAction('TOGGLE_CLIENT_BLOCK_SUCCESS');

-export const toggleClientBlock = (type, ip) => async (dispatch) => {
+export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dispatch) => {
    dispatch(toggleClientBlockRequest());
    try {
        const {
-            allowed_clients, disallowed_clients, blocked_hosts,
+            allowed_clients, blocked_hosts, disallowed_clients = [],
        } = await apiClient.getAccessList();
-        let updatedDisallowedClients = disallowed_clients || [];

-        if (type === BLOCK_ACTIONS.UNBLOCK && updatedDisallowedClients.includes(ip)) {
-            updatedDisallowedClients = updatedDisallowedClients.filter((client) => client !== ip);
-        } else if (type === BLOCK_ACTIONS.BLOCK && !updatedDisallowedClients.includes(ip)) {
-            updatedDisallowedClients.push(ip);
-        }
+        const updatedDisallowedClients = disallowed
+            ? disallowed_clients.filter((client) => client !== disallowed_rule)
+            : disallowed_clients.concat(ip);

        const values = {
            allowed_clients,
@@ -72,9 +68,9 @@ export const toggleClientBlock = (type, ip) => async (dispatch) => {
        await apiClient.setAccessList(values);
        dispatch(toggleClientBlockSuccess(values));

-        if (type === BLOCK_ACTIONS.UNBLOCK) {
-            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip })));
-        } else if (type === BLOCK_ACTIONS.BLOCK) {
+        if (disallowed) {
+            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
+        } else {
            dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
        }
    } catch (error) {
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -5,9 +5,15 @@ import axios from 'axios';
 import endsWith from 'lodash/endsWith';
 import escapeRegExp from 'lodash/escapeRegExp';
 import React from 'react';
-import { splitByNewLine, sortClients } from '../helpers/helpers';
+import { compose } from 'redux';
+import { splitByNewLine, sortClients, filterOutComments } from '../helpers/helpers';
 import {
-    BLOCK_ACTIONS, CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME, GETTING_STARTED_LINK,
+    BLOCK_ACTIONS,
+    CHECK_TIMEOUT,
+    STATUS_RESPONSE,
+    SETTINGS_NAMES,
+    FORM_NAME,
+    GETTING_STARTED_LINK,
 } from '../helpers/constants';
 import { areEqualVersions } from '../helpers/version';
 import { getTlsStatus } from './encryption';
@@ -289,14 +295,21 @@ export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
 export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
 export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');

-export const testUpstream = (config) => async (dispatch) => {
+export const testUpstream = (
+    { bootstrap_dns, upstream_dns }, upstream_dns_file,
+) => async (dispatch) => {
    dispatch(testUpstreamRequest());
    try {
-        const values = { ...config };
-        values.bootstrap_dns = splitByNewLine(values.bootstrap_dns);
-        values.upstream_dns = splitByNewLine(values.upstream_dns);
+        const removeComments = compose(filterOutComments, splitByNewLine);

-        const upstreamResponse = await apiClient.testUpstream(values);
+        const config = {
+            bootstrap_dns: splitByNewLine(bootstrap_dns),
+            ...(upstream_dns_file ? null : {
+                upstream_dns: removeComments(upstream_dns),
+            }),
+        };
+
+        const upstreamResponse = await apiClient.testUpstream(config);
        const testMessages = Object.keys(upstreamResponse)
            .map((key) => {
                const message = upstreamResponse[key];
@@ -317,6 +330,12 @@ export const testUpstream = (config) => async (dispatch) => {
    }
 };

+export const testUpstreamWithFormValues = () => async (dispatch, getState) => {
+    const { upstream_dns_file } = getState().dnsConfig;
+    const { bootstrap_dns, upstream_dns } = getState().form[FORM_NAME.UPSTREAM].values;
+    return dispatch(testUpstream({ bootstrap_dns, upstream_dns }, upstream_dns_file));
+};
+
 export const changeLanguageRequest = createAction('CHANGE_LANGUAGE_REQUEST');
 export const changeLanguageFailure = createAction('CHANGE_LANGUAGE_FAILURE');
 export const changeLanguageSuccess = createAction('CHANGE_LANGUAGE_SUCCESS');
--- a/client/src/actions/queryLogs.js
+++ b/client/src/actions/queryLogs.js
@@ -7,6 +7,17 @@ import {
 } from '../helpers/constants';
 import { addErrorToast, addSuccessToast } from './toasts';

+const enrichWithClientInfo = async (logs) => {
+    const clientsParams = getParamsForClientsSearch(logs, 'client');
+
+    if (Object.keys(clientsParams).length > 0) {
+        const clients = await apiClient.findClients(clientsParams);
+        return addClientInfo(logs, clients, 'client');
+    }
+
+    return logs;
+};
+
 const getLogsWithParams = async (config) => {
    const { older_than, filter, ...values } = config;
    const rawLogs = await apiClient.getQueryLog({
@@ -14,13 +25,8 @@ const getLogsWithParams = async (config) => {
        older_than,
    });
    const { data, oldest } = rawLogs;
-    let logs = normalizeLogs(data);
-    const clientsParams = getParamsForClientsSearch(logs, 'client');
-
-    if (Object.keys(clientsParams).length > 0) {
-        const clients = await apiClient.findClients(clientsParams);
-        logs = addClientInfo(logs, clients, 'client');
-    }
+    const normalizedLogs = normalizeLogs(data);
+    const logs = await enrichWithClientInfo(normalizedLogs);

    return {
        logs,
@@ -82,6 +88,23 @@ export const getLogsRequest = createAction('GET_LOGS_REQUEST');
 export const getLogsFailure = createAction('GET_LOGS_FAILURE');
 export const getLogsSuccess = createAction('GET_LOGS_SUCCESS');

+export const updateLogs = () => async (dispatch, getState) => {
+    try {
+        const { logs, oldest, older_than } = getState().queryLogs;
+
+        const enrichedLogs = await enrichWithClientInfo(logs);
+
+        dispatch(getLogsSuccess({
+            logs: enrichedLogs,
+            oldest,
+            older_than,
+        }));
+    } catch (error) {
+        dispatch(addErrorToast({ error }));
+        dispatch(getLogsFailure(error));
+    }
+};
+
 export const getLogs = () => async (dispatch, getState) => {
    dispatch(getLogsRequest());
    try {
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -63,10 +63,6 @@ body {
    cursor: not-allowed;
 }

-.select--no-warning {
-    margin-bottom: 1.375rem;
-}
-
 .button-action {
    visibility: hidden;
 }
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -8,10 +8,11 @@ import classNames from 'classnames';
 import Card from '../ui/Card';
 import Cell from '../ui/Cell';

-import { getPercent, getIpMatchListStatus, sortIp } from '../../helpers/helpers';
-import { BLOCK_ACTIONS, IP_MATCH_LIST_STATUS, STATUS_COLORS } from '../../helpers/constants';
+import { getPercent, sortIp } from '../../helpers/helpers';
+import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
 import { toggleClientBlock } from '../../actions/access';
 import { renderFormattedClientCell } from '../../helpers/renderFormattedClientCell';
+import { getStats } from '../../actions/stats';

 const getClientsPercentColor = (percent) => {
    if (percent > 50) {
@@ -33,59 +34,51 @@ const CountCell = (row) => {
    return <Cell value={value} percent={percent} color={percentColor} search={ip} />;
 };

-const renderBlockingButton = (ip) => {
+const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
    const dispatch = useDispatch();
    const { t } = useTranslation();
    const processingSet = useSelector((state) => state.access.processingSet);
-    const disallowed_clients = useSelector(
-        (state) => state.access.disallowed_clients, shallowEqual,
-    );
-
-    const ipMatchListStatus = getIpMatchListStatus(ip, disallowed_clients);
-
-    if (ipMatchListStatus === IP_MATCH_LIST_STATUS.CIDR) {
-        return null;
-    }
-
-    const isNotFound = ipMatchListStatus === IP_MATCH_LIST_STATUS.NOT_FOUND;
-    const type = isNotFound ? BLOCK_ACTIONS.BLOCK : BLOCK_ACTIONS.UNBLOCK;
-    const text = type;

    const buttonClass = classNames('button-action button-action--main', {
-        'button-action--unblock': !isNotFound,
+        'button-action--unblock': disallowed,
    });

-    const toggleClientStatus = (type, ip) => {
-        const confirmMessage = type === BLOCK_ACTIONS.BLOCK
-            ? `${t('adg_will_drop_dns_queries')} ${t('client_confirm_block', { ip })}`
-            : t('client_confirm_unblock', { ip });
+    const toggleClientStatus = async (ip, disallowed, disallowed_rule) => {
+        const confirmMessage = disallowed
+            ? t('client_confirm_unblock', { ip: disallowed_rule })
+            : `${t('adg_will_drop_dns_queries')} ${t('client_confirm_block', { ip })}`;

        if (window.confirm(confirmMessage)) {
-            dispatch(toggleClientBlock(type, ip));
+            await dispatch(toggleClientBlock(ip, disallowed, disallowed_rule));
+            await dispatch(getStats());
        }
    };

-    const onClick = () => toggleClientStatus(type, ip);
+    const onClick = () => toggleClientStatus(ip, disallowed, disallowed_rule);

+    const text = disallowed ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
+
+    const isNotInAllowedList = disallowed && disallowed_rule === '';
    return <div className="table__action pl-4">
-                <button
-                        type="button"
-                        className={buttonClass}
-                        onClick={onClick}
-                        disabled={processingSet}
-                >
-                    <Trans>{text}</Trans>
-                </button>
-            </div>;
+        <button
+                type="button"
+                className={buttonClass}
+                onClick={isNotInAllowedList ? undefined : onClick}
+                disabled={isNotInAllowedList || processingSet}
+                title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
+        >
+            <Trans>{text}</Trans>
+        </button>
+    </div>;
 };

 const ClientCell = (row) => {
-    const { value, original: { info } } = row;
+    const { value, original: { info, info: { disallowed, disallowed_rule } } } = row;

    return <>
        <div className="logs__row logs__row--overflow logs__row--column d-flex align-items-center">
            {renderFormattedClientCell(value, info, true)}
-            {renderBlockingButton(value)}
+            {renderBlockingButton(value, disallowed, disallowed_rule)}
        </div>
    </>;
 };
@@ -96,7 +89,6 @@ const Clients = ({
 }) => {
    const { t } = useTranslation();
    const topClients = useSelector((state) => state.stats.topClients, shallowEqual);
-    const disallowedClients = useSelector((state) => state.access.disallowed_clients, shallowEqual);

    return <Card
            title={t('top_clients')}
@@ -138,9 +130,9 @@ const Clients = ({
                        return {};
                    }

-                    const { ip } = rowInfo.original;
+                    const { info: { disallowed } } = rowInfo.original;

-                    return getIpMatchListStatus(ip, disallowedClients) === IP_MATCH_LIST_STATUS.NOT_FOUND ? {} : { className: 'red' };
+                    return disallowed ? { className: 'logs__row--red' } : {};
                }}
        />
    </Card>;
--- a/client/src/components/Dashboard/Dashboard.css
+++ b/client/src/components/Dashboard/Dashboard.css
@@ -33,3 +33,24 @@
        right: 0;
    }
 }
+
+.page-title--dashboard {
+    display: flex;
+    align-items: center;
+}
+
+.dashboard-title__button{
+    margin: 0 0.5rem;
+}
+
+@media (max-width: 767.98px) {
+    .page-title--dashboard {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+
+    .dashboard-title__button{
+        margin: 0.5rem 0;
+        display: block;
+    }
+}
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
-
+import classNames from 'classnames';
 import Statistics from './Statistics';
 import Counters from './Counters';
 import Clients from './Clients';
@@ -17,6 +17,7 @@ const Dashboard = ({
    getStats,
    getStatsConfig,
    dashboard,
+    dashboard: { protectionEnabled, processingProtection },
    toggleProtection,
    stats,
    access,
@@ -33,20 +34,12 @@ const Dashboard = ({
        getAllStats();
    }, []);

-    const getToggleFilteringButton = () => {
-        const { protectionEnabled, processingProtection } = dashboard;
-        const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
-        const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
+    const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';

-        return <button
-                type="button"
-                className={`btn btn-sm mr-2 ${buttonClass}`}
-                onClick={() => toggleProtection(protectionEnabled)}
-                disabled={processingProtection}
-        >
-            <Trans>{buttonText}</Trans>
-        </button>;
-    };
+    const buttonClass = classNames('btn btn-sm dashboard-title__button', {
+        'btn-gray': protectionEnabled,
+        'btn-success': !protectionEnabled,
+    });

    const refreshButton = <button
            type="button"
@@ -62,24 +55,27 @@ const Dashboard = ({
        ? t('for_last_24_hours')
        : t('for_last_days', { count: stats.interval });

-    const refreshFullButton = <button
-            type="button"
-            className="btn btn-outline-primary btn-sm"
-            onClick={() => getAllStats()}
-    >
-        <Trans>refresh_statics</Trans>
-    </button>;
-
    const statsProcessing = stats.processingStats
            || stats.processingGetConfig
            || access.processing;

    return <>
-        <PageTitle title={t('dashboard')}>
-            <div className="page-title__actions">
-                {getToggleFilteringButton()}
-                {refreshFullButton}
-            </div>
+        <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
+            <button
+                    type="button"
+                    className={buttonClass}
+                    onClick={() => toggleProtection(protectionEnabled)}
+                    disabled={processingProtection}
+            >
+                <Trans>{buttonText}</Trans>
+            </button>
+            <button
+                    type="button"
+                    className="btn btn-outline-primary btn-sm"
+                    onClick={getAllStats}
+            >
+                <Trans>refresh_statics</Trans>
+            </button>
        </PageTitle>
        {statsProcessing && <Loading />}
        {!statsProcessing && <div className="row row-cards dashboard">
--- a/client/src/components/Filters/Actions.js
+++ b/client/src/components/Filters/Actions.js
@@ -4,29 +4,23 @@ import { withTranslation, Trans } from 'react-i18next';

 const Actions = ({
    handleAdd, handleRefresh, processingRefreshFilters, whitelist,
-}) => (
-    <div className="card-actions">
-        <button
-            className="btn btn-success btn-standard mr-2 btn-large"
+}) => <div className="card-actions">
+    <button
+            className="btn btn-success btn-standard mr-2 btn-large mb-2"
            type="submit"
            onClick={handleAdd}
-        >
-            {whitelist ? (
-                <Trans>add_allowlist</Trans>
-            ) : (
-                <Trans>add_blocklist</Trans>
-            )}
-        </button>
-        <button
-            className="btn btn-primary btn-standard"
+    >
+        {whitelist ? <Trans>add_allowlist</Trans> : <Trans>add_blocklist</Trans>}
+    </button>
+    <button
+            className="btn btn-primary btn-standard mb-2"
            type="submit"
            onClick={handleRefresh}
            disabled={processingRefreshFilters}
-        >
-            <Trans>check_updates_btn</Trans>
-        </button>
-    </div>
-);
+    >
+        <Trans>check_updates_btn</Trans>
+    </button>
+</div>;

 Actions.propTypes = {
    handleAdd: PropTypes.func.isRequired,
--- a/client/src/components/Filters/Check/Info.js
+++ b/client/src/components/Filters/Check/Info.js
@@ -1,155 +1,124 @@
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { withTranslation } from 'react-i18next';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import classNames from 'classnames';

+import i18next from 'i18next';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import {
    checkFiltered,
    checkRewrite,
    checkRewriteHosts,
-    checkBlackList,
-    checkNotFilteredNotFound,
    checkWhiteList,
    checkSafeSearch,
    checkSafeBrowsing,
-    checkParental, getFilterName,
+    checkParental,
+    getFilterName,
 } from '../../../helpers/helpers';
-import { FILTERED } from '../../../helpers/constants';
+import { BLOCK_ACTIONS, FILTERED, FILTERED_STATUS } from '../../../helpers/constants';
+import { toggleBlocking } from '../../../actions';

-const getTitle = (reason, filterName, t, onlyFiltered) => {
-    if (checkNotFilteredNotFound(reason)) {
-        return t('check_not_found');
-    }
+const renderBlockingButton = (isFiltered, domain) => {
+    const processingRules = useSelector((state) => state.filtering.processingRules);
+    const dispatch = useDispatch();
+    const { t } = useTranslation();

-    if (checkRewrite(reason)) {
-        return t('rewrite_applied');
-    }
+    const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;

-    if (checkRewriteHosts(reason)) {
-        return t('rewrite_hosts_applied');
-    }
+    const onClick = async () => {
+        await dispatch(toggleBlocking(buttonType, domain));
+    };

-    if (checkBlackList(reason)) {
-        return filterName;
-    }
+    const buttonClass = classNames('mt-3 button-action button-action--main button-action--active button-action--small', {
+        'button-action--unblock': isFiltered,
+    });

-    if (checkWhiteList(reason)) {
-        return (
-            <div>
-                {filterName}
-            </div>
-        );
-    }
-
-    if (onlyFiltered) {
-        const filterKey = reason.replace(FILTERED, '');
-
-        return (
-            <div>
-                {t('query_log_filtered', { filter: filterKey })}
-            </div>
-        );
-    }
-
-    return (
-        <Fragment>
-            <div>
-                {t('check_reason', { reason })}
-            </div>
-            <div>
-                {filterName}
-            </div>
-        </Fragment>
-    );
+    return <button type="button"
+                className={buttonClass}
+                onClick={onClick}
+                disabled={processingRules}
+        >
+            {t(buttonType)}
+        </button>;
 };

-const getColor = (reason) => {
-    if (checkFiltered(reason)) {
-        return 'red';
-    } if (checkRewrite(reason) || checkRewriteHosts(reason)) {
-        return 'blue';
-    } if (checkWhiteList(reason)) {
-        return 'green';
-    }
+const getTitle = (reason) => {
+    const { t } = useTranslation();

-    return '';
-};
+    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
+    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
+    const filter_id = useSelector((state) => state.filtering.check.filter_id);

-const Info = ({
-    filters,
-    whitelistFilters,
-    hostname,
-    reason,
-    filter_id,
-    rule,
-    service_name,
-    cname,
-    ip_addrs,
-    t,
-}) => {
-    const filterName = getFilterName(filters,
+    const filterName = getFilterName(
+        filters,
        whitelistFilters,
        filter_id,
        'filtered_custom_rules',
-        (filter) => (filter?.name ? t('query_log_filtered', { filter: filter.name }) : ''));
+        (filter) => (filter?.name ? t('query_log_filtered', { filter: filter.name }) : ''),
+    );
+
+    const getReasonFiltered = (reason) => {
+        const filterKey = reason.replace(FILTERED, '');
+        return i18next.t('query_log_filtered', { filter: filterKey });
+    };
+
+    const REASON_TO_TITLE_MAP = {
+        [FILTERED_STATUS.NOT_FILTERED_NOT_FOUND]: t('check_not_found'),
+        [FILTERED_STATUS.REWRITE]: t('rewrite_applied'),
+        [FILTERED_STATUS.REWRITE_HOSTS]: t('rewrite_hosts_applied'),
+        [FILTERED_STATUS.FILTERED_BLACK_LIST]: filterName,
+        [FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: filterName,
+        [FILTERED_STATUS.FILTERED_SAFE_SEARCH]: getReasonFiltered(reason),
+        [FILTERED_STATUS.FILTERED_SAFE_BROWSING]: getReasonFiltered(reason),
+        [FILTERED_STATUS.FILTERED_PARENTAL]: getReasonFiltered(reason),
+    };
+
+    if (Object.prototype.hasOwnProperty.call(REASON_TO_TITLE_MAP, reason)) {
+        return REASON_TO_TITLE_MAP[reason];
+    }
+
+    return <>
+        <div>{t('check_reason', { reason })}</div>
+        <div>{filterName}</div>
+    </>;
+};
+
+const Info = () => {
+    const {
+        hostname,
+        reason,
+        rule,
+        service_name,
+        cname,
+        ip_addrs,
+    } = useSelector((state) => state.filtering.check, shallowEqual);
+    const { t } = useTranslation();
+
+    const title = getTitle(reason);
+
+    const className = classNames('card mb-0 p-3', {
+        'logs__row--red': checkFiltered(reason),
+        'logs__row--blue': checkRewrite(reason) || checkRewriteHosts(reason),
+        'logs__row--green': checkWhiteList(reason),
+    });

    const onlyFiltered = checkSafeSearch(reason)
        || checkSafeBrowsing(reason)
        || checkParental(reason);
-    const title = getTitle(reason, filterName, t, onlyFiltered);
-    const color = getColor(reason);

-    if (onlyFiltered) {
-        return (
-            <div className={`card mb-0 p-3 ${color}`}>
-                <div>
-                    <strong>{hostname}</strong>
-                </div>
+    const isFiltered = checkFiltered(reason);

-                <div>{title}</div>
-            </div>
-        );
-    }
-
-    return (
-        <div className={`card mb-0 p-3 ${color}`}>
-            <div>
-                <strong>{hostname}</strong>
-            </div>
-
-            <div>{title}</div>
-
-            {rule && (
-                <div>{t('check_rule', { rule })}</div>
-            )}
-
-            {service_name && (
-                <div>{t('check_service', { service: service_name })}</div>
-            )}
-
-            {cname && (
-                <div>{t('check_cname', { cname })}</div>
-            )}
-
-            {ip_addrs && (
-                <div>
-                    {t('check_ip', { ip: ip_addrs.join(', ') })}
-                </div>
-            )}
-        </div>
-    );
+    return <div className={className}>
+        <div><strong>{hostname}</strong></div>
+        <div>{title}</div>
+        {!onlyFiltered
+        && <>
+            {rule && <div>{t('check_rule', { rule })}</div>}
+            {service_name && <div>{t('check_service', { service: service_name })}</div>}
+            {cname && <div>{t('check_cname', { cname })}</div>}
+            {ip_addrs && <div>{t('check_ip', { ip: ip_addrs.join(', ') })}</div>}
+            {renderBlockingButton(isFiltered, hostname)}
+        </>}
+    </div>;
 };

-Info.propTypes = {
-    filters: PropTypes.array.isRequired,
-    whitelistFilters: PropTypes.array.isRequired,
-    hostname: PropTypes.string.isRequired,
-    reason: PropTypes.string.isRequired,
-    filter_id: PropTypes.number,
-    rule: PropTypes.string,
-    service_name: PropTypes.string,
-    cname: PropTypes.string,
-    ip_addrs: PropTypes.array,
-    t: PropTypes.func.isRequired,
-};
-
-export default withTranslation()(Info);
+export default Info;
--- a/client/src/components/Filters/Check/index.js
+++ b/client/src/components/Filters/Check/index.js
@@ -1,99 +1,66 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { Trans, withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 import { Field, reduxForm } from 'redux-form';
-import flow from 'lodash/flow';
+import { useSelector } from 'react-redux';
 import Card from '../../ui/Card';
-
 import { renderInputField } from '../../../helpers/form';
 import Info from './Info';
 import { FORM_NAME } from '../../../helpers/constants';

 const Check = (props) => {
    const {
-        t,
-        handleSubmit,
        pristine,
        invalid,
-        processing,
-        check,
-        filters,
-        whitelistFilters,
+        handleSubmit,
    } = props;

-    const {
-        hostname,
-        reason,
-        filter_id,
-        rule,
-        service_name,
-        cname,
-        ip_addrs,
-    } = check;
+    const { t } = useTranslation();

-    return (
-        <Card
-            title={t('check_title')}
-            subtitle={t('check_desc')}
-        >
-            <form onSubmit={handleSubmit}>
-                <div className="row">
-                    <div className="col-12 col-md-6">
-                        <div className="input-group">
-                            <Field
-                                id="name"
-                                name="name"
-                                component={renderInputField}
-                                type="text"
-                                className="form-control"
-                                placeholder={t('form_enter_host')}
-                            />
-                            <span className="input-group-append">
-                                <button
-                                    className="btn btn-success btn-standard btn-large"
-                                    type="submit"
-                                    onClick={handleSubmit}
-                                    disabled={pristine || invalid || processing}
-                                >
-                                    <Trans>check</Trans>
-                                </button>
-                            </span>
-                        </div>
-                        {check.hostname && (
-                            <Fragment>
-                                <hr />
-                                <Info
-                                    filters={filters}
-                                    whitelistFilters={whitelistFilters}
-                                    hostname={hostname}
-                                    reason={reason}
-                                    filter_id={filter_id}
-                                    rule={rule}
-                                    service_name={service_name}
-                                    cname={cname}
-                                    ip_addrs={ip_addrs}
-                                />
-                            </Fragment>
-                        )}
+    const processingCheck = useSelector((state) => state.filtering.processingCheck);
+    const hostname = useSelector((state) => state.filtering.check.hostname);
+
+    return <Card
+        title={t('check_title')}
+        subtitle={t('check_desc')}
+    >
+        <form onSubmit={handleSubmit}>
+            <div className="row">
+                <div className="col-12 col-md-6">
+                    <div className="input-group">
+                        <Field
+                            id="name"
+                            name="name"
+                            component={renderInputField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t('form_enter_host')}
+                        />
+                        <span className="input-group-append">
+                            <button
+                                className="btn btn-success btn-standard btn-large"
+                                type="submit"
+                                onClick={handleSubmit}
+                                disabled={pristine || invalid || processingCheck}
+                            >
+                                {t('check')}
+                            </button>
+                        </span>
                    </div>
+                    {hostname && <>
+                        <hr />
+                        <Info />
+                    </>}
                </div>
-            </form>
-        </Card>
-    );
+            </div>
+        </form>
+    </Card>;
 };

 Check.propTypes = {
-    t: PropTypes.func.isRequired,
    handleSubmit: PropTypes.func.isRequired,
    pristine: PropTypes.bool.isRequired,
    invalid: PropTypes.bool.isRequired,
-    processing: PropTypes.bool.isRequired,
-    check: PropTypes.object.isRequired,
-    filters: PropTypes.array.isRequired,
-    whitelistFilters: PropTypes.array.isRequired,
 };

-export default flow([
-    withTranslation(),
-    reduxForm({ form: FORM_NAME.DOMAIN_CHECK }),
-])(Check);
+export default reduxForm({ form: FORM_NAME.DOMAIN_CHECK })(Check);
--- a/client/src/components/Filters/CustomRules.js
+++ b/client/src/components/Filters/CustomRules.js
@@ -1,13 +1,18 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
-
+import classnames from 'classnames';
 import Card from '../ui/Card';
 import PageTitle from '../ui/PageTitle';
 import Examples from './Examples';
 import Check from './Check';
+import { getTextareaCommentsHighlight, syncScroll } from '../../helpers/highlightTextareaComments';
+import { COMMENT_LINE_DEFAULT_TOKEN, isFirefox } from '../../helpers/constants';
+import '../ui/texareaCommentsHighlight.css';

 class CustomRules extends Component {
+    ref = React.createRef();
+
    componentDidMount() {
        this.props.getFilteringStatus();
    }
@@ -34,30 +39,42 @@ class CustomRules extends Component {
        this.props.checkHost(values);
    };

+    onScroll = (e) => syncScroll(e, this.ref)
+
    render() {
        const {
            t,
            filtering: {
-                filters,
-                whitelistFilters,
                userRules,
-                processingCheck,
-                check,
            },
        } = this.props;

        return (
-            <Fragment>
+            <>
                <PageTitle title={t('custom_filtering_rules')} />
                <Card
                    subtitle={t('custom_filter_rules_hint')}
                >
                    <form onSubmit={this.handleSubmit}>
+                        <div className={classnames('col-12 text-edit-container form-control--textarea-large', {
+                            'mb-4': !isFirefox,
+                            'mb-6': isFirefox,
+                        })}>
                        <textarea
-                            className="form-control form-control--textarea-large font-monospace"
-                            value={userRules}
-                            onChange={this.handleChange}
+                                className={classnames('form-control font-monospace text-input form-control--textarea-large', {
+                                    'text-input--largest': isFirefox,
+                                })}
+                                value={userRules}
+                                onChange={this.handleChange}
+                                onScroll={this.onScroll}
                        />
+                            {getTextareaCommentsHighlight(
+                                this.ref,
+                                userRules,
+                                classnames({ 'form-control--textarea-large': isFirefox }),
+                                [COMMENT_LINE_DEFAULT_TOKEN, '!'],
+                            )}
+                        </div>
                        <div className="card-actions">
                            <button
                                className="btn btn-success btn-standard btn-large"
@@ -71,14 +88,8 @@ class CustomRules extends Component {
                    <hr />
                    <Examples />
                </Card>
-                <Check
-                    filters={filters}
-                    whitelistFilters={whitelistFilters}
-                    check={check}
-                    onSubmit={this.handleCheck}
-                    processing={processingCheck}
-                />
-            </Fragment>
+                <Check onSubmit={this.handleCheck} />
+            </>
        );
    }
 }
--- a/client/src/components/Filters/DnsBlocklist.js
+++ b/client/src/components/Filters/DnsBlocklist.js
@@ -23,7 +23,7 @@ class DnsBlocklist extends Component {
    }

    handleSubmit = (values, _, { initialValues }) => {
-        const { filtering: { modalFilterUrl, modalType } } = this.props;
+        const { modalFilterUrl, modalType } = this.props.filtering;

        switch (modalType) {
            case MODAL_TYPE.EDIT_FILTERS:
--- a/client/src/components/Filters/Form.js
+++ b/client/src/components/Filters/Form.js
@@ -5,9 +5,11 @@ import { withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 import classNames from 'classnames';
 import { validatePath, validateRequiredValue } from '../../helpers/validators';
-import { renderCheckboxField, renderInputField } from '../../helpers/form';
+import { CheckboxField, renderInputField } from '../../helpers/form';
 import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';

+const filtersCatalog = require('../../helpers/filters/filters.json');
+
 const getIconsData = (homepage, source) => ([
    {
        iconName: 'dashboard',
@@ -32,6 +34,22 @@ const renderIcons = (iconsData) => iconsData.map(({
    </svg>
 </a>);

+const renderCheckboxField = (
+    props,
+) => <CheckboxField
+        {...props}
+        input={{
+            ...props.input,
+            checked: props.disabled || props.input.checked,
+        }}
+/>;
+
+renderCheckboxField.propTypes = {
+    // https://redux-form.com/8.3.0/docs/api/field.md/#props
+    input: PropTypes.object.isRequired,
+    disabled: PropTypes.bool.isRequired,
+};
+
 const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
    .map((categoryId) => {
        const category = categories[categoryId];
@@ -58,12 +76,11 @@ const renderFilters = ({ categories, filters }, selectedSources, t) => Object.ke

                return <div key={name} className="d-flex align-items-center pb-1">
                    <Field
-                        name={`${filter.id}`}
+                        name={filter.id}
                        type="checkbox"
                        component={renderCheckboxField}
                        placeholder={t(name)}
                        disabled={isSelected}
-                        checked={isSelected}
                    />
                    {renderIcons(iconsData)}
                </div>;
@@ -82,7 +99,6 @@ const Form = (props) => {
        modalType,
        toggleFilteringModal,
        selectedSources,
-        filtersCatalog,
    } = props;

    const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
@@ -168,7 +184,6 @@ Form.propTypes = {
    whitelist: PropTypes.bool,
    modalType: PropTypes.string.isRequired,
    toggleFilteringModal: PropTypes.func.isRequired,
-    filtersCatalog: PropTypes.object,
    selectedSources: PropTypes.object,
 };

--- a/client/src/components/Filters/Modal.js
+++ b/client/src/components/Filters/Modal.js
@@ -78,6 +78,7 @@ class Modal extends Component {
                break;
            }
            default:
+                break;
        }

        const title = t(getTitle(modalType, whitelist));
@@ -99,7 +100,6 @@ class Modal extends Component {
                    <Form
                        selectedSources={selectedSources}
                        initialValues={initialValues}
-                        filtersCatalog={filtersCatalog}
                        modalType={modalType}
                        onSubmit={handleSubmit}
                        processingAddFilter={processingAddFilter}
--- a/client/src/components/Logs/Cells/ClientCell.js
+++ b/client/src/components/Logs/Cells/ClientCell.js
@@ -11,12 +11,16 @@ import IconTooltip from './IconTooltip';
 import { renderFormattedClientCell } from '../../../helpers/renderFormattedClientCell';
 import { toggleClientBlock } from '../../../actions/access';
 import { getBlockClientInfo } from './helpers';
+import { getStats } from '../../../actions/stats';
+import { updateLogs } from '../../../actions/queryLogs';

 const ClientCell = ({
    client,
    domain,
    info,
-    info: { name, whois_info },
+    info: {
+        name, whois_info, disallowed, disallowed_rule,
+    },
    reason,
 }) => {
    const { t } = useTranslation();
@@ -26,11 +30,6 @@ const ClientCell = ({
    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
    const [isOptionsOpened, setOptionsOpened] = useState(false);

-    const disallowed_clients = useSelector(
-        (state) => state.access.disallowed_clients,
-        shallowEqual,
-    );
-
    const autoClient = autoClients.find((autoClient) => autoClient.name === client);
    const source = autoClient?.source;
    const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
@@ -66,43 +65,50 @@ const ClientCell = ({
        const {
            confirmMessage,
            buttonKey: blockingClientKey,
-            type,
-        } = getBlockClientInfo(client, disallowed_clients);
+            isNotInAllowedList,
+        } = getBlockClientInfo(client, disallowed, disallowed_rule);

        const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
        const clientNameBlockingFor = getBlockingClientName(clients, client);

-        const BUTTON_OPTIONS_TO_ACTION_MAP = {
-            [blockingForClientKey]: () => {
-                dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
+        const BUTTON_OPTIONS = [
+            {
+                name: blockingForClientKey,
+                onClick: () => {
+                    dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
+                },
            },
-            [blockingClientKey]: () => {
-                const message = `${type === BLOCK_ACTIONS.BLOCK ? t('adg_will_drop_dns_queries') : ''} ${t(confirmMessage, { ip: client })}`;
-                if (window.confirm(message)) {
-                    dispatch(toggleClientBlock(type, client));
-                }
+            {
+                name: blockingClientKey,
+                onClick: async () => {
+                    if (window.confirm(confirmMessage)) {
+                        await dispatch(toggleClientBlock(client, disallowed, disallowed_rule));
+                        await dispatch(updateLogs());
+                    }
+                },
+                disabled: isNotInAllowedList,
            },
-        };
+        ];

        const onClick = async () => {
            await dispatch(toggleBlocking(buttonType, domain));
+            await dispatch(getStats());
        };

-        const getOptions = (optionToActionMap) => {
-            const options = Object.entries(optionToActionMap);
+        const getOptions = (options) => {
            if (options.length === 0) {
                return null;
            }
-            return <>{options
-                .map(([name, onClick]) => <div
+            return <>{options.map(({ name, onClick, disabled }) => <button
                    key={name}
                    className="button-action--arrow-option px-4 py-2"
                    onClick={onClick}
+                    disabled={disabled}
            >{t(name)}
-            </div>)}</>;
+            </button>)}</>;
        };

-        const content = getOptions(BUTTON_OPTIONS_TO_ACTION_MAP);
+        const content = getOptions(BUTTON_OPTIONS);

        const buttonClass = classNames('button-action button-action--main', {
            'button-action--unblock': isFiltered,
@@ -168,6 +174,8 @@ ClientCell.propTypes = {
                city: propTypes.string,
                orgname: propTypes.string,
            }),
+            disallowed: propTypes.bool.isRequired,
+            disallowed_rule: propTypes.string.isRequired,
        }),
    ]),
    reason: propTypes.string.isRequired,
--- a/client/src/components/Logs/Cells/DomainCell.js
+++ b/client/src/components/Logs/Cells/DomainCell.js
@@ -14,7 +14,6 @@ import IconTooltip from './IconTooltip';

 const DomainCell = ({
    answer_dnssec,
-    service_name,
    client_proto,
    domain,
    time,
@@ -50,10 +49,6 @@ const DomainCell = ({
        protocol,
    };

-    if (service_name) {
-        requestDetailsObj.check_service = service_name;
-    }
-
    const sourceData = getSourceData(tracker);

    const knownTrackerDataObj = {
@@ -103,7 +98,7 @@ const DomainCell = ({
                     xlinkHref='privacy' contentItemClass='key-colon' renderContent={renderContent}
                     place='bottom' />
        <div className={valueClass}>
-            <div className="text-truncate" title={domain}>{service_name || domain}</div>
+            <div className="text-truncate" title={domain}>{domain}</div>
            {details && isDetailed
            && <div className="detailed-info d-none d-sm-block text-truncate"
                    title={details}>{details}</div>}
@@ -117,7 +112,6 @@ DomainCell.propTypes = {
    domain: propTypes.string.isRequired,
    time: propTypes.string.isRequired,
    type: propTypes.string.isRequired,
-    service_name: propTypes.string,
    tracker: propTypes.object,
 };

--- a/client/src/components/Logs/Cells/ResponseCell.js
+++ b/client/src/components/Logs/Cells/ResponseCell.js
@@ -3,7 +3,11 @@ import { shallowEqual, useSelector } from 'react-redux';
 import classNames from 'classnames';
 import React from 'react';
 import propTypes from 'prop-types';
-import { formatElapsedMs, getFilterName } from '../../../helpers/helpers';
+import {
+    formatElapsedMs,
+    getFilterName,
+    getServiceName,
+} from '../../../helpers/helpers';
 import { FILTERED_STATUS, FILTERED_STATUS_TO_META_MAP } from '../../../helpers/constants';
 import IconTooltip from './IconTooltip';

@@ -16,6 +20,7 @@ const ResponseCell = ({
    upstream,
    rule,
    filterId,
+    service_name,
 }) => {
    const { t } = useTranslation();
    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
@@ -52,7 +57,7 @@ const ResponseCell = ({
        install_settings_dns: upstream,
        elapsed: formattedElapsedMs,
        response_code: status,
-        filter,
+        ...(service_name ? { service_name: getServiceName(service_name) } : { filter }),
        rule_label: rule,
        response_table_header: renderResponses(response),
        original_response: renderResponses(originalResponse),
@@ -64,8 +69,22 @@ const ResponseCell = ({
            ...COMMON_CONTENT,
            filter: '',
        });
-    const detailedInfo = isBlocked ? filter : formattedElapsedMs;

+    const getDetailedInfo = (reason) => {
+        switch (reason) {
+            case FILTERED_STATUS.FILTERED_BLOCKED_SERVICE:
+                if (!service_name) {
+                    return formattedElapsedMs;
+                }
+                return getServiceName(service_name);
+            case FILTERED_STATUS.FILTERED_BLACK_LIST:
+                return filter;
+            default:
+                return formattedElapsedMs;
+        }
+    };
+
+    const detailedInfo = getDetailedInfo(reason);

    return <div className="logs__cell logs__cell--response" role="gridcell">
        <IconTooltip
@@ -96,6 +115,7 @@ ResponseCell.propTypes = {
    upstream: propTypes.string.isRequired,
    rule: propTypes.string,
    filterId: propTypes.number,
+    service_name: propTypes.string,
 };

 export default ResponseCell;
--- a/client/src/components/Logs/Cells/helpers/index.js
+++ b/client/src/components/Logs/Cells/helpers/index.js
@@ -1,19 +1,18 @@
-import { getIpMatchListStatus } from '../../../../helpers/helpers';
-import { BLOCK_ACTIONS, IP_MATCH_LIST_STATUS } from '../../../../helpers/constants';
+import i18next from 'i18next';

 export const BUTTON_PREFIX = 'btn_';

-export const getBlockClientInfo = (client, disallowed_clients) => {
-    const ipMatchListStatus = getIpMatchListStatus(client, disallowed_clients);
+export const getBlockClientInfo = (ip, disallowed, disallowed_rule) => {
+    const confirmMessage = disallowed
+        ? i18next.t('client_confirm_unblock', { ip: disallowed_rule })
+        : `${i18next.t('adg_will_drop_dns_queries')} ${i18next.t('client_confirm_block', { ip })}`;

-    const isNotFound = ipMatchListStatus === IP_MATCH_LIST_STATUS.NOT_FOUND;
-    const type = isNotFound ? BLOCK_ACTIONS.BLOCK : BLOCK_ACTIONS.UNBLOCK;
+    const buttonKey = i18next.t(disallowed ? 'allow_this_client' : 'disallow_this_client');
+    const isNotInAllowedList = disallowed && disallowed_rule === '';

-    const confirmMessage = isNotFound ? 'client_confirm_block' : 'client_confirm_unblock';
-    const buttonKey = isNotFound ? 'disallow_this_client' : 'allow_this_client';
    return {
        confirmMessage,
        buttonKey,
-        type,
+        isNotInAllowedList,
    };
 };
--- a/client/src/components/Logs/Cells/index.js
+++ b/client/src/components/Logs/Cells/index.js
@@ -11,6 +11,7 @@ import {
    formatTime,
    getBlockingClientName,
    getFilterName,
+    getServiceName,
    processContent,
 } from '../../../helpers/helpers';
 import {
@@ -31,6 +32,7 @@ import ClientCell from './ClientCell';
 import '../Logs.css';
 import { toggleClientBlock } from '../../../actions/access';
 import { getBlockClientInfo, BUTTON_PREFIX } from './helpers';
+import { updateLogs } from '../../../actions/queryLogs';

 const Row = memo(({
    style,
@@ -48,21 +50,19 @@ const Row = memo(({
    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
    const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);

-    const disallowed_clients = useSelector(
-        (state) => state.access.disallowed_clients,
-        shallowEqual,
-    );
-
    const clients = useSelector((state) => state.dashboard.clients);

    const onClick = () => {
-        if (!isSmallScreen) { return; }
+        if (!isSmallScreen) {
+            return;
+        }
        const {
            answer_dnssec,
            client,
            domain,
            elapsedMs,
            info,
+            info: { disallowed, disallowed_rule },
            reason,
            response,
            time,
@@ -74,6 +74,7 @@ const Row = memo(({
            rule,
            originalResponse,
            status,
+            service_name,
        } = rowProps;

        const hasTracker = !!tracker;
@@ -92,7 +93,7 @@ const Row = memo(({
        const isFiltered = checkFiltered(reason);

        const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
-                    || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
+                || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;

        const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
        const onToggleBlock = () => {
@@ -111,8 +112,8 @@ const Row = memo(({
        const {
            confirmMessage,
            buttonKey: blockingClientKey,
-            type: blockType,
-        } = getBlockClientInfo(client, disallowed_clients);
+            isNotInAllowedList,
+        } = getBlockClientInfo(client, disallowed, disallowed_rule);

        const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
        const clientNameBlockingFor = getBlockingClientName(clients, client);
@@ -121,18 +122,40 @@ const Row = memo(({
            dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
        };

-        const onBlockingClientClick = () => {
-            const message = `${blockType === BLOCK_ACTIONS.BLOCK ? t('adg_will_drop_dns_queries') : ''} ${t(confirmMessage, { ip: client })}`;
-            if (window.confirm(message)) {
-                dispatch(toggleClientBlock(blockType, client));
+        const onBlockingClientClick = async () => {
+            if (window.confirm(confirmMessage)) {
+                await dispatch(toggleClientBlock(client, disallowed, disallowed_rule));
+                await dispatch(updateLogs());
+                setModalOpened(false);
            }
        };

+        const blockButton = <button
+                className={classNames('title--border text-center button-action--arrow-option', { 'bg--danger': !isBlocked })}
+                onClick={onToggleBlock}>
+            {t(buttonType)}
+        </button>;
+
+        const blockForClientButton = <button
+                className='text-center font-weight-bold py-2 button-action--arrow-option'
+                onClick={onBlockingForClientClick}>
+            {t(blockingForClientKey)}
+        </button>;
+
+        const blockClientButton = <button
+                className='text-center font-weight-bold py-2 button-action--arrow-option'
+                onClick={onBlockingClientClick}
+                disabled={isNotInAllowedList}>
+            {t(blockingClientKey)}
+        </button>;
+
        const detailedData = {
            time_table_header: formatTime(time, LONG_TIME_FORMAT),
            date: formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS),
            encryption_status: isBlocked
                ? <div className="bg--danger">{requestStatus}</div> : requestStatus,
+            ...(FILTERED_STATUS.FILTERED_BLOCKED_SERVICE && service_name
+                && { service_name: getServiceName(service_name) }),
            domain,
            type_table_header: type,
            protocol,
@@ -140,12 +163,12 @@ const Row = memo(({
            table_name: tracker?.name,
            category_label: hasTracker && captitalizeWords(tracker.category),
            tracker_source: hasTracker && sourceData
-                        && <a
-                                href={sourceData.url}
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                className="link--green">{sourceData.name}
-                        </a>,
+                    && <a
+                            href={sourceData.url}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="link--green">{sourceData.name}
+                    </a>,
            response_details: 'title',
            install_settings_dns: upstream,
            elapsed: formattedElapsedMs,
@@ -162,12 +185,9 @@ const Row = memo(({
            source_label: source,
            validated_with_dnssec: dnssec_enabled ? Boolean(answer_dnssec) : false,
            original_response: originalResponse?.join('\n'),
-            [BUTTON_PREFIX + buttonType]: <div onClick={onToggleBlock}
-                                               className={classNames('title--border text-center', {
-                                                   'bg--danger': isBlocked,
-                                               })}>{t(buttonType)}</div>,
-            [BUTTON_PREFIX + blockingForClientKey]: <div onClick={onBlockingForClientClick} className='text-center font-weight-bold py-2'>{t(blockingForClientKey)}</div>,
-            [BUTTON_PREFIX + blockingClientKey]: <div onClick={onBlockingClientClick} className='text-center font-weight-bold py-2'>{t(blockingClientKey)}</div>,
+            [BUTTON_PREFIX + buttonType]: blockButton,
+            [BUTTON_PREFIX + blockingForClientKey]: blockForClientButton,
+            [BUTTON_PREFIX + blockingClientKey]: blockClientButton,
        };

        setDetailedDataCurrent(processContent(detailedData));
@@ -219,6 +239,7 @@ Row.propTypes = {
        rule: propTypes.string,
        originalResponse: propTypes.array,
        status: propTypes.string.isRequired,
+        service_name: propTypes.string,
    }).isRequired,
    isSmallScreen: propTypes.bool.isRequired,
    setDetailedDataCurrent: propTypes.func.isRequired,
--- a/client/src/components/Logs/Logs.css
+++ b/client/src/components/Logs/Logs.css
@@ -96,7 +96,7 @@
 }

 .bg--danger {
-    color: var(--danger);
+    color: var(--danger) !important;
 }

 .form-control--search {
@@ -238,6 +238,10 @@
    border: 0;
 }

+.button-action--small {
+    width: fit-content;
+}
+
 .button-action--unblock {
    background: var(--btn-unblock);
 }
@@ -293,7 +297,20 @@
    background: var(--btn-unblock-disabled);
 }

-.button-action--arrow-option:hover {
+.button-action--arrow-option {
+    background: transparent;
+    border: 0;
+    display: block;
+    width: 100%;
+    text-align: left;
+    color: inherit;
+}
+
+.button-action--arrow-option:disabled {
+    display: none;
+}
+
+.tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
    cursor: pointer;
    background: var(--gray-f3);
    overflow: hidden;
@@ -327,7 +344,7 @@
 }

 .logs__row--red {
-    background-color: var(--red);
+    background-color: var(--red) !important;
 }

 .logs__row--white {
--- a/client/src/components/Settings/Clients/Form.js
+++ b/client/src/components/Settings/Clients/Form.js
@@ -15,7 +15,7 @@ import { toggleAllServices } from '../../../helpers/helpers';
 import {
    renderInputField,
    renderGroupField,
-    renderCheckboxField,
+    CheckboxField,
    renderServiceField,
 } from '../../../helpers/form';
 import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
@@ -151,7 +151,7 @@ let Form = (props) => {
                        <Field
                            name={setting.name}
                            type="checkbox"
-                            component={renderCheckboxField}
+                            component={CheckboxField}
                            placeholder={t(setting.placeholder)}
                            disabled={
                                setting.name !== 'use_global_settings'
--- a/client/src/components/Settings/Dhcp/Interfaces.js
+++ b/client/src/components/Settings/Dhcp/Interfaces.js
@@ -46,7 +46,7 @@ const renderInterfaceValues = ({
    gateway_ip,
    hardware_address,
    ip_addresses,
-}) => <div className='d-flex align-items-end col-6'>
+}) => <div className='d-flex align-items-end dhcp__interfaces-info'>
    <ul className="list-unstyled m-0">
        {getInterfaceValues({
            gateway_ip,
@@ -77,12 +77,12 @@ const Interfaces = () => {
    return !processingInterfaces
            && interfaces
            && <>
-                <div className="row align-items-center pb-2">
-                    <div className="col-6">
+                <div className="row dhcp__interfaces">
+                    <div className="col col__dhcp">
                        <Field
                                name="interface_name"
                                component={renderSelectField}
-                                className="form-control custom-select"
+                                className="form-control custom-select pl-4 col-md"
                                validate={[validateRequiredValue]}
                                label='dhcp_interface_select'
                        >
--- a/client/src/components/Settings/Dhcp/index.css
+++ b/client/src/components/Settings/Dhcp/index.css
@@ -0,0 +1,47 @@
+.dhcp-form__button {
+    margin: 0 1rem;
+}
+
+.page-title--dhcp {
+    display: flex;
+    align-items: center;
+}
+
+.col__dhcp {
+    flex: 0 0 50%;
+    max-width: 50%;
+    padding-right: 0;
+}
+
+.dhcp__interfaces {
+    padding-bottom: 1rem;
+}
+
+.dhcp__interfaces-info {
+    padding: 0.5rem 0.75rem 0;
+    line-break: anywhere;
+}
+
+@media (max-width: 991.98px) {
+    .dhcp-form__button {
+        margin: 0.5rem 0;
+        display: block;
+    }
+
+    .page-title--dhcp {
+        flex-direction: column;
+        align-items: flex-start;
+        padding-bottom: 0.5rem;
+    }
+
+    .col__dhcp {
+        flex: 0 0 100%;
+        max-width: 100%;
+        padding-right: 0.75rem;
+    }
+
+    .dhcp__interfaces {
+        flex-direction: column;
+        padding-bottom: 0.5rem;
+    }
+}
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -31,6 +31,7 @@ import {
    calculateDhcpPlaceholdersIpv4,
    calculateDhcpPlaceholdersIpv6,
 } from '../../../helpers/helpers';
+import './index.css';

 const Dhcp = () => {
    const { t } = useTranslation();
@@ -114,7 +115,7 @@ const Dhcp = () => {
            .every(Boolean) || Object.values(v6)
            .every(Boolean));

-        const className = classNames('btn btn-sm mr-2', {
+        const className = classNames('btn btn-sm', {
            'btn-gray': enabled,
            'btn-outline-success': !enabled,
        });
@@ -141,7 +142,7 @@ const Dhcp = () => {
        </button>;
    };

-    const statusButtonClass = classNames('btn btn-sm mx-2', {
+    const statusButtonClass = classNames('btn btn-sm dhcp-form__button', {
        'btn-loading btn-primary': processingStatus,
        'btn-outline-primary': !processingStatus,
    });
@@ -171,28 +172,24 @@ const Dhcp = () => {
    const toggleDhcpButton = getToggleDhcpButton();

    return <>
-        <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')}>
-            <div className="page-title__actions">
-                <div className="mb-3">
-                    {toggleDhcpButton}
-                    <button
-                        type="button"
-                        className={statusButtonClass}
-                        onClick={onClick}
-                        disabled={enabled || !interface_name || processingConfig}
-                    >
-                        <Trans>check_dhcp_servers</Trans>
-                    </button>
-                    <button
-                        type="button"
-                        className='btn btn-sm mx-2 btn-outline-secondary'
-                        disabled={!enteredSomeValue || processingConfig}
-                        onClick={clear}
-                    >
-                        <Trans>reset_settings</Trans>
-                    </button>
-                </div>
-            </div>
+        <PageTitle title={t('dhcp_settings')} subtitle={t('dhcp_description')} containerClass="page-title--dhcp">
+            {toggleDhcpButton}
+            <button
+                    type="button"
+                    className={statusButtonClass}
+                    onClick={onClick}
+                    disabled={enabled || !interface_name || processingConfig}
+            >
+                <Trans>check_dhcp_servers</Trans>
+            </button>
+            <button
+                    type="button"
+                    className='btn btn-sm btn-outline-secondary'
+                    disabled={!enteredSomeValue || processingConfig}
+                    onClick={clear}
+            >
+                <Trans>reset_settings</Trans>
+            </button>
        </PageTitle>
        {!processing && !processingInterfaces
        && <>
--- a/client/src/components/Settings/Dns/Cache/Form.js
+++ b/client/src/components/Settings/Dns/Cache/Form.js
@@ -4,16 +4,15 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
 import { shallowEqual, useSelector } from 'react-redux';
 import { renderInputField, toNumber } from '../../../../helpers/form';
-import { validateRequiredValue } from '../../../../helpers/validators';
 import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
+import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';

-const getInputFields = (validateRequiredValue) => [
+const INPUTS_FIELDS = [
    {
        name: CACHE_CONFIG_FIELDS.cache_size,
        title: 'cache_size',
        description: 'cache_size_desc',
        placeholder: 'enter_cache_size',
-        validate: validateRequiredValue,
    },
    {
        name: CACHE_CONFIG_FIELDS.cache_ttl_min,
@@ -39,37 +38,34 @@ const Form = ({
        cache_ttl_max, cache_ttl_min,
    } = useSelector((state) => state.form[FORM_NAME.CACHE].values, shallowEqual);

-    const minExceedsMax = typeof cache_ttl_min === 'number'
-            && typeof cache_ttl_max === 'number'
-            && cache_ttl_min > cache_ttl_max;
-
-    const INPUTS_FIELDS = getInputFields(validateRequiredValue);
+    const minExceedsMax = cache_ttl_min > cache_ttl_max;

    return <form onSubmit={handleSubmit}>
        <div className="row">
            {INPUTS_FIELDS.map(({
                name, title, description, placeholder, validate, min = 0, max = UINT32_RANGE.MAX,
            }) => <div className="col-12" key={name}>
-                <div className="col-12 col-md-7 p-0">
-                    <div className="form__group form__group--settings">
-                        <label htmlFor={name}
-                               className="form__label form__label--with-desc">{t(title)}</label>
-                        <div className="form__desc form__desc--top">{t(description)}</div>
-                        <Field
-                            name={name}
-                            type="number"
-                            component={renderInputField}
-                            placeholder={t(placeholder)}
-                            disabled={processingSetConfig}
-                            normalize={toNumber}
-                            className="form-control"
-                            validate={validate}
-                            min={min}
-                            max={max}
-                        />
+                    <div className="col-12 col-md-7 p-0">
+                        <div className="form__group form__group--settings">
+                            <label htmlFor={name}
+                                   className="form__label form__label--with-desc">{t(title)}</label>
+                            <div className="form__desc form__desc--top">{t(description)}</div>
+                            <Field
+                                    name={name}
+                                    type="number"
+                                    component={renderInputField}
+                                    placeholder={t(placeholder)}
+                                    disabled={processingSetConfig}
+                                    className="form-control"
+                                    validate={validate}
+                                    normalizeOnBlur={replaceZeroWithEmptyString}
+                                    normalize={toNumber}
+                                    min={min}
+                                    max={max}
+                            />
+                        </div>
                    </div>
-                </div>
-            </div>)}
+                </div>)}
            {minExceedsMax
            && <span className="text-danger pl-3 pb-3">{t('ttl_cache_validation')}</span>}
        </div>
--- a/client/src/components/Settings/Dns/Cache/index.js
+++ b/client/src/components/Settings/Dns/Cache/index.js
@@ -1,12 +1,10 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { change } from 'redux-form';
 import Card from '../../../ui/Card';
 import Form from './Form';
 import { setDnsConfig } from '../../../../actions/dnsConfig';
-import { selectCompletedFields } from '../../../../helpers/helpers';
-import { CACHE_CONFIG_FIELDS, FORM_NAME } from '../../../../helpers/constants';
+import { replaceEmptyStringsWithZeroes, replaceZeroWithEmptyString } from '../../../../helpers/helpers';

 const CacheConfig = () => {
    const { t } = useTranslation();
@@ -16,16 +14,7 @@ const CacheConfig = () => {
    } = useSelector((state) => state.dnsConfig, shallowEqual);

    const handleFormSubmit = (values) => {
-        const completedFields = selectCompletedFields(values);
-
-        Object.entries(completedFields).forEach(([k, v]) => {
-            if ((k === CACHE_CONFIG_FIELDS.cache_ttl_min
-                    || k === CACHE_CONFIG_FIELDS.cache_ttl_max)
-                    && v === 0) {
-                dispatch(change(FORM_NAME.CACHE, k, ''));
-            }
-        });
-
+        const completedFields = replaceEmptyStringsWithZeroes(values);
        dispatch(setDnsConfig(completedFields));
    };

@@ -39,9 +28,9 @@ const CacheConfig = () => {
            <div className="form">
                <Form
                    initialValues={{
-                        cache_size,
-                        cache_ttl_max,
-                        cache_ttl_min,
+                        cache_size: replaceZeroWithEmptyString(cache_size),
+                        cache_ttl_max: replaceZeroWithEmptyString(cache_ttl_max),
+                        cache_ttl_min: replaceZeroWithEmptyString(cache_ttl_min),
                    }}
                    onSubmit={handleFormSubmit}
                />
--- a/client/src/components/Settings/Dns/Config/Form.js
+++ b/client/src/components/Settings/Dns/Config/Form.js
@@ -6,7 +6,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import {
    renderInputField,
    renderRadioField,
-    renderCheckboxField,
+    CheckboxField,
    toNumber,
 } from '../../../../helpers/form';
 import {
@@ -97,7 +97,7 @@ const Form = ({
                    <Field
                        name={name}
                        type="checkbox"
-                        component={renderCheckboxField}
+                        component={CheckboxField}
                        placeholder={t(placeholder)}
                        disabled={processing}
                        subtitle={t(subtitle)}
--- a/client/src/components/Settings/Dns/Upstream/Examples.js
+++ b/client/src/components/Settings/Dns/Upstream/Examples.js
@@ -1,25 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
+import { COMMENT_LINE_DEFAULT_TOKEN } from '../../../../helpers/constants';

 const Examples = (props) => (
    <div className="list leading-loose">
-        <p>
-            <Trans
-                components={[
-                    <a
-                        href="https://kb.adguard.com/general/dns-providers"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        key="0"
-                    >
-                        DNS providers
-                    </a>,
-                ]}
-            >
-                dns_providers
-            </Trans>
-        </p>
        <Trans>examples_title</Trans>:
        <ol className="leading-loose">
            <li>
@@ -141,6 +126,12 @@ const Examples = (props) => (
                    </Trans>
                </span>
            </li>
+            <li>
+                <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code> –&nbsp;
+                <span>
+                    <Trans>example_upstream_comment</Trans>
+                </span>
+            </li>
        </ol>
    </div>
 );
--- a/client/src/components/Settings/Dns/Upstream/Form.js
+++ b/client/src/components/Settings/Dns/Upstream/Form.js
@@ -1,43 +1,114 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
 import classnames from 'classnames';
-
 import Examples from './Examples';
 import { renderRadioField, renderTextareaField } from '../../../../helpers/form';
-import { DNS_REQUEST_OPTIONS, FORM_NAME, UPSTREAM_CONFIGURATION_WIKI_LINK } from '../../../../helpers/constants';
-import { testUpstream } from '../../../../actions';
-import { removeEmptyLines } from '../../../../helpers/helpers';
+import {
+    DNS_REQUEST_OPTIONS,
+    FORM_NAME,
+    isFirefox,
+    UPSTREAM_CONFIGURATION_WIKI_LINK,
+} from '../../../../helpers/constants';
+import { testUpstreamWithFormValues } from '../../../../actions';
+import { removeEmptyLines, trimLinesAndRemoveEmpty } from '../../../../helpers/helpers';
+import { getTextareaCommentsHighlight, syncScroll } from '../../../../helpers/highlightTextareaComments';
+import '../../../ui/texareaCommentsHighlight.css';

 const UPSTREAM_DNS_NAME = 'upstream_dns';
+const UPSTREAM_MODE_NAME = 'upstream_mode';

-const Title = () => {
-    const components = {
-        a: <a href={UPSTREAM_CONFIGURATION_WIKI_LINK} target="_blank"
-              rel="noopener noreferrer" />,
-    };
+const renderField = ({
+    name, component, type, className, placeholder,
+    subtitle, value, normalizeOnBlur, containerClass, onScroll,
+}) => {
+    const { t } = useTranslation();
+    const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
+    const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);

-    return <label className="form__label" htmlFor={UPSTREAM_DNS_NAME}>
-        <Trans components={components}>upstream_dns_help</Trans>
-    </label>;
+    return <div
+            key={placeholder}
+            className={classnames('col-12 mb-4', containerClass)}
+    >
+        <Field
+                id={name}
+                value={value}
+                name={name}
+                component={component}
+                type={type}
+                className={className}
+                placeholder={t(placeholder)}
+                subtitle={t(subtitle)}
+                disabled={processingSetConfig || processingTestUpstream}
+                normalizeOnBlur={normalizeOnBlur}
+                onScroll={onScroll}
+        />
+    </div>;
 };

-const getInputFields = (upstream_dns_file) => [
+renderField.propTypes = {
+    name: PropTypes.string.isRequired,
+    component: PropTypes.element.isRequired,
+    type: PropTypes.string.isRequired,
+    className: PropTypes.string,
+    placeholder: PropTypes.string.isRequired,
+    subtitle: PropTypes.string,
+    value: PropTypes.string,
+    normalizeOnBlur: PropTypes.func,
+    containerClass: PropTypes.string,
+    onScroll: PropTypes.func,
+};
+
+const renderTextareaWithHighlightField = (props) => {
+    const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
+    const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
+    const ref = useRef(null);
+
+    const onScroll = (e) => syncScroll(e, ref);
+
+    return <>
+        {renderTextareaField({
+            ...props,
+            disabled: !!upstream_dns_file,
+            onScroll,
+            normalizeOnBlur: trimLinesAndRemoveEmpty,
+        })}
+        {getTextareaCommentsHighlight(ref, upstream_dns)}
+    </>;
+};
+
+renderTextareaWithHighlightField.propTypes = {
+    className: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    id: PropTypes.string.isRequired,
+    input: PropTypes.object,
+    meta: PropTypes.object,
+    normalizeOnBlur: PropTypes.func,
+    onScroll: PropTypes.func,
+    placeholder: PropTypes.string.isRequired,
+    subtitle: PropTypes.string.isRequired,
+    type: PropTypes.string.isRequired,
+};
+
+const INPUT_FIELDS = [
    {
-        getTitle: Title,
        name: UPSTREAM_DNS_NAME,
        type: 'text',
-        value: 'test',
-        component: renderTextareaField,
-        className: 'form-control form-control--textarea font-monospace',
+        component: renderTextareaWithHighlightField,
+        className: classnames('form-control form-control--textarea font-monospace text-input', {
+            'text-input--larger': isFirefox,
+        }),
+        containerClass: classnames('text-edit-container', {
+            'mb-4': !isFirefox,
+            'mb-6': isFirefox,
+        }),
        placeholder: 'upstream_dns',
        normalizeOnBlur: removeEmptyLines,
-        disabled: !!upstream_dns_file,
    },
    {
-        name: 'upstream_mode',
+        name: UPSTREAM_MODE_NAME,
        type: 'radio',
        value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
        component: renderRadioField,
@@ -45,7 +116,7 @@ const getInputFields = (upstream_dns_file) => [
        placeholder: 'load_balancing',
    },
    {
-        name: 'upstream_mode',
+        name: UPSTREAM_MODE_NAME,
        type: 'radio',
        value: DNS_REQUEST_OPTIONS.PARALLEL,
        component: renderRadioField,
@@ -53,7 +124,7 @@ const getInputFields = (upstream_dns_file) => [
        placeholder: 'parallel_requests',
    },
    {
-        name: 'upstream_mode',
+        name: UPSTREAM_MODE_NAME,
        type: 'radio',
        value: DNS_REQUEST_OPTIONS.FASTEST_ADDR,
        component: renderRadioField,
@@ -68,44 +139,39 @@ const Form = ({
    const dispatch = useDispatch();
    const { t } = useTranslation();
    const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
-    const bootstrap_dns = useSelector(
-        (store) => store.form[FORM_NAME.UPSTREAM].values.bootstrap_dns,
-    );
-    const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
    const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
    const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);

-    const handleUpstreamTest = () => dispatch(testUpstream({
-        upstream_dns,
-        bootstrap_dns,
-    }));
+    const handleUpstreamTest = () => dispatch(testUpstreamWithFormValues());

    const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
        'btn-loading': processingTestUpstream,
    });

-    const INPUT_FIELDS = getInputFields(upstream_dns_file);
+    const components = {
+        a: <a href={UPSTREAM_CONFIGURATION_WIKI_LINK} target="_blank"
+              rel="noopener noreferrer" />,
+    };

-    return <form onSubmit={handleSubmit}>
+    return <form onSubmit={handleSubmit} className="form--upstream">
        <div className="row">
-            {INPUT_FIELDS.map(({
-                name, component, type, className, placeholder,
-                getTitle, subtitle, disabled, value, normalizeOnBlur,
-            }) => <div className="col-12 mb-4" key={placeholder}>
-                {typeof getTitle === 'function' && getTitle()}
-                <Field
-                    id={name}
-                    value={value}
-                    name={name}
-                    component={component}
-                    type={type}
-                    className={className}
-                    placeholder={t(placeholder)}
-                    subtitle={t(subtitle)}
-                    disabled={processingSetConfig || processingTestUpstream || disabled}
-                    normalizeOnBlur={normalizeOnBlur}
-                />
-            </div>)}
+            <label className="col form__label" htmlFor={UPSTREAM_DNS_NAME}>
+                <Trans components={components}>upstream_dns_help</Trans>
+                {' '}
+                <Trans components={[
+                    <a
+                            href="https://kb.adguard.com/general/dns-providers"
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            key="0"
+                    >
+                        DNS providers
+                    </a>,
+                ]}>
+                    dns_providers
+                </Trans>
+            </label>
+            {INPUT_FIELDS.map(renderField)}
            <div className="col-12">
                <Examples />
                <hr />
--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -7,7 +7,7 @@ import flow from 'lodash/flow';

 import {
    renderInputField,
-    renderCheckboxField,
+    CheckboxField,
    renderRadioField,
    toNumber,
 } from '../../../helpers/form';
@@ -101,7 +101,7 @@ let Form = (props) => {
                        <Field
                            name="enabled"
                            type="checkbox"
-                            component={renderCheckboxField}
+                            component={CheckboxField}
                            placeholder={t('encryption_enable')}
                            onChange={handleChange}
                        />
@@ -138,7 +138,7 @@ let Form = (props) => {
                        <Field
                            name="force_https"
                            type="checkbox"
-                            component={renderCheckboxField}
+                            component={CheckboxField}
                            placeholder={t('encryption_redirect')}
                            onChange={handleChange}
                            disabled={!isEnabled}
--- a/client/src/components/Settings/FiltersConfig/Form.js
+++ b/client/src/components/Settings/FiltersConfig/Form.js
@@ -4,8 +4,12 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';

-import { renderCheckboxField, toNumber } from '../../../helpers/form';
-import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants';
+import { CheckboxField, toNumber } from '../../../helpers/form';
+import {
+    FILTERS_INTERVALS_HOURS,
+    FILTERS_LINK,
+    FORM_NAME,
+} from '../../../helpers/constants';

 const getTitleForInterval = (interval, t) => {
    if (interval === 0) {
@@ -40,6 +44,10 @@ const Form = (props) => {
        handleSubmit, handleChange, processing, t,
    } = props;

+    const components = {
+        a: <a href={FILTERS_LINK} rel="noopener noreferrer" />,
+    };
+
    return (
        <form onSubmit={handleSubmit}>
            <div className="row">
@@ -49,9 +57,11 @@ const Form = (props) => {
                            name="enabled"
                            type="checkbox"
                            modifier="checkbox--settings"
-                            component={renderCheckboxField}
+                            component={CheckboxField}
                            placeholder={t('block_domain_use_filters_and_hosts')}
-                            subtitle={t('filters_block_toggle_hint')}
+                            subtitle={<Trans components={components}>
+                                filters_block_toggle_hint
+                            </Trans>}
                            onChange={handleChange}
                            disabled={processing}
                        />
--- a/client/src/components/Settings/FormButton.css
+++ b/client/src/components/Settings/FormButton.css
@@ -0,0 +1,11 @@
+.form__button {
+    margin-left: 1.5rem;
+}
+
+@media (max-width: 500px) {
+    .form__button {
+        margin-left: 0;
+        margin-top: 1rem;
+        display: block;
+    }
+}
--- a/client/src/components/Settings/LogsConfig/Form.js
+++ b/client/src/components/Settings/LogsConfig/Form.js
@@ -4,8 +4,9 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';

-import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
+import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
 import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
+import '../FormButton.css';

 const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
    const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
@@ -35,7 +36,7 @@ const Form = (props) => {
                <Field
                    name="enabled"
                    type="checkbox"
-                    component={renderCheckboxField}
+                    component={CheckboxField}
                    placeholder={t('query_log_enable')}
                    disabled={processing}
                />
@@ -44,7 +45,7 @@ const Form = (props) => {
                <Field
                    name="anonymize_client_ip"
                    type="checkbox"
-                    component={renderCheckboxField}
+                    component={CheckboxField}
                    placeholder={t('anonymize_client_ip')}
                    subtitle={t('anonymize_client_ip_desc')}
                    disabled={processing}
@@ -68,7 +69,7 @@ const Form = (props) => {
                </button>
                <button
                    type="button"
-                    className="btn btn-outline-secondary btn-standard ml-5"
+                    className="btn btn-outline-secondary btn-standard form__button"
                    onClick={() => handleClear()}
                    disabled={processingClear}
                >
--- a/client/src/components/Settings/StatsConfig/Form.js
+++ b/client/src/components/Settings/StatsConfig/Form.js
@@ -6,6 +6,7 @@ import flow from 'lodash/flow';

 import { renderRadioField, toNumber } from '../../../helpers/form';
 import { FORM_NAME, STATS_INTERVALS_DAYS } from '../../../helpers/constants';
+import '../FormButton.css';

 const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
    const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
@@ -52,7 +53,7 @@ const Form = (props) => {
                </button>
                <button
                    type="button"
-                    className="btn btn-outline-secondary btn-standard ml-5"
+                    className="btn btn-outline-secondary btn-standard form__button"
                    onClick={() => handleReset()}
                    disabled={processingReset}
                >
--- a/client/src/components/ui/Guide.js
+++ b/client/src/components/ui/Guide.js
@@ -1,10 +1,43 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Trans, withTranslation } from 'react-i18next';
-
+import { Trans, useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 import Tabs from './Tabs';
 import Icons from './Icons';

+const MOBILE_CONFIG_LINKS = {
+    DOT: '/apple/dot.mobileconfig',
+    DOH: '/apple/doh.mobileconfig',
+};
+
+const renderMobileconfigInfo = ({ label, components }) => <li key={label}>
+    <Trans components={components}>{label}</Trans>
+    <ul>
+        <li>
+            <a href={MOBILE_CONFIG_LINKS.DOT} download>{i18next.t('download_mobileconfig_dot')}</a>
+        </li>
+        <li>
+            <a href={MOBILE_CONFIG_LINKS.DOH} download>{i18next.t('download_mobileconfig_doh')}</a>
+        </li>
+    </ul>
+</li>;
+
+const renderLi = ({ label, components }) => <li key={label}>
+    <Trans components={components?.map((props) => {
+        if (React.isValidElement(props)) {
+            return props;
+        }
+        const {
+            // eslint-disable-next-line react/prop-types
+            href, target = '_blank', rel = 'noopener noreferrer', key = '0',
+        } = props;
+
+        return <a href={href} target={target} rel={rel} key={key}>link</a>;
+    })}>
+        {label}
+    </Trans>
+</li>;
+
 const dnsPrivacyList = [{
    title: 'Android',
    list: [
@@ -36,6 +69,23 @@ const dnsPrivacyList = [{
 {
    title: 'iOS',
    list: [
+        {
+            label: 'setup_dns_privacy_ios_2',
+            components: [
+                {
+                    key: 0,
+                    href: 'https://adguard.com/adguard-ios/overview.html',
+                },
+                <code key="1">text</code>,
+            ],
+        },
+        {
+            label: 'setup_dns_privacy_4',
+            components: {
+                highlight: <code />,
+            },
+            renderComponent: renderMobileconfigInfo,
+        },
        {
            label: 'setup_dns_privacy_ios_1',
            components: [
@@ -51,16 +101,6 @@ const dnsPrivacyList = [{

            ],
        },
-        {
-            label: 'setup_dns_privacy_ios_2',
-            components: [
-                {
-                    key: 0,
-                    href: 'https://adguard.com/adguard-ios/overview.html',
-                },
-                    <code key="1">text</code>,
-            ],
-        },
    ],
 },
 {
@@ -116,26 +156,15 @@ const dnsPrivacyList = [{
 },
 ];

-const renderDnsPrivacyList = ({ title, list }) => <div className="tab__paragraph">
+const renderDnsPrivacyList = ({ title, list }) => <div className="tab__paragraph" key={title}>
    <strong><Trans>{title}</Trans></strong>
-    <ul>{list.map(({ label, components }) => <li key={label}>
-        <Trans
-            components={components?.map((props) => {
-                if (React.isValidElement(props)) {
-                    return props;
-                }
-                const {
-                    // eslint-disable-next-line react/prop-types
-                    href, target = '_blank', rel = 'noopener noreferrer', key = '0',
-                } = props;
-
-                return <a
-                    href={href} target={target}
-                    rel={rel} key={key}>link</a>;
-            })}>
-            {label}
-        </Trans>
-    </li>)}
+    <ul>{list.map(
+        ({
+            label,
+            components,
+            renderComponent = renderLi,
+        }) => renderComponent({ label, components }),
+    )}
    </ul>
 </div>;

@@ -195,8 +224,8 @@ const getTabs = ({
    },
    dns_privacy: {
        title: 'dns_privacy',
-        // eslint-disable-next-line react/display-name
-        getTitle: () => <div label="dns_privacy" title={t('dns_privacy')}>
+        getTitle: function Title() {
+            return <div label="dns_privacy" title={t('dns_privacy')}>
            <div className="tab__text">
                {tlsAddress?.length > 0 && (
                    <div className="tab__paragraph">
@@ -251,14 +280,15 @@ const getTabs = ({
                        {dnsPrivacyList.map(renderDnsPrivacyList)}
                    </>}
            </div>
-        </div>,
+        </div>;
+        },
    },
 });

-const renderContent = ({ title, list, getTitle }, t) => <div key={title} label={t(title)}>
-    <div className="tab__title">{t(title)}</div>
+const renderContent = ({ title, list, getTitle }) => <div key={title} label={i18next.t(title)}>
+    <div className="tab__title">{i18next.t(title)}</div>
    <div className="tab__text">
-        {typeof getTitle === 'function' && getTitle()}
+        {getTitle?.()}
        {list
        && <ol>{list.map((item) => <li key={item}>
            <Trans>{item}</Trans>
@@ -267,9 +297,10 @@ const renderContent = ({ title, list, getTitle }, t) => <div key={title} label={
    </div>
 </div>;

-const Guide = ({ dnsAddresses, t }) => {
-    const tlsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('tls://'))) || '';
-    const httpsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('https://'))) || '';
+const Guide = ({ dnsAddresses }) => {
+    const { t } = useTranslation();
+    const tlsAddress = dnsAddresses?.filter((item) => item.includes('tls://')) ?? '';
+    const httpsAddress = dnsAddresses?.filter((item) => item.includes('https://')) ?? '';
    const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;

    const [activeTabLabel, setActiveTabLabel] = useState('Router');
@@ -281,7 +312,7 @@ const Guide = ({ dnsAddresses, t }) => {
        t,
    });

-    const activeTab = renderContent(tabs[activeTabLabel], t);
+    const activeTab = renderContent(tabs[activeTabLabel]);

    return (
        <div>
@@ -298,12 +329,12 @@ Guide.defaultProps = {

 Guide.propTypes = {
    dnsAddresses: PropTypes.array,
-    t: PropTypes.func.isRequired,
 };

 renderDnsPrivacyList.propTypes = {
    title: PropTypes.string.isRequired,
    list: PropTypes.array.isRequired,
+    renderList: PropTypes.func,
 };

 renderContent.propTypes = {
@@ -312,4 +343,11 @@ renderContent.propTypes = {
    getTitle: PropTypes.func,
 };

-export default withTranslation()(Guide);
+renderLi.propTypes = {
+    label: PropTypes.string,
+    components: PropTypes.string,
+};
+
+renderMobileconfigInfo.propTypes = renderLi.propTypes;
+
+export default Guide;
--- a/client/src/components/ui/Line.js
+++ b/client/src/components/ui/Line.js
@@ -8,7 +8,7 @@ const Line = ({ data, color }) => data
    && <ResponsiveLine
        data={data}
        margin={{
-            top: 15,
+            top: data[0].data.every(({ y }) => y === 0) ? 62 : 15,
            right: 0,
            bottom: 1,
            left: 20,
--- a/client/src/components/ui/PageTitle.css
+++ b/client/src/components/ui/PageTitle.css
@@ -36,15 +36,3 @@
    font-size: 36px;
    line-height: 46px;
 }
-
-.page-title__actions {
-    display: block;
-}
-
-@media screen and (min-width: 768px) {
-    .page-title__actions {
-        display: inline-block;
-        vertical-align: baseline;
-        margin-left: 20px;
-    }
-}
--- a/client/src/components/ui/PageTitle.js
+++ b/client/src/components/ui/PageTitle.js
@@ -3,24 +3,23 @@ import PropTypes from 'prop-types';

 import './PageTitle.css';

-const PageTitle = ({ title, subtitle, children }) => (
-    <div className="page-header">
-        <h1 className="page-title">
-            {title}
-            {children}
-        </h1>
-        {subtitle && (
-            <div className="page-subtitle">
-                {subtitle}
-            </div>
-        )}
+const PageTitle = ({
+    title, subtitle, children, containerClass,
+}) => <div className="page-header">
+    <div className={containerClass}>
+        <h1 className="page-title pr-2">{title}</h1>
+        {children}
    </div>
-);
+    {subtitle && <div className="page-subtitle">
+        {subtitle}
+    </div>}
+</div>;

 PageTitle.propTypes = {
    title: PropTypes.string.isRequired,
    subtitle: PropTypes.string,
    children: PropTypes.node,
+    containerClass: PropTypes.string,
 };

 export default PageTitle;
--- a/client/src/components/ui/texareaCommentsHighlight.css
+++ b/client/src/components/ui/texareaCommentsHighlight.css
@@ -0,0 +1,52 @@
+.text-edit-container {
+    position: relative;
+    height: 10rem;
+}
+
+.text-input,
+.text-output {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    padding: 1rem;
+    background: transparent;
+    white-space: pre-wrap;
+    line-height: 1.5rem;
+    word-wrap: break-word;
+    font-size: 0.9375rem;
+    margin: 0;
+}
+
+.form--upstream .text-input,
+.form--upstream .text-output {
+    width: 98%;
+    left: 1%;
+}
+
+.text-input {
+    opacity: 1;
+    resize: none;
+    height: 10rem;
+}
+
+.text-input--larger {
+    height: 11rem;
+}
+
+.text-input--largest {
+    height: 16rem;
+}
+
+.text-output {
+    pointer-events: none;
+    z-index: 3;
+    overflow-y: auto;
+    background: transparent;
+    border: 1px solid transparent;
+}
+
+.text-transparent {
+    color: transparent;
+}
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -53,6 +53,7 @@ export const REPOSITORY = {
 export const PRIVACY_POLICY_LINK = 'https://adguard.com/privacy/home.html';
 export const PORT_53_FAQ_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/FAQ#bindinuse';
 export const UPSTREAM_CONFIGURATION_WIKI_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams';
+export const FILTERS_LINK = '#filters';

 export const GETTING_STARTED_LINK = 'https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update';

@@ -280,6 +281,11 @@ export const SERVICES = [
    },
 ];

+export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
+    acc[id] = name;
+    return acc;
+}, {});
+
 export const ENCRYPTION_SOURCE = {
    PATH: 'path',
    CONTENT: 'content',
@@ -351,6 +357,10 @@ export const RESPONSE_FILTER = {
        QUERY: 'blocked',
        LABEL: 'show_blocked_responses',
    },
+    BLOCKED_SERVICES: {
+        QUERY: 'blocked_services',
+        LABEL: 'blocked_services',
+    },
    BLOCKED_THREATS: {
        QUERY: 'blocked_safebrowsing',
        LABEL: 'blocked_threats',
@@ -397,7 +407,7 @@ export const FILTERED_STATUS_TO_META_MAP = {
        COLOR: QUERY_STATUS_COLORS.WHITE,
    },
    [FILTERED_STATUS.FILTERED_BLOCKED_SERVICE]: {
-        LABEL: RESPONSE_FILTER.BLOCKED.LABEL,
+        LABEL: 'blocked_service',
        COLOR: QUERY_STATUS_COLORS.RED,
    },
    [FILTERED_STATUS.FILTERED_SAFE_SEARCH]: {
@@ -470,12 +480,6 @@ export const DNS_REQUEST_OPTIONS = {
    LOAD_BALANCING: '',
 };

-export const IP_MATCH_LIST_STATUS = {
-    NOT_FOUND: 'NOT_FOUND', // not found in the list
-    EXACT: 'EXACT', // found exact match (including the match of short and long forms)
-    CIDR: 'CIDR', // the ip is in the specified CIDR range
-};
-
 export const DHCP_FORM_NAMES = {
    DHCPv4: 'dhcpv4',
    DHCPv6: 'dhcpv6',
@@ -568,3 +572,6 @@ export const CACHE_CONFIG_FIELDS = {
    cache_ttl_min: 'cache_ttl_min',
    cache_ttl_max: 'cache_ttl_max',
 };
+
+export const isFirefox = navigator.userAgent.indexOf('Firefox') !== -1;
+export const COMMENT_LINE_DEFAULT_TOKEN = '#';
--- a/client/src/helpers/form.js
+++ b/client/src/helpers/form.js
@@ -1,13 +1,12 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Trans } from 'react-i18next';
-import classNames from 'classnames';
 import { createOnBlurHandler } from './helpers';
 import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';

 export const renderField = (props, elementType) => {
    const {
-        input, id, className, placeholder, type, disabled, normalizeOnBlur,
+        input, id, className, placeholder, type, disabled, normalizeOnBlur, onScroll,
        autoComplete, meta: { touched, error }, min, max, step,
    } = props;

@@ -25,6 +24,7 @@ export const renderField = (props, elementType) => {
        max,
        step,
        onBlur,
+        onScroll,
    });

    return (
@@ -48,6 +48,7 @@ renderField.propTypes = {
    min: PropTypes.number,
    max: PropTypes.number,
    step: PropTypes.number,
+    onScroll: PropTypes.func,
    meta: PropTypes.shape({
        touched: PropTypes.bool,
        error: PropTypes.string,
@@ -155,31 +156,24 @@ renderRadioField.propTypes = {
    }).isRequired,
 };

-export const renderCheckboxField = ({
+export const CheckboxField = ({
    input,
    placeholder,
    subtitle,
    disabled,
    onClick,
    modifier = 'checkbox--form',
-    checked,
    meta: { touched, error },
 }) => <>
    <label className={`checkbox ${modifier}`} onClick={onClick}>
        <span className="checkbox__marker" />
-        <input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
-               checked={input.checked || checked} />
+        <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
        <span className="checkbox__label">
-                        <span className="checkbox__label-text checkbox__label-text--long">
-                            <span className="checkbox__label-title">{placeholder}</span>
-                            {subtitle
-                            && <span
-                                className="checkbox__label-subtitle"
-                                dangerouslySetInnerHTML={{ __html: subtitle }}
-
-                            />}
-                        </span>
-                    </span>
+            <span className="checkbox__label-text checkbox__label-text--long">
+                <span className="checkbox__label-title">{placeholder}</span>
+                {subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
+            </span>
+        </span>
    </label>
    {!disabled
    && touched
@@ -187,10 +181,10 @@ export const renderCheckboxField = ({
    && <span className="form__message form__message--error"><Trans>{error}</Trans></span>}
 </>;

-renderCheckboxField.propTypes = {
+CheckboxField.propTypes = {
    input: PropTypes.object.isRequired,
    placeholder: PropTypes.string,
-    subtitle: PropTypes.string,
+    subtitle: PropTypes.node,
    disabled: PropTypes.bool,
    onClick: PropTypes.func,
    modifier: PropTypes.string,
@@ -208,13 +202,10 @@ export const renderSelectField = ({
    label,
 }) => {
    const showWarning = touched && error;
-    const selectClass = classNames('form-control custom-select', {
-        'select--no-warning': !showWarning,
-    });

    return <>
        {label && <label><Trans>{label}</Trans></label>}
-        <select {...input} className={selectClass}>{children}</select>
+        <select {...input} className='form-control custom-select'>{children}</select>
        {showWarning
        && <span className="form__message form__message--error form__message--left-pad"><Trans>{error}</Trans></span>}
    </>;
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -16,6 +16,7 @@ import { getTrackerData } from './trackers/trackers';
 import {
    ADDRESS_TYPES,
    CHECK_TIMEOUT,
+    COMMENT_LINE_DEFAULT_TOKEN,
    CUSTOM_FILTERING_RULES_ID,
    DEFAULT_DATE_FORMAT_OPTIONS,
    DEFAULT_LANGUAGE,
@@ -24,7 +25,7 @@ import {
    DHCP_VALUES_PLACEHOLDERS,
    FILTERED,
    FILTERED_STATUS,
-    IP_MATCH_LIST_STATUS,
+    SERVICES_ID_NAME_MAP,
    STANDARD_DNS_PORT,
    STANDARD_HTTPS_PORT,
    STANDARD_WEB_PORT,
@@ -46,12 +47,8 @@ export const formatTime = (time, options = DEFAULT_TIME_FORMAT) => {
 * @returns {string} Returns the date and time in the specified format
 */
 export const formatDateTime = (dateTime, options = DEFAULT_DATE_FORMAT_OPTIONS) => {
-    const { language } = navigator;
-    const currentLanguage = (language.slice(0, 2) === 'en' || !language) ? 'en-GB' : language;
-
    const parsedTime = new Date(dateTime);
-
-    return parsedTime.toLocaleString(currentLanguage, options);
+    return parsedTime.toLocaleString(navigator.language, options);
 };

 /**
@@ -131,16 +128,14 @@ export const normalizeTopStats = (stats) => (
    }))
 );

-export const addClientInfo = (data, clients, param) => (
-    data.map((row) => {
-        const clientIp = row[param];
-        const info = clients.find((item) => item[clientIp]) || '';
-        return {
-            ...row,
-            info: info?.[clientIp] ?? '',
-        };
-    })
-);
+export const addClientInfo = (data, clients, param) => data.map((row) => {
+    const clientIp = row[param];
+    const info = clients.find((item) => item[clientIp]) || '';
+    return {
+        ...row,
+        info: info?.[clientIp] ?? '',
+    };
+});

 export const normalizeFilters = (filters) => (
    filters ? filters.map((filter) => {
@@ -316,6 +311,12 @@ export const trimMultilineString = (text) => splitByNewLine(text)
 export const removeEmptyLines = (text) => splitByNewLine(text)
    .join('\n');

+/**
+ * @param {string} input
+ * @returns {string}
+ */
+export const trimLinesAndRemoveEmpty = (input) => input.split('\n').map((line) => line.trim()).filter(Boolean).join('\n');
+
 /**
 * Normalizes the topClients array
 *
@@ -522,75 +523,6 @@ export const isIpInCidr = (ip, cidr) => {
    }
 };

-/**
- * The purpose of this method is to quickly check
- * if this IP can possibly be in the specified CIDR range.
- *
- * @param ip {string}
- * @param listItem {string}
- * @returns {boolean}
- */
-const isIpQuickMatchCIDR = (ip, listItem) => {
-    const ipv6 = ip.indexOf(':') !== -1;
-    const cidrIpv6 = listItem.indexOf(':') !== -1;
-    if (ipv6 !== cidrIpv6) {
-        // CIDR is for a different IP type
-        return false;
-    }
-
-    if (cidrIpv6) {
-        // We don't do quick check for IPv6 addresses
-        return true;
-    }
-
-    const idx = listItem.indexOf('/');
-    if (idx === -1) {
-        // Not a CIDR, return false immediately
-        return false;
-    }
-
-    const cidrIp = listItem.substring(0, idx);
-    const cidrRange = parseInt(listItem.substring(idx + 1), 10);
-    if (Number.isNaN(cidrRange)) {
-        // Not a valid CIDR
-        return false;
-    }
-
-    const parts = cidrIp.split('.');
-    if (parts.length !== 4) {
-        // Invalid IP, return immediately
-        return false;
-    }
-
-    // Now depending on the range we check if the IP can possibly be in that range
-    if (cidrRange < 8) {
-        // Use the slow approach
-        return true;
-    }
-
-    if (cidrRange < 16) {
-        // Check the first part
-        // Example: 0.0.0.0/8 matches 0.*.*.*
-        return ip.indexOf(`${parts[0]}.`) === 0;
-    }
-
-    if (cidrRange < 24) {
-        // Check the first two parts
-        // Example: 0.0.0.0/16 matches 0.0.*.*
-        return ip.indexOf(`${parts[0]}.${parts[1]}.`) === 0;
-    }
-
-    if (cidrRange <= 32) {
-        // Check the first two parts
-        // Example: 0.0.0.0/16 matches 0.0.*.*
-        return ip.indexOf(`${parts[0]}.${parts[1]}.${parts[2]}.`) === 0;
-    }
-
-    // range for IPv4 CIDR cannot be more than 32
-    // no need to check further, this CIDR is invalid
-    return false;
-};
-
 /**
 *
 * @param ipOrCidr
@@ -614,50 +546,6 @@ export const findAddressType = (address) => {
    }
 };

-/**
- * @param ip {string}
- * @param list {string}
- * @returns {'EXACT' | 'CIDR' | 'NOT_FOND'}
- */
-export const getIpMatchListStatus = (ip, list) => {
-    if (!ip || !list) {
-        return IP_MATCH_LIST_STATUS.NOT_FOUND;
-    }
-
-    const listArr = list.trim()
-        .split('\n');
-
-    try {
-        for (let i = 0; i < listArr.length; i += 1) {
-            const listItem = listArr[i];
-
-            if (ip === listItem.trim()) {
-                return IP_MATCH_LIST_STATUS.EXACT;
-            }
-
-            // Using ipaddr.js is quite slow so we first do a quick check
-            // to see if it's possible that this IP may be in the specified CIDR range
-            if (isIpQuickMatchCIDR(ip, listItem)) {
-                const parsedIp = ipaddr.parse(ip);
-                const isItemAnIp = ipaddr.isValid(listItem);
-                const parsedItem = isItemAnIp ? ipaddr.parse(listItem) : ipaddr.parseCIDR(listItem);
-
-                if (isItemAnIp && parsedIp.toString() === parsedItem.toString()) {
-                    return IP_MATCH_LIST_STATUS.EXACT;
-                }
-
-                if (!isItemAnIp && isIpMatchCidr(parsedIp, parsedItem)) {
-                    return IP_MATCH_LIST_STATUS.CIDR;
-                }
-            }
-        }
-        return IP_MATCH_LIST_STATUS.NOT_FOUND;
-    } catch (e) {
-        console.error(e);
-        return IP_MATCH_LIST_STATUS.NOT_FOUND;
-    }
-};
-
 /**
 * @param ids {string[]}
 * @returns {Object}
@@ -717,14 +605,18 @@ export const setHtmlLangAttr = (language) => {
 * @param values {object}
 * @returns {object}
 */
-export const selectCompletedFields = (values) => Object.entries(values)
+export const replaceEmptyStringsWithZeroes = (values) => Object.entries(values)
    .reduce((acc, [key, value]) => {
-        if (value || value === 0) {
-            acc[key] = value;
-        }
+        acc[key] = value === '' ? 0 : value;
        return acc;
    }, {});

+/**
+ * @param value {number || string}
+ * @returns {string}
+ */
+export const replaceZeroWithEmptyString = (value) => (parseInt(value, 10) === 0 ? '' : value);
+
 /**
 * @param {string} search
 * @param {string} [response_status]
@@ -926,3 +818,16 @@ export const getBlockingClientName = (clients, ip) => {
    }
    return ip;
 };
+
+/**
+ * @param {string[]} lines
+ * @returns {string[]}
+ */
+export const filterOutComments = (lines) => lines
+    .filter((line) => !line.startsWith(COMMENT_LINE_DEFAULT_TOKEN));
+
+/**
+ * @param {string} serviceId
+ * @returns {string}
+ */
+export const getServiceName = (serviceId) => SERVICES_ID_NAME_MAP[serviceId] || serviceId;
--- a/client/src/helpers/highlightTextareaComments.js
+++ b/client/src/helpers/highlightTextareaComments.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import classnames from 'classnames';
+import { COMMENT_LINE_DEFAULT_TOKEN } from './constants';
+
+const renderHighlightedLine = (line, idx, commentLineTokens = [COMMENT_LINE_DEFAULT_TOKEN]) => {
+    const isComment = commentLineTokens.some((token) => line.trim().startsWith(token));
+
+    const lineClassName = classnames({
+        'text-gray': isComment,
+        'text-transparent': !isComment,
+    });
+
+    return <div className={lineClassName} key={idx}>{line || '\n'}</div>;
+};
+export const getTextareaCommentsHighlight = (
+    ref, lines, className = '', commentLineTokens,
+) => {
+    const renderLine = (line, idx) => renderHighlightedLine(line, idx, commentLineTokens);
+
+    return <code className={classnames('text-output', className)} ref={ref}>{lines?.split('\n').map(renderLine)}</code>;
+};
+
+export const syncScroll = (e, ref) => {
+    // eslint-disable-next-line no-param-reassign
+    ref.current.scrollTop = e.target.scrollTop;
+};
--- a/client/src/reducers/dhcp.js
+++ b/client/src/reducers/dhcp.js
@@ -2,7 +2,6 @@ import { handleActions } from 'redux-actions';
 import * as actions from '../actions';
 import { enrichWithConcatenatedIpAddresses } from '../helpers/helpers';

-// todo: figure out if we cat get rid of redux-form state duplication
 const dhcp = handleActions(
    {
        [actions.getDhcpStatusRequest]: (state) => ({
--- a/client/src/reducers/filtering.js
+++ b/client/src/reducers/filtering.js
@@ -56,6 +56,7 @@ const filtering = handleActions(
                ...state,
                isModalOpen: !state.isModalOpen,
                isFilterAdded: false,
+                modalType: '',
            };
            return newState;
        },
--- a/client/webpack.dev.js
+++ b/client/webpack.dev.js
@@ -38,11 +38,13 @@ const getDevServerConfig = (proxyUrl = BASE_URL) => {

    return {
        hot: true,
+        open: true,
        host: devServerHost,
        port: devServerPort,
        proxy: {
            [proxyUrl]: `http://${devServerHost}:${port}`,
        },
+        open: true,
    };
 };

@@ -61,5 +63,5 @@ module.exports = merge(common, {
            },
        ],
    },
-    devServer: process.env.WEBPACK_DEV_SERVER ? getDevServerConfig(BASE_URL) : undefined,
+    ...(process.env.WEBPACK_DEV_SERVER ? { devServer: getDevServerConfig(BASE_URL) } : undefined),
 });
--- a/dhcpd/README.md
+++ b/dhcpd/README.md
@@ -30,6 +30,10 @@ To set up a test environment for DHCP server you need:

 3. Start your VM, install an OS.  Configure your network interface to use DHCP and the OS should ask for a IP address from our DHCP server.

+4. To see the current IP address on client OS you can use `ip a` command on Linux or `ipconfig` on Windows.
+
+5. To force the client OS to request an IP from DHCP server again, you can use `dhclient` on Linux or `ipconfig /release` on Windows.
+
 ### Configure server

 1. Edit server configuration file 'AdGuardHome.yaml', for example:
@@ -37,12 +41,19 @@ To set up a test environment for DHCP server you need:
        dhcp:
          enabled: true
          interface_name: vboxnet0
-          gateway_ip: 192.168.56.1
-          subnet_mask: 255.255.255.0
-          range_start: 192.168.56.2
-          range_end: 192.168.56.2
-          lease_duration: 86400
-          icmp_timeout_msec: 1000
+          dhcpv4:
+            gateway_ip: 192.168.56.1
+            subnet_mask: 255.255.255.0
+            range_start: 192.168.56.2
+            range_end: 192.168.56.2
+            lease_duration: 86400
+            icmp_timeout_msec: 1000
+            options: []
+          dhcpv6:
+            range_start: 2001::1
+            lease_duration: 86400
+            ra_slaac_only: false
+            ra_allow_slaac: false

 2. Start the server

--- a/dhcpd/router_adv.go
+++ b/dhcpd/router_adv.go
@@ -0,0 +1,239 @@
+package dhcpd
+
+import (
+	"encoding/binary"
+	"fmt"
+	"net"
+	"sync/atomic"
+	"time"
+
+	"github.com/AdguardTeam/golibs/log"
+	"golang.org/x/net/icmp"
+	"golang.org/x/net/ipv6"
+)
+
+type raCtx struct {
+	raAllowSlaac     bool   // send RA packets without MO flags
+	raSlaacOnly      bool   // send RA packets with MO flags
+	ipAddr           net.IP // source IP address (link-local-unicast)
+	dnsIPAddr        net.IP // IP address for DNS Server option
+	prefixIPAddr     net.IP // IP address for Prefix option
+	ifaceName        string
+	iface            *net.Interface
+	packetSendPeriod time.Duration // how often RA packets are sent
+
+	conn *icmp.PacketConn // ICMPv6 socket
+	stop atomic.Value     // stop the packet sending loop
+}
+
+type icmpv6RA struct {
+	managedAddressConfiguration bool
+	otherConfiguration          bool
+	prefix                      net.IP
+	prefixLen                   int
+	sourceLinkLayerAddress      net.HardwareAddr
+	recursiveDNSServer          net.IP
+	mtu                         uint32
+}
+
+// Create an ICMPv6.RouterAdvertisement packet with all necessary options.
+//
+// ICMPv6:
+// type[1]
+// code[1]
+// chksum[2]
+// body (RouterAdvertisement):
+//   Cur Hop Limit[1]
+//   Flags[1]: MO......
+//   Router Lifetime[2]
+//   Reachable Time[4]
+//   Retrans Timer[4]
+//   Option=Prefix Information(3):
+//     Type[1]
+//     Length * 8bytes[1]
+//     Prefix Length[1]
+//     Flags[1]: LA......
+//     Valid Lifetime[4]
+//     Preferred Lifetime[4]
+//     Reserved[4]
+//     Prefix[16]
+//   Option=MTU(5):
+//     Type[1]
+//     Length * 8bytes[1]
+//     Reserved[2]
+//     MTU[4]
+//   Option=Source link-layer address(1):
+//     Link-Layer Address[6]
+//   Option=Recursive DNS Server(25):
+//     Type[1]
+//     Length * 8bytes[1]
+//     Reserved[2]
+//     Lifetime[4]
+//     Addresses of IPv6 Recursive DNS Servers[16]
+func createICMPv6RAPacket(params icmpv6RA) []byte {
+	data := make([]byte, 88)
+	i := 0
+
+	// ICMPv6:
+
+	data[i] = 134 // type
+	data[i+1] = 0 // code
+	data[i+2] = 0 // chksum
+	data[i+3] = 0
+	i += 4
+
+	// RouterAdvertisement:
+
+	data[i] = 64 // Cur Hop Limit[1]
+	i++
+
+	data[i] = 0 // Flags[1]: MO......
+	if params.managedAddressConfiguration {
+		data[i] |= 0x80
+	}
+	if params.otherConfiguration {
+		data[i] |= 0x40
+	}
+	i++
+
+	binary.BigEndian.PutUint16(data[i:], 1800) // Router Lifetime[2]
+	i += 2
+	binary.BigEndian.PutUint32(data[i:], 0) // Reachable Time[4]
+	i += 4
+	binary.BigEndian.PutUint32(data[i:], 0) // Retrans Timer[4]
+	i += 4
+
+	// Option=Prefix Information:
+
+	data[i] = 3   // Type
+	data[i+1] = 4 // Length
+	i += 2
+	data[i] = byte(params.prefixLen) // Prefix Length[1]
+	i++
+	data[i] = 0xc0 // Flags[1]
+	i++
+	binary.BigEndian.PutUint32(data[i:], 3600) // Valid Lifetime[4]
+	i += 4
+	binary.BigEndian.PutUint32(data[i:], 3600) // Preferred Lifetime[4]
+	i += 4
+	binary.BigEndian.PutUint32(data[i:], 0) // Reserved[4]
+	i += 4
+	copy(data[i:], params.prefix[:8]) // Prefix[16]
+	binary.BigEndian.PutUint32(data[i+8:], 0)
+	binary.BigEndian.PutUint32(data[i+12:], 0)
+	i += 16
+
+	// Option=MTU:
+
+	data[i] = 5   // Type
+	data[i+1] = 1 // Length
+	i += 2
+	binary.BigEndian.PutUint16(data[i:], 0) // Reserved[2]
+	i += 2
+	binary.BigEndian.PutUint32(data[i:], params.mtu) // MTU[4]
+	i += 4
+
+	// Option=Source link-layer address:
+
+	data[i] = 1   // Type
+	data[i+1] = 1 // Length
+	i += 2
+	copy(data[i:], params.sourceLinkLayerAddress) // Link-Layer Address[6]
+	i += 6
+
+	// Option=Recursive DNS Server:
+
+	data[i] = 25  // Type
+	data[i+1] = 3 // Length
+	i += 2
+	binary.BigEndian.PutUint16(data[i:], 0) // Reserved[2]
+	i += 2
+	binary.BigEndian.PutUint32(data[i:], 3600) // Lifetime[4]
+	i += 4
+	copy(data[i:], params.recursiveDNSServer) // Addresses of IPv6 Recursive DNS Servers[16]
+
+	return data
+}
+
+// Init - initialize RA module
+func (ra *raCtx) Init() error {
+	ra.stop.Store(0)
+	ra.conn = nil
+	if !(ra.raAllowSlaac || ra.raSlaacOnly) {
+		return nil
+	}
+
+	log.Debug("DHCPv6 RA: source IP address: %s  DNS IP address: %s",
+		ra.ipAddr, ra.dnsIPAddr)
+
+	params := icmpv6RA{
+		managedAddressConfiguration: !ra.raSlaacOnly,
+		otherConfiguration:          !ra.raSlaacOnly,
+		mtu:                         uint32(ra.iface.MTU),
+		prefixLen:                   64,
+		recursiveDNSServer:          ra.dnsIPAddr,
+		sourceLinkLayerAddress:      ra.iface.HardwareAddr,
+	}
+	params.prefix = make([]byte, 16)
+	copy(params.prefix, ra.prefixIPAddr[:8]) // /64
+
+	data := createICMPv6RAPacket(params)
+
+	var err error
+	ipAndScope := ra.ipAddr.String() + "%" + ra.ifaceName
+	ra.conn, err = icmp.ListenPacket("ip6:ipv6-icmp", ipAndScope)
+	if err != nil {
+		return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
+	}
+	success := false
+	defer func() {
+		if !success {
+			ra.Close()
+		}
+	}()
+
+	con6 := ra.conn.IPv6PacketConn()
+
+	if err := con6.SetHopLimit(255); err != nil {
+		return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
+	}
+
+	if err := con6.SetMulticastHopLimit(255); err != nil {
+		return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err)
+	}
+
+	msg := &ipv6.ControlMessage{
+		HopLimit: 255,
+		Src:      ra.ipAddr,
+		IfIndex:  ra.iface.Index,
+	}
+	addr := &net.UDPAddr{
+		IP: net.ParseIP("ff02::1"),
+	}
+
+	go func() {
+		log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
+		for ra.stop.Load() == 0 {
+			_, err = con6.WriteTo(data, msg, addr)
+			if err != nil {
+				log.Error("DHCPv6 RA: WriteTo: %s", err)
+			}
+			time.Sleep(ra.packetSendPeriod)
+		}
+		log.Debug("DHCPv6 RA: loop exit")
+	}()
+
+	success = true
+	return nil
+}
+
+// Close - close module
+func (ra *raCtx) Close() {
+	log.Debug("DHCPv6 RA: closing")
+
+	ra.stop.Store(1)
+
+	if ra.conn != nil {
+		ra.conn.Close()
+	}
+}
--- a/dhcpd/router_adv_test.go
+++ b/dhcpd/router_adv_test.go
@@ -0,0 +1,31 @@
+package dhcpd
+
+import (
+	"bytes"
+	"net"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRA(t *testing.T) {
+	ra := icmpv6RA{
+		managedAddressConfiguration: false,
+		otherConfiguration:          true,
+		mtu:                         1500,
+		prefix:                      net.ParseIP("1234::"),
+		prefixLen:                   64,
+		recursiveDNSServer:          net.ParseIP("fe80::800:27ff:fe00:0"),
+		sourceLinkLayerAddress:      []byte{0x0a, 0x00, 0x27, 0x00, 0x00, 0x00},
+	}
+	data := createICMPv6RAPacket(ra)
+	dataCorrect := []byte{
+		0x86, 0x00, 0x00, 0x00, 0x40, 0x40, 0x07, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x03, 0x04, 0x40, 0xc0, 0x00, 0x00, 0x0e, 0x10, 0x00, 0x00, 0x0e, 0x10, 0x00, 0x00, 0x00, 0x00,
+		0x12, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0xdc, 0x01, 0x01, 0x0a, 0x00, 0x27, 0x00, 0x00, 0x00,
+		0x19, 0x03, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x10, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x08, 0x00, 0x27, 0xff, 0xfe, 0x00, 0x00, 0x00,
+	}
+	assert.True(t, bytes.Equal(data, dataCorrect))
+}
--- a/dhcpd/server.go
+++ b/dhcpd/server.go
@@ -83,6 +83,9 @@ type V6ServerConf struct {

 	LeaseDuration uint32 `yaml:"lease_duration"` // in seconds

+	RaSlaacOnly  bool `yaml:"ra_slaac_only"`  // send ICMPv6.RA packets without MO flags
+	RaAllowSlaac bool `yaml:"ra_allow_slaac"` // send ICMPv6.RA packets with MO flags
+
 	ipStart    net.IP        // starting IP address for dynamic leases
 	leaseTime  time.Duration // the time during which a dynamic lease is considered valid
 	dnsIPAddrs []net.IP      // IPv6 addresses to return to DHCP clients as DNS server addresses
--- a/dhcpd/v6.go
+++ b/dhcpd/v6.go
@@ -25,6 +25,8 @@ type v6Server struct {
 	ipAddrs    [256]byte
 	sid        dhcpv6.Duid

+	ra raCtx // RA module
+
 	conf V6ServerConf
 }

@@ -557,6 +559,27 @@ func getIfaceIPv6(iface net.Interface) []net.IP {
 	return res
 }

+// initialize RA module
+func (s *v6Server) initRA(iface *net.Interface) error {
+	// choose the source IP address - should be link-local-unicast
+	s.ra.ipAddr = s.conf.dnsIPAddrs[0]
+	for _, ip := range s.conf.dnsIPAddrs {
+		if ip.IsLinkLocalUnicast() {
+			s.ra.ipAddr = ip
+			break
+		}
+	}
+
+	s.ra.raAllowSlaac = s.conf.RaAllowSlaac
+	s.ra.raSlaacOnly = s.conf.RaSlaacOnly
+	s.ra.dnsIPAddr = s.ra.ipAddr
+	s.ra.prefixIPAddr = s.conf.ipStart
+	s.ra.ifaceName = s.conf.InterfaceName
+	s.ra.iface = iface
+	s.ra.packetSendPeriod = 1 * time.Second
+	return s.ra.Init()
+}
+
 // Start - start server
 func (s *v6Server) Start() error {
 	if !s.conf.Enabled {
@@ -568,13 +591,25 @@ func (s *v6Server) Start() error {
 		return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
 	}

-	log.Debug("DHCPv6: starting...")
 	s.conf.dnsIPAddrs = getIfaceIPv6(*iface)
 	if len(s.conf.dnsIPAddrs) == 0 {
 		log.Debug("DHCPv6: no IPv6 address for interface %s", iface.Name)
 		return nil
 	}

+	err = s.initRA(iface)
+	if err != nil {
+		return err
+	}
+
+	// don't initialize DHCPv6 server if we must force the clients to use SLAAC
+	if s.conf.RaSlaacOnly {
+		log.Debug("DHCPv6: not starting DHCPv6 server due to ra_slaac_only=true")
+		return nil
+	}
+
+	log.Debug("DHCPv6: starting...")
+
 	if len(iface.HardwareAddr) != 6 {
 		return fmt.Errorf("DHCPv6: invalid MAC %s", iface.HardwareAddr)
 	}
@@ -598,11 +633,15 @@ func (s *v6Server) Start() error {
 		err = s.srv.Serve()
 		log.Debug("DHCPv6: srv.Serve: %s", err)
 	}()
+
 	return nil
 }

 // Stop - stop server
 func (s *v6Server) Stop() {
+	s.ra.Close()
+
+	// DHCPv6 server may not be initialized if ra_slaac_only=true
 	if s.srv == nil {
 		return
 	}
@@ -626,7 +665,7 @@ func v6Create(conf V6ServerConf) (DHCPServer, error) {
 	}

 	s.conf.ipStart = net.ParseIP(conf.RangeStart)
-	if s.conf.ipStart == nil {
+	if s.conf.ipStart == nil || s.conf.ipStart.To16() == nil {
 		return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
 	}

--- a/dnsfilter/sb_pc.go
+++ b/dnsfilter/sb_pc.go
@@ -35,10 +35,10 @@ func (d *Dnsfilter) initSecurityServices() error {
 	opts := upstream.Options{
 		Timeout: dnsTimeout,
 		ServerIPAddrs: []net.IP{
-			net.ParseIP("176.103.130.132"),
-			net.ParseIP("176.103.130.134"),
-			net.ParseIP("2a00:5a60::bad1:ff"),
-			net.ParseIP("2a00:5a60::bad2:ff"),
+			net.ParseIP("94.140.14.15"),
+			net.ParseIP("94.140.15.16"),
+			net.ParseIP("2a10:50c0::bad1:ff"),
+			net.ParseIP("2a10:50c0::bad2:ff"),
 		},
 	}

--- a/dnsforward/access.go
+++ b/dnsforward/access.go
@@ -80,43 +80,46 @@ func processIPCIDRArray(dst *map[string]bool, dstIPNet *[]net.IPNet, src []strin
 }

 // IsBlockedIP - return TRUE if this client should be blocked
-func (a *accessCtx) IsBlockedIP(ip string) bool {
+// Returns the item from the "disallowedClients" list that lead to blocking IP.
+// If it returns TRUE and an empty string, it means that the "allowedClients" is not empty,
+// but the ip does not belong to it.
+func (a *accessCtx) IsBlockedIP(ip string) (bool, string) {
 	a.lock.Lock()
 	defer a.lock.Unlock()

 	if len(a.allowedClients) != 0 || len(a.allowedClientsIPNet) != 0 {
 		_, ok := a.allowedClients[ip]
 		if ok {
-			return false
+			return false, ""
 		}

 		if len(a.allowedClientsIPNet) != 0 {
 			ipAddr := net.ParseIP(ip)
 			for _, ipnet := range a.allowedClientsIPNet {
 				if ipnet.Contains(ipAddr) {
-					return false
+					return false, ""
 				}
 			}
 		}

-		return true
+		return true, ""
 	}

 	_, ok := a.disallowedClients[ip]
 	if ok {
-		return true
+		return true, ip
 	}

 	if len(a.disallowedClientsIPNet) != 0 {
 		ipAddr := net.ParseIP(ip)
 		for _, ipnet := range a.disallowedClientsIPNet {
 			if ipnet.Contains(ipAddr) {
-				return true
+				return true, ipnet.String()
 			}
 		}
 	}

-	return false
+	return false, ""
 }

 // IsBlockedDomain - return TRUE if this domain should be blocked
--- a/dnsforward/access_test.go
+++ b/dnsforward/access_test.go
@@ -0,0 +1,73 @@
+package dnsforward
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsBlockedIPAllowed(t *testing.T) {
+	a := &accessCtx{}
+	assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
+
+	disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
+	assert.False(t, disallowed)
+	assert.Equal(t, "", disallowedRule)
+
+	disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
+	assert.True(t, disallowed)
+	assert.Equal(t, "", disallowedRule)
+
+	disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
+	assert.False(t, disallowed)
+	assert.Equal(t, "", disallowedRule)
+
+	disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
+	assert.True(t, disallowed)
+	assert.Equal(t, "", disallowedRule)
+}
+
+func TestIsBlockedIPDisallowed(t *testing.T) {
+	a := &accessCtx{}
+	assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
+
+	disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
+	assert.True(t, disallowed)
+	assert.Equal(t, "1.1.1.1", disallowedRule)
+
+	disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
+	assert.False(t, disallowed)
+	assert.Equal(t, "", disallowedRule)
+
+	disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
+	assert.True(t, disallowed)
+	assert.Equal(t, "2.2.0.0/16", disallowedRule)
+
+	disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
+	assert.False(t, disallowed)
+	assert.Equal(t, "", disallowedRule)
+}
+
+func TestIsBlockedIPBlockedDomain(t *testing.T) {
+	a := &accessCtx{}
+	assert.True(t, a.Init(nil, nil, []string{"host1",
+		"host2",
+		"*.host.com",
+		"||host3.com^",
+	}) == nil)
+
+	// match by "host2.com"
+	assert.True(t, a.IsBlockedDomain("host1"))
+	assert.True(t, a.IsBlockedDomain("host2"))
+	assert.True(t, !a.IsBlockedDomain("host3"))
+
+	// match by wildcard "*.host.com"
+	assert.True(t, !a.IsBlockedDomain("host.com"))
+	assert.True(t, a.IsBlockedDomain("asdf.host.com"))
+	assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
+	assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
+
+	// match by wildcard "||host3.com^"
+	assert.True(t, a.IsBlockedDomain("host3.com"))
+	assert.True(t, a.IsBlockedDomain("asdf.host3.com"))
+}
--- a/dnsforward/config.go
+++ b/dnsforward/config.go
@@ -249,6 +249,7 @@ func (s *Server) prepareUpstreamSettings() error {
 	} else {
 		upstreams = s.conf.UpstreamDNS
 	}
+	upstreams = filterOutComments(upstreams)
 	upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
 	if err != nil {
 		return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -301,3 +301,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		p.ServeHTTP(w, r)
 	}
 }
+
+// IsBlockedIP - return TRUE if this client should be blocked
+func (s *Server) IsBlockedIP(ip string) (bool, string) {
+	return s.access.IsBlockedIP(ip)
+}
--- a/dnsforward/dnsforward_http.go
+++ b/dnsforward/dnsforward_http.go
@@ -117,12 +117,10 @@ func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
 	}

 	if js.Exists("upstream_dns") {
-		if len(req.Upstreams) != 0 {
-			err = ValidateUpstreams(req.Upstreams)
-			if err != nil {
-				httpError(r, w, http.StatusBadRequest, "wrong upstreams specification: %s", err)
-				return
-			}
+		err = ValidateUpstreams(req.Upstreams)
+		if err != nil {
+			httpError(r, w, http.StatusBadRequest, "wrong upstreams specification: %s", err)
+			return
 		}
 	}

@@ -256,6 +254,14 @@ type upstreamJSON struct {

 // ValidateUpstreams validates each upstream and returns an error if any upstream is invalid or if there are no default upstreams specified
 func ValidateUpstreams(upstreams []string) error {
+	// No need to validate comments
+	upstreams = filterOutComments(upstreams)
+
+	// Consider this case valid because defaultDNS will be used
+	if len(upstreams) == 0 {
+		return nil
+	}
+
 	var defaultUpstreamFound bool
 	for _, u := range upstreams {
 		d, err := validateUpstream(u)
@@ -397,6 +403,10 @@ func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
 }

 func checkDNS(input string, bootstrap []string) error {
+	if !isUpstream(input) {
+		return nil
+	}
+
 	// separate upstream from domains list
 	input, defaultUpstream, err := separateUpstream(input)
 	if err != nil {
@@ -404,7 +414,7 @@ func checkDNS(input string, bootstrap []string) error {
 	}

 	// No need to check this DNS server
-	if input == "#" || !defaultUpstream {
+	if !defaultUpstream {
 		return nil
 	}

--- a/dnsforward/dnsforward_test.go
+++ b/dnsforward/dnsforward_test.go
@@ -267,7 +267,7 @@ func TestBlockedRequest(t *testing.T) {
 	addr := s.dnsProxy.Addr(proxy.ProtoUDP)

 	//
-	// Default blocking - REFUSED
+	// Default blocking - NULL IP
 	//
 	req := dns.Msg{}
 	req.Id = dns.Id()
@@ -280,7 +280,8 @@ func TestBlockedRequest(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Couldn't talk to server %s: %s", addr, err)
 	}
-	assert.Equal(t, dns.RcodeRefused, reply.Rcode)
+	assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
+	assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))

 	err = s.Stop()
 	if err != nil {
@@ -442,7 +443,8 @@ func TestBlockCNAME(t *testing.T) {
 	req := createTestMessage("badhost.")
 	reply, err := dns.Exchange(req, addr.String())
 	assert.Nil(t, err, nil)
-	assert.Equal(t, dns.RcodeRefused, reply.Rcode)
+	assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
+	assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))

 	// 'whitelist.example.org' has a canonical name 'null.example.org' which is blocked by filters
 	//   but 'whitelist.example.org' is in a whitelist:
@@ -457,7 +459,8 @@ func TestBlockCNAME(t *testing.T) {
 	req = createTestMessage("example.org.")
 	reply, err = dns.Exchange(req, addr.String())
 	assert.Nil(t, err)
-	assert.Equal(t, dns.RcodeRefused, reply.Rcode)
+	assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
+	assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))

 	_ = s.Stop()
 }
@@ -912,50 +915,6 @@ func publicKey(priv interface{}) interface{} {
 	}
 }

-func TestIsBlockedIPAllowed(t *testing.T) {
-	a := &accessCtx{}
-	assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
-
-	assert.True(t, !a.IsBlockedIP("1.1.1.1"))
-	assert.True(t, a.IsBlockedIP("1.1.1.2"))
-	assert.True(t, !a.IsBlockedIP("2.2.1.1"))
-	assert.True(t, a.IsBlockedIP("2.3.1.1"))
-}
-
-func TestIsBlockedIPDisallowed(t *testing.T) {
-	a := &accessCtx{}
-	assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
-
-	assert.True(t, a.IsBlockedIP("1.1.1.1"))
-	assert.True(t, !a.IsBlockedIP("1.1.1.2"))
-	assert.True(t, a.IsBlockedIP("2.2.1.1"))
-	assert.True(t, !a.IsBlockedIP("2.3.1.1"))
-}
-
-func TestIsBlockedIPBlockedDomain(t *testing.T) {
-	a := &accessCtx{}
-	assert.True(t, a.Init(nil, nil, []string{"host1",
-		"host2",
-		"*.host.com",
-		"||host3.com^",
-	}) == nil)
-
-	// match by "host2.com"
-	assert.True(t, a.IsBlockedDomain("host1"))
-	assert.True(t, a.IsBlockedDomain("host2"))
-	assert.True(t, !a.IsBlockedDomain("host3"))
-
-	// match by wildcard "*.host.com"
-	assert.True(t, !a.IsBlockedDomain("host.com"))
-	assert.True(t, a.IsBlockedDomain("asdf.host.com"))
-	assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
-	assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
-
-	// match by wildcard "||host3.com^"
-	assert.True(t, a.IsBlockedDomain("host3.com"))
-	assert.True(t, a.IsBlockedDomain("asdf.host3.com"))
-}
-
 func TestValidateUpstream(t *testing.T) {
 	invalidUpstreams := []string{"1.2.3.4.5",
 		"123.3.7m",
@@ -1005,31 +964,35 @@ func TestValidateUpstream(t *testing.T) {
 }

 func TestValidateUpstreamsSet(t *testing.T) {
+	// Empty upstreams array
+	var upstreamsSet []string
+	err := ValidateUpstreams(upstreamsSet)
+	assert.Nil(t, err, "empty upstreams array should be valid")
+
+	// Comment in upstreams array
+	upstreamsSet = []string{"# comment"}
+	err = ValidateUpstreams(upstreamsSet)
+	assert.Nil(t, err, "comments should not be validated")
+
 	// Set of valid upstreams. There is no default upstream specified
-	upstreamsSet := []string{"[/host.com/]1.1.1.1",
+	upstreamsSet = []string{"[/host.com/]1.1.1.1",
 		"[//]tls://1.1.1.1",
 		"[/www.host.com/]#",
 		"[/host.com/google.com/]8.8.8.8",
 		"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
 	}
-	err := ValidateUpstreams(upstreamsSet)
-	if err == nil {
-		t.Fatalf("there is no default upstream")
-	}
+	err = ValidateUpstreams(upstreamsSet)
+	assert.NotNil(t, err, "there is no default upstream")

 	// Let's add default upstream
 	upstreamsSet = append(upstreamsSet, "8.8.8.8")
 	err = ValidateUpstreams(upstreamsSet)
-	if err != nil {
-		t.Fatalf("upstreams set is valid, but doesn't pass through validation cause: %s", err)
-	}
+	assert.Nilf(t, err, "upstreams set is valid, but doesn't pass through validation cause: %s", err)

 	// Let's add invalid upstream
 	upstreamsSet = append(upstreamsSet, "dhcp://fake.dns")
 	err = ValidateUpstreams(upstreamsSet)
-	if err == nil {
-		t.Fatalf("there is an invalid upstream in set, but it pass through validation")
-	}
+	assert.NotNil(t, err, "there is an invalid upstream in set, but it pass through validation")
 }

 func TestIpFromAddr(t *testing.T) {
--- a/dnsforward/filter.go
+++ b/dnsforward/filter.go
@@ -12,7 +12,8 @@ import (

 func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d *proxy.DNSContext) (bool, error) {
 	ip := ipFromAddr(d.Addr)
-	if s.access.IsBlockedIP(ip) {
+	disallowed, _ := s.access.IsBlockedIP(ip)
+	if disallowed {
 		log.Tracef("Client IP %s is blocked by settings", ip)
 		return false, nil
 	}
--- a/dnsforward/handle_dns.go
+++ b/dnsforward/handle_dns.go
@@ -86,9 +86,10 @@ func processInitial(ctx *dnsContext) int {
 	}

 	// disable Mozilla DoH
+	// https://support.mozilla.org/en-US/kb/canary-domain-use-application-dnsnet
 	if (d.Req.Question[0].Qtype == dns.TypeA || d.Req.Question[0].Qtype == dns.TypeAAAA) &&
 		d.Req.Question[0].Name == "use-application-dns.net." {
-		d.Res = s.makeResponseREFUSED(d.Req)
+		d.Res = s.genNXDomain(d.Req)
 		return resultFinish
 	}

--- a/dnsforward/msg.go
+++ b/dnsforward/msg.go
@@ -24,7 +24,10 @@ func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Resu
 	m := d.Req

 	if m.Question[0].Qtype != dns.TypeA && m.Question[0].Qtype != dns.TypeAAAA {
-		return s.makeResponseREFUSED(m)
+		if s.conf.BlockingMode == "null_ip" {
+			return s.makeResponse(m)
+		}
+		return s.genNXDomain(m)
 	}

 	switch result.Reason {
@@ -42,13 +45,7 @@ func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Resu

 		if s.conf.BlockingMode == "null_ip" {
 			// it means that we should return 0.0.0.0 or :: for any blocked request
-
-			switch m.Question[0].Qtype {
-			case dns.TypeA:
-				return s.genARecord(m, []byte{0, 0, 0, 0})
-			case dns.TypeAAAA:
-				return s.genAAAARecord(m, net.IPv6zero)
-			}
+			return s.makeResponseNullIP(m)

 		} else if s.conf.BlockingMode == "custom_ip" {
 			// means that we should return custom IP for any blocked request
@@ -73,11 +70,12 @@ func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Resu

 		// Default blocking mode
 		// If there's an IP specified in the rule, return it
-		// If there is no IP, return REFUSED
+		// For host-type rules, return null IP
 		if result.IP != nil {
 			return s.genResponseWithIP(m, result.IP)
 		}
-		return s.makeResponseREFUSED(m)
+
+		return s.makeResponseNullIP(m)
 	}
 }

@@ -138,6 +136,17 @@ func (s *Server) genResponseWithIP(req *dns.Msg, ip net.IP) *dns.Msg {
 	return resp
 }

+// Respond with 0.0.0.0 for A, :: for AAAA, empty response for other types
+func (s *Server) makeResponseNullIP(req *dns.Msg) *dns.Msg {
+	if req.Question[0].Qtype == dns.TypeA {
+		return s.genARecord(req, []byte{0, 0, 0, 0})
+	} else if req.Question[0].Qtype == dns.TypeAAAA {
+		return s.genAAAARecord(req, net.IPv6zero)
+	}
+
+	return s.makeResponse(req)
+}
+
 func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSContext) *dns.Msg {

 	ip := net.ParseIP(newAddr)
--- a/dnsforward/util.go
+++ b/dnsforward/util.go
@@ -85,3 +85,18 @@ func matchDNSName(dnsNames []string, sni string) bool {
 	}
 	return false
 }
+
+// Is not comment
+func isUpstream(line string) bool {
+	return !strings.HasPrefix(line, "#")
+}
+
+func filterOutComments(lines []string) []string {
+	var filtered []string
+	for _, l := range lines {
+		if isUpstream(l) {
+			filtered = append(filtered, l)
+		}
+	}
+	return filtered
+}
--- a/go.mod
+++ b/go.mod
@@ -3,28 +3,34 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.14

 require (
-	github.com/AdguardTeam/dnsproxy v0.32.5
+	github.com/AdguardTeam/dnsproxy v0.32.6
 	github.com/AdguardTeam/golibs v0.4.2
 	github.com/AdguardTeam/urlfilter v0.12.2
 	github.com/NYTimes/gziphandler v1.1.1
+	github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gobuffalo/packr v1.30.1
 	github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
 	github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
-	github.com/joomcode/errorx v1.0.1
+	github.com/joomcode/errorx v1.0.3
 	github.com/kardianos/service v1.1.0
+	github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
 	github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
 	github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
-	github.com/miekg/dns v1.1.29
+	github.com/miekg/dns v1.1.31
 	github.com/pkg/errors v0.9.1
+	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.6.0 // indirect
 	github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
 	github.com/stretchr/testify v1.5.1
 	github.com/u-root/u-root v6.0.0+incompatible
 	go.etcd.io/bbolt v1.3.4
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/net v0.0.0-20200707034311-ab3426394381
-	golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
+	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+	golang.org/x/net v0.0.0-20200904194848-62affa334b73
+	golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
+	golang.org/x/text v0.3.3 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.3.0
+	howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
 )
--- a/Show More
+++ b/Show More