MITM proxy

2020-08-18 19:23:33 +03:00
237 changed files with 8754 additions and 15861 deletions
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -1,12 +1,6 @@
 #!/bin/bash
 set -e;
-
-found=0
-git diff --cached --name-only | grep -q '.js$' && found=1
-if [ $found == 1 ]; then
-    npm --prefix client run lint || exit 1
-    npm run test --prefix client || exit 1
-fi
+git diff --cached --name-only | grep -q '.js$' && make lint-js;

 found=0
 git diff --cached --name-only | grep -q '.go$' && found=1
--- a/.twosky.json
+++ b/.twosky.json
@@ -4,39 +4,35 @@
    "base_locale": "en",
    "localizable_files": ["client/src/__locales/en.json"],
    "languages": {
-      "be": "Беларуская",
-      "bg": "Български",
-      "cs": "Český",
      "da": "Dansk",
      "de": "Deutsch",
+      "nl": "Dutch",
      "en": "English",
      "es": "Español",
-      "fa": "فارسی",
      "fr": "Français",
      "hr": "Hrvatski",
-      "hu": "Magyar",
      "id": "Indonesian",
      "it": "Italiano",
-      "ja": "日本語",
-      "ko": "한국어",
-      "nl": "Dutch",
      "no": "Norsk",
      "pl": "Polski",
      "pt-br": "Português (BR)",
      "pt-pt": "Português (PT)",
      "ro": "Română",
-      "ru": "Русский",
-      "si-lk": "සිංහල",
      "sk": "Slovenčina",
      "sl": "Slovenščina",
      "sr-cs": "Srpski",
      "sv": "Svenska",
-      "th": "ภาษาไทย",
-      "tr": "Türkçe",
      "vi": "Tiếng Việt",
+      "tr": "Türkçe",
+      "cs": "Český",
+      "bg": "Български",
+      "ru": "Русский",
+      "fa": "فارسی",
+      "ja": "日本語",
+      "zh-tw": "正體中文",
      "zh-cn": "简体中文",
-      "zh-hk": "繁體中文（香港）",
-      "zh-tw": "正體中文（台灣）"
+      "ko": "한국어",
+      "th": "ภาษาไทย"
    }
  }
 ]
--- a/AGHTechDoc.md
+++ b/AGHTechDoc.md
@@ -12,7 +12,6 @@ Contents:
 * Updating
 	* Get version command
 	* Update command
-* API: Get global status
 * TLS
 	* API: Get TLS configuration
 	* API: Set TLS configuration
@@ -25,15 +24,12 @@ Contents:
 	* API: Find clients by IP
 * DHCP server
 	* DHCP server in DNS
-	* DHCP Custom Options
-	* API: Show DHCP interfaces
-	* API: Show DHCP status
-	* API: Check DHCP
-	* API: Enable DHCP
+	* "Show DHCP status" command
+	* "Check DHCP" command
+	* "Enable DHCP" command
 	* Static IP check/set
-	* API: Add a static lease
+	* Add a static lease
 	* API: Reset DHCP configuration
-	* RA+SLAAC
 * DNS general settings
 	* API: Get DNS general settings
 	* API: Set DNS general settings
@@ -56,21 +52,26 @@ Contents:
 	* API: Get query log
 	* API: Set querylog parameters
 	* API: Get querylog parameters
-* Filtering
+* DNS Filtering
 	* Filters update mechanism
 	* API: Get filtering parameters
 	* API: Set filtering parameters
 	* API: Refresh filters
 	* API: Add Filter
-	* API: Set URL parameters
-	* API: Delete URL
+	* API: Set Filter parameters
+	* API: Delete Filter
 	* API: Domain Check
+* HTTP Proxy
+	* API: Get Proxy settings
+	* API: Set Proxy settings
+	* API: Get Proxy filtering parameters
+	* API: Add Proxy Filter
+	* API: Delete Proxy Filter
 * Log-in page
 	* API: Log in
 	* API: Log out
 	* API: Get current user info
 * Safe services
-* ipset


 ## Relations between subsystems
@@ -381,28 +382,6 @@ Error response:
 UI shows error message "Auto-update has failed"


-## API: Get global status
-
-Request:
-
-	GET /control/status
-
-Response:
-
-	200 OK
-
-	{
-	"dns_addresses":["..."],
-	"dns_port":53,
-	"http_port":3000,
-	"language":"en",
-	"protection_enabled":true,
-	"running":true,
-	"dhcp_available":true,
-	"version":"undefined"
-	}
-
-
 ## DHCP server

 Enable DHCP server algorithm:
@@ -432,43 +411,7 @@ DHCP leases are used in several ways by DNS module.
 		> PTR 100.1.168.192.in-addr.arpa. = bills-notebook.


-### DHCP Custom Options
-
-Option with arbitrary hexadecimal data:
-
-	DEC_CODE hex HEX_DATA
-
-where DEC_CODE is a decimal DHCPv4 option code in range [1..255]
-
-Option with IP data (only 1 IP is supported):
-
-	DEC_CODE ip IP_ADDR
-
-
-### API: Show DHCP interfaces
-
-Request:
-
-	GET /control/dhcp/interfaces
-
-Response:
-
-	200 OK
-
-	{
-		"iface_name":{
-			"name":"iface_name",
-			"hardware_address":"...",
-			"ipv4_addresses":["ipv4 addr", ...],
-			"ipv6_addresses":["ipv6 addr", ...],
-			"gateway_ip":"...",
-			"flags":"up|broadcast|multicast"
-		}
-		...
-	}
-
-
-### API: Show DHCP status
+### "Show DHCP status" command

 Request:

@@ -479,19 +422,16 @@ Response:
 	200 OK

 	{
-		"enabled":false,
-		"interface_name":"...",
-		"v4":{
+		"config":{
+			"enabled":false,
+			"interface_name":"...",
 			"gateway_ip":"...",
 			"subnet_mask":"...",
-			"range_start":"...", // if empty: DHCPv4 won't be enabled
+			"range_start":"...",
 			"range_end":"...",
 			"lease_duration":60,
+			"icmp_timeout_msec":0
 		},
-		"v6":{
-			"range_start":"...", // if empty: DHCPv6 won't be enabled
-			"lease_duration":60,
-		}
 		"leases":[
 			{"ip":"...","mac":"...","hostname":"...","expires":"..."}
 			...
@@ -503,7 +443,7 @@ Response:
 	}


-### API: Check DHCP
+### "Check DHCP" command

 Request:

@@ -516,21 +456,13 @@ Response:
 	200 OK

 	{
-		v4: {
-			"other_server": {
-				"found": "yes|no|error",
-				"error": "Error message", // set if found=error
-			},
-			"static_ip": {
-				"static": "yes|no|error",
-				"ip": "<Current dynamic IP address>", // set if static=no
-			}
-		}
-		v6: {
-			"other_server": {
-				"found": "yes|no|error",
-				"error": "Error message", // set if found=error
-			},
+		"other_server": {
+			"found": "yes|no|error",
+			"error": "Error message", // set if found=error
+		},
+		"static_ip": {
+			"static": "yes|no|error",
+			"ip": "<Current dynamic IP address>", // set if static=no
 		}
 	}

@@ -551,26 +483,21 @@ If `static_ip.static` is:
 		In order to use DHCP server a static IP address must be set.  We failed to determine if this network interface is configured using static IP address.  Please set a static IP address manually.


-### API: Enable DHCP
+### "Enable DHCP" command

 Request:

 	POST /control/dhcp/set_config

 	{
-	"enabled":true,
-	"interface_name":"vboxnet0",
-	"v4":{
+		"enabled":true,
+		"interface_name":"vboxnet0",
 		"gateway_ip":"192.169.56.1",
 		"subnet_mask":"255.255.255.0",
-		"range_start":"192.169.56.100",
-		"range_end":"192.169.56.200", // Note: first 3 octects must match "range_start"
+		"range_start":"192.169.56.3",
+		"range_end":"192.169.56.3",
 		"lease_duration":60,
-	},
-	"v6":{
-		"range_start":"...",
-		"lease_duration":60,
-	}
+		"icmp_timeout_msec":0
 	}

 Response:
@@ -579,10 +506,6 @@ Response:

 	OK

-For v4, if range_start = "1.2.3.4", the range_end must be "1.2.3.X" where X > 4.
-
-For v6, if range_start = "2001::1", the last IP is "2001:ff".
-

 ### Static IP check/set

@@ -678,7 +601,7 @@ or:
 	systemctl restart system-networkd


-### API: Add a static lease
+### Add a static lease

 Request:

@@ -726,53 +649,6 @@ 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


@@ -791,7 +667,6 @@ Response:
 	"server_name":"...",
 	"port_https":443,
 	"port_dns_over_tls":853,
-	"port_dns_over_quic":784,
 	"certificate_chain":"...",
 	"private_key":"...",
 	"certificate_path":"...",
@@ -823,43 +698,12 @@ Request:
 	"force_https":false,
 	"port_https":443,
 	"port_dns_over_tls":853,
-	"port_dns_over_quic":784,
 	"certificate_chain":"...",
 	"private_key":"...",
 	"certificate_path":"...", // if set, certificate_chain must be empty
 	"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
@@ -1020,7 +864,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`, `whois_info`, `disallowed`, and `disallowed_rule` fields are set.  Other fields are empty.
+For auto-clients only `name`, `ids` and `whois_info` fields are set.  Other fields are empty.

 Request:

@@ -1046,16 +890,11 @@ 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

@@ -1071,12 +910,11 @@ Response:

 	{
 		"upstream_dns": ["tls://...", ...],
-		"upstream_dns_file": "",
 		"bootstrap_dns": ["1.2.3.4", ...],

 		"protection_enabled": true | false,
 		"ratelimit": 1234,
-		"blocking_mode": "default" | "refused" | "nxdomain" | "null_ip" | "custom_ip",
+		"blocking_mode": "default" | "nxdomain" | "null_ip" | "custom_ip",
 		"blocking_ipv4": "1.2.3.4",
 		"blocking_ipv6": "1:2:3::4",
 		"edns_cs_enabled": true | false,
@@ -1097,12 +935,11 @@ Request:

 	{
 		"upstream_dns": ["tls://...", ...],
-		"upstream_dns_file": "",
 		"bootstrap_dns": ["1.2.3.4", ...],

 		"protection_enabled": true | false,
 		"ratelimit": 1234,
-		"blocking_mode": "default" | "refused" | "nxdomain" | "null_ip" | "custom_ip",
+		"blocking_mode": "default" | "nxdomain" | "null_ip" | "custom_ip",
 		"blocking_ipv4": "1.2.3.4",
 		"blocking_ipv6": "1:2:3::4",
 		"edns_cs_enabled": true | false,
@@ -1185,7 +1022,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

@@ -1506,7 +1343,6 @@ When a new DNS request is received and processed, we store information about thi
 		"Reason":3,
 		"Rule":"...",
 		"FilterID":1,
-		"ServiceName":"..."
 		},
 	"Elapsed":12345,
 	"Upstream":"...",
@@ -1527,11 +1363,6 @@ When UI asks for data from query log (see "API: Get query log"), server reads th

 We store data for a limited amount of time - the log file is automatically rotated.

-* On AGH startup read the first line from query logs and store its time value
-* If there's no log file yet, set the time value of the first log event when the file is created
-* If this time value is older than our time limit, perform file rotate procedure
-* While AGH is running, check the previous condition every 24 hours
-

 ### API: Get query log

@@ -1554,8 +1385,7 @@ 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 services
-* blocked_services     - blocked services
+* blocked              - blocked or blocked service
 * blocked_safebrowsing - blocked by safebrowsing
 * blocked_parental     - blocked by parental control
 * whitelisted          - whitelisted
@@ -1653,7 +1483,7 @@ Response:
 	}


-## Filtering
+## DNS Filtering

 ![](doc/agh-filtering.png)

@@ -1724,7 +1554,19 @@ Response:
 			}
 			...
 		],
-		"user_rules":["...", ...]
+		"user_rules":["...", ...],
+
+		"proxy_filtering_enabled": true | false
+		"proxy_filters":[
+			{
+			"enabled":true,
+			"url":"https://...",
+			"name":"...",
+			"rules_count":1234,
+			"last_updated":"2019-09-04T18:29:30+00:00",
+			}
+			...
+		],
 	}

 For both arrays `filters` and `whitelist_filters` there are unique values: id, url.
@@ -1739,6 +1581,7 @@ Request:

 	{
 		"enabled": true | false
+		"proxy_filtering_enabled": true | false
 		"interval": 0 | 1 | 12 | 1*24 || 3*24 || 7*24
 	}

@@ -1754,7 +1597,7 @@ Request:
 	POST /control/filtering/refresh

 	{
-		"whitelist": true
+		"type": blocklist | whitelist | proxylist
 	}

 Response:
@@ -1775,7 +1618,7 @@ Request:
 	{
 		"name": "..."
 		"url": "..." // URL or an absolute file path
-		"whitelist": true
+		"type": blocklist | whitelist | proxylist
 	}

 Response:
@@ -1783,7 +1626,7 @@ Response:
 	200 OK


-### API: Set URL parameters
+### API: Set Filter parameters

 Request:

@@ -1791,11 +1634,11 @@ Request:

 	{
 	"url": "..."
-	"whitelist": true
+	"type": blocklist | whitelist | proxylist
 	"data": {
 		"name": "..."
 		"url": "..."
-		"enabled": true | false
+		"enabled": true
 	}
 	}

@@ -1804,7 +1647,7 @@ Response:
 	200 OK


-### API: Delete URL
+### API: Delete Filter

 Request:

@@ -1812,7 +1655,7 @@ Request:

 	{
 	"url": "..."
-	"whitelist": true
+	"type": blocklist | whitelist | proxylist
 	}

 Response:
@@ -1844,6 +1687,60 @@ Response:
 	}


+## HTTP Proxy
+
+	Browser <-(HTTP)-> AGH Proxy <-(HTTP)-> Internet Server
+
+HTTPS MITM:
+
+	. Browser  --(CONNECT...)->          AGH Proxy  --(handshake)->     Internet Server
+	. Browser  <-(handshake,cert/AGH)--  AGH Proxy  <-(cert/issuer)--   Internet Server
+	. Browser  <-(TLS/session2)->        AGH Proxy  <-(TLS/session1)->  Internet Server
+
+
+### API: Get Proxy settings
+
+Request:
+
+	GET /control/proxy_info
+
+Response:
+
+	200 OK
+
+	{
+		"enabled": true|false,
+		"listen_address": "ip",
+		"listen_port": 12345,
+
+		"auth_username": "",
+		"auth_password": ""
+	}
+
+
+### API: Set Proxy settings
+
+Request:
+
+	POST /control/proxy_config
+
+	{
+		"enabled": true|false,
+		"listen_address": "ip",
+		"listen_port": 12345,
+
+		"auth_username": "",
+		"auth_password": "",
+
+		"cert_data":"...", // user-specified certificate.  "": generate new
+		"pkey_data":"...",
+	}
+
+Response:
+
+	200 OK
+
+
 ## Log-in page

 After user completes the steps of installation wizard, he must log in into dashboard using his name and password.  After user successfully logs in, he gets the Cookie which allows the server to authenticate him next time without password.  After the Cookie is expired, user needs to perform log-in operation again.
@@ -1977,48 +1874,3 @@ Check if host name is blocked by SB/PC service:
 		sha256(host.com)[0..1] -> hashes[0],hashes[1],...
 		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
-
-AGH can add IP addresses of the specified in configuration domain names to an ipset list.
-
-Prepare: user creates an ipset list and configures AGH for using it.
-
-	1. User --( ipset create my_ipset hash:ip ) -> OS
-	2. User --( ipset: host.com,host2.com/my_ipset )-> AGH
-
-		Syntax:
-
-			ipset: "DOMAIN[,DOMAIN].../IPSET1_NAME[,IPSET2_NAME]..."
-
-		IPv4 addresses are added to an ipset list with `ipv4` family, IPv6 addresses - to `ipv6` ipset list.
-
-Run-time: AGH adds IP addresses of a domain name to a corresponding ipset list.
-
-	1. AGH --( resolve host.com )-> upstream
-	2. AGH <-( host.com:[1.1.1.1,2.2.2.2] )-- upstream
-	3. AGH --( ipset.add(my_ipset, [1.1.1.1,2.2.2.2] ))-> OS
--- a/14
+++ b/14
@@ -56,10 +56,10 @@ ifeq ($(CHANNEL),edge)
 endif

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

 # Version properties
@@ -108,12 +108,6 @@ ifndef DOCKER_IMAGE_NAME
 $(error DOCKER_IMAGE_NAME value is not set)
 endif

-# OS-specific flags
-TEST_FLAGS := -race
-ifeq ($(OS),Windows_NT)
-	TEST_FLAGS :=
-endif
-
 .PHONY: all build client client-watch docker lint lint-js lint-go test dependencies clean release docker-multi-arch
 all: build

@@ -152,7 +146,7 @@ docker:

 lint: lint-js lint-go

-lint-js: dependencies
+lint-js:
 	@echo Running js linter
 	npm --prefix client run lint

@@ -164,7 +158,7 @@ test:
 	@echo Running JS unit-tests
 	npm run test --prefix client
 	@echo Running Go unit-tests
-	go test $(TEST_FLAGS) -v -coverprofile=coverage.txt -covermode=atomic ./...
+	go test -race -v -bench=. -coverprofile=coverage.txt -covermode=atomic ./...

 ci: client_with_deps
 	go mod download
--- a/README.md
+++ b/README.md
@@ -20,11 +20,8 @@
    <a href="https://goreportcard.com/report/AdguardTeam/AdGuardHome">
      <img src="https://goreportcard.com/badge/github.com/AdguardTeam/AdGuardHome" alt="Go Report Card" />
    </a>
-    <a href="https://hub.docker.com/r/adguard/adguardhome">
-        <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/adguard/adguardhome.svg?maxAge=604800" />
-    </a>
-    <a href="https://hub.docker.com/r/adguard/adguardhome">
-        <img alt="Docker Stars" src="https://img.shields.io/docker/stars/adguard/adguardhome.svg?maxAge=604800" />
+    <a href="https://golangci.com/r/github.com/AdguardTeam/AdGuardHome">
+      <img src="https://golangci.com/badges/github.com/AdguardTeam/AdGuardHome.svg" alt="GolangCI" />
    </a>
    <br />
    <a href="https://github.com/AdguardTeam/AdGuardHome/releases">
@@ -33,6 +30,12 @@
    <a href="https://snapcraft.io/adguard-home">
        <img alt="adguard-home" src="https://snapcraft.io/adguard-home/badge.svg" />
    </a>
+    <a href="https://hub.docker.com/r/adguard/adguardhome">
+        <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/adguard/adguardhome.svg?maxAge=604800" />
+    </a>
+    <a href="https://hub.docker.com/r/adguard/adguardhome">
+        <img alt="Docker Stars" src="https://img.shields.io/docker/stars/adguard/adguardhome.svg?maxAge=604800" />
+    </a>
 </p>

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

-### 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
+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.

 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)
@@ -229,7 +217,7 @@ You may need to prepare before using these builds:

 You are welcome to fork this repository, make your changes and submit a pull request — https://github.com/AdguardTeam/AdGuardHome/pulls

-Please note that we don't expect people to contribute to both UI and golang parts of the program simultaneously. Ideally, the golang part is implemented first, i.e. configuration, API, and the functionality itself. The UI part can be implemented later in a different pull request by a different person.
+Please note, that we don't expect people to contribute to both UI and golang parts of the program simultaneously. Ideally, the golang part is implemented first, i.e. configuration, API, and the functionality itself. The UI part can be implemented later in a different pull request by a different person.

 <a id="test-unstable-versions"></a>
 ### Test unstable versions
@@ -243,17 +231,13 @@ 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. Use the automated installation script or look for the available builds below.
+3. Standalone builds. Look for the available builds below.

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

-Edge:
-```
-curl -sSL https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s edge
-```
+1. You can either install a beta or edge version of AdGuard Home which we update periodically. If you're already using stable version of AdGuard Home, just replace the executable 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.

 * 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/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -1,15 +1,18 @@
 {
    "parser": "babel-eslint",
+
    "extends": [
        "plugin:react/recommended",
        "airbnb-base"
    ],
+
    "env": {
        "jest": true,
        "node": true,
        "browser": true,
        "commonjs": true
    },
+
    "settings": {
        "react": {
            "pragma": "React",
@@ -21,65 +24,35 @@
            }
        }
    },
+
    "rules": {
-        "indent": [
-            "error",
-            4,
-            {
-                "SwitchCase": 1,
-                "VariableDeclarator": 1,
-                "outerIIFEBody": 1,
-                "FunctionDeclaration": {
-                    "parameters": 1,
-                    "body": 1
-                },
-                "FunctionExpression": {
-                    "parameters": 1,
-                    "body": 1
-                },
-                "CallExpression": {
-                    "arguments": 1
-                },
-                "ArrayExpression": 1,
-                "ObjectExpression": 1,
-                "ImportDeclaration": 1,
-                "flatTernaryExpressions": false,
-                "ignoredNodes": [
-                    "JSXElement",
-                    "JSXElement > *",
-                    "JSXAttribute",
-                    "JSXIdentifier",
-                    "JSXNamespacedName",
-                    "JSXMemberExpression",
-                    "JSXSpreadAttribute",
-                    "JSXExpressionContainer",
-                    "JSXOpeningElement",
-                    "JSXClosingElement",
-                    "JSXText",
-                    "JSXEmptyExpression",
-                    "JSXSpreadChild"
-                ],
-                "ignoreComments": false
-            }
-        ],
+        "indent": ["error", 4, {
+            "SwitchCase": 1,
+            "VariableDeclarator": 1,
+            "outerIIFEBody": 1,
+            "FunctionDeclaration": {
+                "parameters": 1,
+                "body": 1
+            },
+            "FunctionExpression": {
+                "parameters": 1,
+                "body": 1
+            },
+            "CallExpression": {
+                "arguments": 1
+            },
+            "ArrayExpression": 1,
+            "ObjectExpression": 1,
+            "ImportDeclaration": 1,
+            "flatTernaryExpressions": false,
+            "ignoredNodes": ["JSXElement", "JSXElement > *", "JSXAttribute", "JSXIdentifier", "JSXNamespacedName", "JSXMemberExpression", "JSXSpreadAttribute", "JSXExpressionContainer", "JSXOpeningElement", "JSXClosingElement", "JSXText", "JSXEmptyExpression", "JSXSpreadChild"],
+            "ignoreComments": false
+        }],
        "class-methods-use-this": "off",
        "no-shadow": "off",
        "camelcase": "off",
-        "no-console": [
-            "warn",
-            {
-                "allow": [
-                    "warn",
-                    "error"
-                ]
-            }
-        ],
-        "import/no-extraneous-dependencies": [
-            "error",
-            {
-                "devDependencies": true
-            }
-        ],
+        "no-console": ["warn", { "allow": ["warn", "error"] }],
+        "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
        "import/prefer-default-export": "off",
        "no-alert": "off"
    }
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1356,6 +1356,17 @@
      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
    },
+    "@hot-loader/react-dom": {
+      "version": "16.13.0",
+      "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.13.0.tgz",
+      "integrity": "sha512-lJZrmkucz2MrQJTQtJobx5MICXcfQvKihszqv655p557HPi0hMOWxrNpiHv3DWD8ugNWjtWcVWqRnFvwsHq1mQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.19.0"
+      }
+    },
    "@istanbuljs/load-nyc-config": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -7401,21 +7412,11 @@
      "dev": true
    },
    "i18next": {
-      "version": "19.6.2",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-19.6.2.tgz",
-      "integrity": "sha512-Zyd/Z32FY+sD+Eg6sLj5DeDSlrIN3WZ4onuOBRGcjDx/rvodsyUZ9TJ2Y+3aD9Vu8MPbiMU2WesIER/rs1ioyw==",
+      "version": "19.4.4",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-19.4.4.tgz",
+      "integrity": "sha512-ofaHtdsDdX3A5nYur1HWblB7J4hIcjr2ACdnwTAJgc8hTfPbyzZfGX0hVkKpI3vzDIgO6Uzc4v1ffW2W6gG6zw==",
      "requires": {
-        "@babel/runtime": "^7.10.1"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.10.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.5.tgz",
-          "integrity": "sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
+        "@babel/runtime": "^7.3.1"
      }
    },
    "i18next-browser-languagedetector": {
@@ -10773,24 +10774,6 @@
        "yallist": "^4.0.0"
      }
    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
    "mixin-deep": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -12176,9 +12159,9 @@
      }
    },
    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
      "dev": true,
      "requires": {
        "end-of-stream": "^1.1.0",
@@ -12194,18 +12177,6 @@
        "duplexify": "^3.6.0",
        "inherits": "^2.0.3",
        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
      }
    },
    "punycode": {
@@ -12377,9 +12348,9 @@
      }
    },
    "react-i18next": {
-      "version": "11.7.2",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.7.2.tgz",
-      "integrity": "sha512-Djj3K3hh5Tecla2CI9rLO3TZBYGMFrGilm0JY4cLofAQONCi5TK6nVmUPKoB59n1ZffgjfgJt6zlbE9aGF6Q0Q==",
+      "version": "11.4.0",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.4.0.tgz",
+      "integrity": "sha512-lyOZSSQkif4H9HnHN3iEKVkryLI+WkdZSEw3VAZzinZLopfYRMHVY5YxCopdkXPLEHs6S5GjKYPh3+j0j336Fg==",
      "requires": {
        "@babel/runtime": "^7.3.1",
        "html-parse-stringify2": "2.0.1"
@@ -13300,13 +13271,10 @@
      }
    },
    "serialize-javascript": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
+      "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==",
+      "dev": true
    },
    "serve-index": {
      "version": "1.9.1",
@@ -14641,16 +14609,16 @@
      }
    },
    "terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
+      "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
      "dev": true,
      "requires": {
        "cacache": "^12.0.2",
        "find-cache-dir": "^2.1.0",
        "is-wsl": "^1.1.0",
        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
+        "serialize-javascript": "^2.1.2",
        "source-map": "^0.6.1",
        "terser": "^4.1.2",
        "webpack-sources": "^1.4.0",
@@ -14710,6 +14678,15 @@
            "path-exists": "^3.0.0"
          }
        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
        "make-dir": {
          "version": "2.1.0",
          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -14720,6 +14697,24 @@
            "semver": "^5.6.0"
          }
        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "dev": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
        "p-limit": {
          "version": "2.3.0",
          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -14759,15 +14754,22 @@
            "find-up": "^3.0.0"
          }
        },
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
          "dev": true,
          "requires": {
-            "randombytes": "^2.1.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
          }
        },
+        "serialize-javascript": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+          "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+          "dev": true
+        },
        "source-map": {
          "version": "0.6.1",
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -14782,6 +14784,12 @@
          "requires": {
            "figgy-pudding": "^3.5.1"
          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
        }
      }
    },
--- a/client/package.json
+++ b/client/package.json
@@ -13,11 +13,12 @@
        "test:watch": "jest --watch"
    },
    "dependencies": {
+        "@hot-loader/react-dom": "^16.13.0",
        "@nivo/line": "^0.49.1",
        "axios": "^0.19.2",
        "classnames": "^2.2.6",
        "date-fns": "^1.29.0",
-        "i18next": "^19.6.2",
+        "i18next": "^19.4.4",
        "i18next-browser-languagedetector": "^4.2.0",
        "ipaddr.js": "^1.9.1",
        "js-yaml": "^3.14.0",
@@ -28,7 +29,7 @@
        "react": "^16.13.1",
        "react-click-outside": "^3.0.1",
        "react-dom": "^16.13.1",
-        "react-i18next": "^11.7.2",
+        "react-i18next": "^11.4.0",
        "react-modal": "^3.11.2",
        "react-popper-tooltip": "^2.11.1",
        "react-redux": "^7.2.0",
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -1,571 +0,0 @@
-{
-    "client_settings": "Налады кліентаў",
-    "example_upstream_reserved": "Вы можаце паказаць DNS-сервер <0>для канкрэтнага дамена(аў)</0>",
-    "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту",
-    "parallel_requests": "Паралельныя запыты",
-    "load_balancing": "Размеркаванне нагрузкі",
-    "load_balancing_desc": "Запытвайце па адным серверы за раз. AdGuard Home будзе выкарыстоўваць выпадковы алгарытм для выбару сервера, так што самы хуткі сервер будзе выкарыстоўвацца часцей.",
-    "bootstrap_dns": "Bootstrap DNS-серверы",
-    "bootstrap_dns_desc": "Bootstrap DNS-серверы выкарыстоўваюцца для пошуку IP-адрасоў DoH/DoT сервераў, якія вы паказалі.",
-    "check_dhcp_servers": "Праверыць DHCP-серверы",
-    "save_config": "Захаваць канфігурацыю",
-    "enabled_dhcp": "DHCP-сервер улучаны",
-    "disabled_dhcp": "DHCP-сервер адключаны",
-    "unavailable_dhcp": "DHCP недаступна",
-    "unavailable_dhcp_desc": "AdGuard Home не можа запусціць DHCP-сервер на вашай АС",
-    "dhcp_title": "DHCP-сервер (эксперыментальны!)",
-    "dhcp_description": "Калі ваш роўтар не падае налады DHCP, вы можаце выкарыстоўваць уласны ўбудаваны DHCP-сервер AdGuard.",
-    "dhcp_enable": "Уключыць DHCP-сервер",
-    "dhcp_disable": "Адключыць DHCP-сервер",
-    "dhcp_not_found": "Актыўныя DHCP-серверы ў сеціве не знойдзены. Вы можаце бяспечна ўключыць убудаваны сервер DHCP.",
-    "dhcp_found": "Некаторыя актыўныя DHCP-серверы знойдзены ў сеціве. Улучэнне ўбудаванага DHCP-сервера небяспечнае.",
-    "dhcp_leases": "Арэнда DHCP",
-    "dhcp_static_leases": "Статычныя арэнды DHCP",
-    "dhcp_leases_not_found": "Арэнда DHCP не выяўлена",
-    "dhcp_config_saved": "Канфігурацыя DHCP-сервера паспяхова захавана",
-    "dhcp_ipv4_settings": "Налады DHCP IPv4",
-    "dhcp_ipv6_settings": "Налады DHCP IPv6",
-    "form_error_required": "Абавязковае поле",
-    "form_error_ip4_format": "Няслушны фармат IPv4",
-    "form_error_ip6_format": "Няслушны фармат IPv6",
-    "form_error_ip_format": "Няслушны фармат IP-адраса",
-    "form_error_mac_format": "Некарэктны фармат MAC",
-    "form_error_client_id_format": "Няслушны фармат ID кліента",
-    "form_error_positive": "Павінна быць больш 0",
-    "form_error_negative": "Павінна быць не менш 0",
-    "range_end_error": "Павінен перавышаць пачатак дыяпазону",
-    "dhcp_form_gateway_input": "IP-адрас шлюза",
-    "dhcp_form_subnet_input": "Маска падсеціва",
-    "dhcp_form_range_title": "Дыяпазон IP-адрасоў",
-    "dhcp_form_range_start": "Пачатак дыяпазону",
-    "dhcp_form_range_end": "Конец диапазона",
-    "dhcp_form_lease_title": "Час арэнды DHCP (у секундах)",
-    "dhcp_form_lease_input": "Тэрмін арэнды",
-    "dhcp_interface_select": "Выбраць інтэрфейс DHCP",
-    "dhcp_hardware_address": "Апаратны адрас",
-    "dhcp_ip_addresses": "IP-адрасы",
-    "ip": "IP-адрас",
-    "dhcp_table_hostname": "Імя хаста",
-    "dhcp_table_expires": "Мінае",
-    "dhcp_warning": "Калі вы ўсё адно хочаце ўключыць DHCP-сервер, пераканайцеся, што ў сеціве больш няма актыўных DHCP-сервераў. Інакш гэта можа зламаць доступ у сеціва для падлучаных прылад!",
-    "dhcp_error": "Мы не змаглі вызначыць наяўнасць іншых DHCP-сервераў у сеціве.",
-    "dhcp_static_ip_error": "Для таго, каб выкарыстоўваць DHCP-сервер, павінен быць усталяваны статычны IP-адрас. Мы не змаглі вызначыць, ці выкарыстоўвае гэты інтэрфейс сеціва статычны IP-адрас. Калі ласка, усталюйце яго ручна.",
-    "dhcp_dynamic_ip_found": "Ваша сістэма выкарыстоўвае дынамічны IP-адрас для інтэрфейсу <0>{{interfaceName}}</0>. Каб выкарыстоўваць DHCP-сервер трэба ўсталяваць статычны IP-адрас. Ваш бягучы IP-адрас – <0>{{ipAddress}}</0>. Мы аўтаматычна ўсталюем яго як статычны, калі вы націснеце кнопку Ўключыць DHCP.",
-    "dhcp_lease_added": "Статычная арэнда \"{{key}}\" паспяхова дададзена",
-    "dhcp_lease_deleted": "Статычная арэнда \"{{key}}\" паспяхова выдалена",
-    "dhcp_new_static_lease": "Новая статычная арэнда",
-    "dhcp_static_leases_not_found": "Не знойдзена статычных арэнд DHCP",
-    "dhcp_add_static_lease": "Дадаць статычную арэнду",
-    "dhcp_reset": "Вы ўпэўнены, што хочаце скінуць налады DHCP?",
-    "country": "Краіна",
-    "city": "Горад",
-    "delete_confirm": "Вы ўпэўнены, што хочаце выдаліць \"{{key}}\"?",
-    "form_enter_hostname": "Увядзіце імя хаста",
-    "error_details": "Дэталізацыя памылкі",
-    "response_details": "Дэталі адказу",
-    "request_details": "Інфармацыя пра запыт",
-    "client_details": "Дэталі кліента",
-    "details": "Дэталі",
-    "back": "Назад",
-    "dashboard": "Панэль кіравання",
-    "settings": "Налады",
-    "filters": "Фільтры",
-    "filter": "Фільтр",
-    "query_log": "Часопіс",
-    "compact": "Компактный",
-    "nothing_found": "Нічога не знойдзена",
-    "faq": "FAQ",
-    "version": "версія",
-    "address": "Адрас",
-    "protocol": "Пратакол",
-    "on": "УКЛ",
-    "off": "Выкл",
-    "copyright": "Усе правы захаваныя",
-    "homepage": "Галоўная",
-    "report_an_issue": "Паведаміць пра праблему",
-    "privacy_policy": "Палітыка прыватнасці",
-    "enable_protection": "Уключыць абарону",
-    "enabled_protection": "Абарона ўкл.",
-    "disable_protection": "Адключыць абарону",
-    "disabled_protection": "Абарона выкл.",
-    "refresh_statics": "Абнавіць статыстыку",
-    "dns_query": "DNS-запыты",
-    "blocked_by": "<0>Заблакавана фільтрамі</0>",
-    "stats_malware_phishing": "Заблакаваныя шкодныя і фішынгавыя сайты",
-    "stats_adult": "Заблакаваныя \"дарослыя\" сайты",
-    "stats_query_domain": "Часта запытаныя дамены",
-    "for_last_24_hours": "за 24 гадзіны",
-    "for_last_days": "за апошні {{count}} дзень",
-    "for_last_days_plural": "за апошнія {{count}} дзён",
-    "no_domains_found": "Дамены не знойдзены",
-    "requests_count": "Колькасць запытаў",
-    "top_blocked_domains": "Часта блакаваныя дамены",
-    "top_clients": "Частыя кліенты",
-    "no_clients_found": "Кліентаў не знойдзена",
-    "general_statistics": "Агульная статыстыка",
-    "number_of_dns_query_days": "Колькасць DNS-запытаў за апошні {{count}} дзень",
-    "number_of_dns_query_days_plural": "Колькасць DNS запытаў, апрацаваных за апошнія {{count}} дзён",
-    "number_of_dns_query_24_hours": "Колькасць DNS-запытаў за 24 гадзіны",
-    "number_of_dns_query_blocked_24_hours": "Колькасць DNS-запытаў, заблакаваных фільтрамі і блок-спісамі",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Колькасць DNS-запытаў, заблакаваных модулем Антыфішынгу AdGuard",
-    "number_of_dns_query_blocked_24_hours_adult": "Колькасць заблакаваных \"сайтаў для дарослых\"",
-    "enforced_save_search": "Ужыты бяспечны пошук",
-    "number_of_dns_query_to_safe_search": "Колькасць запытаў DNS для пошукавых сістэм, для якіх быў ужыты Бяспечны пошук",
-    "average_processing_time": "Сярэдні час апрацоўкі запыту",
-    "average_processing_time_hint": "Сярэдні час для апрацоўкі запыту DNS  у мілісекундах",
-    "block_domain_use_filters_and_hosts": "Блакаваць дамены з выкарыстаннем фільтраў і файлаў хастоў",
-    "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў <a href='#filters'> \"Фільтрах\"</a>.",
-    "use_adguard_browsing_sec": "Выкарыстаць Бяспечную навігацыю AdGuard",
-    "use_adguard_browsing_sec_hint": "AdGuard Home праверыць, ці ўлучаны дамен у ўэб-службу бяспекі браўзара. Ён будзе выкарыстоўваць API, каб выканаць праверку: на сервер адсылаецца толькі кароткі прэфікс імя дамена SHA256.",
-    "use_adguard_parental": "Ужывайце модуль Бацькоўскага кантролю AdGuard ",
-    "use_adguard_parental_hint": "AdGuard Home праверыць, ці ўтрымвае дамен матэрыялы 18+. Ён выкарыстоўвае той жа API для забеспячэння прыватнасці, што і ўэб-служба бяспекі браўзара.",
-    "enforce_safe_search": "Узмацніць бяспечны пошук",
-    "enforce_save_search_hint": "AdGuard Home можа забяспечыць бяспечны пошук у наступных пошукавых сістэмах: Google, Youtube, Bing, DuckDuckGo, Yandex і Pixabay.",
-    "no_servers_specified": "Не паказаных сервераў",
-    "general_settings": "Асноўныя налады",
-    "dns_settings": "Налады DNS",
-    "dns_blocklists": "Чорныя спісы DNS",
-    "dns_allowlists": "Белыя спісы DNS",
-    "dns_blocklists_desc": "AdGuard Home будзе блакаваць дамены з чорных спісаў.",
-    "dns_allowlists_desc": "Дамены з белых спісаў DNS будуць дазволены, нават калі яны знаходзяцца ў любым з чорных спісаў.",
-    "custom_filtering_rules": "Карыстацкія правілы фільтрацыі",
-    "encryption_settings": "Налады шыфравання",
-    "dhcp_settings": "Налады DHCP",
-    "upstream_dns": "Upstream DNS-серверы",
-    "upstream_dns_help": "Увядзіце адрасы сервераў па адным у радку. <a>Даведацца больш </a> пра наладжванне DNS-сервераў.",
-    "test_upstream_btn": "Тэст upstream сервераў",
-    "upstreams": "Upstreams",
-    "apply_btn": "Ужыць",
-    "disabled_filtering_toast": "Фільтрацыя выкл.",
-    "enabled_filtering_toast": "Фільтрацыя ўкл.",
-    "disabled_safe_browsing_toast": "Бяспечная навігацыя выкл.",
-    "enabled_safe_browsing_toast": "Бяспечная навігацыя ўкл.",
-    "disabled_parental_toast": "Бацькоўскі кантроль выкл.",
-    "enabled_parental_toast": "Бацькоўскі кантроль укл.",
-    "disabled_safe_search_toast": "Бяспечны пошук выкл.",
-    "enabled_save_search_toast": "Бяспечны пошук укл.",
-    "enabled_table_header": "УКЛ.",
-    "name_table_header": "Імя",
-    "list_url_table_header": "URL-адрас спіса",
-    "rules_count_table_header": "Колькасць правілаў:",
-    "last_time_updated_table_header": "Апошняе абнаўленне",
-    "actions_table_header": "Дзеянні",
-    "request_table_header": "Запыт",
-    "edit_table_action": "Рэдагаваць",
-    "delete_table_action": "Выдаліць",
-    "elapsed": "Прайшло",
-    "filters_and_hosts_hint": "AdGuard Home распазнае базавыя правілы блакавання і сінтаксіс файлаў hosts.",
-    "no_blocklist_added": "Чорныя спісы не дададзены",
-    "no_whitelist_added": "Белыя спісы не дададзены",
-    "add_blocklist": "Дадаць чорны спіс",
-    "add_allowlist": "Дадаць белы спіс",
-    "cancel_btn": "Адмена",
-    "enter_name_hint": "Увядзіце імя",
-    "enter_url_or_path_hint": "Увядзіце URL-адрас ці абсалютны шлях да спіса",
-    "check_updates_btn": "Праверыць абнаўленні",
-    "new_blocklist": "Новы чорны спіс",
-    "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": "Уводзьце па адным правіле на радок. Вы можаце выкарыстоўваць правілы блакавання ці сінтаксіс файлаў hosts.",
-    "examples_title": "Прыклады",
-    "example_meaning_filter_block": "заблакаваць доступ да дамена example.org і ўсім яго паддаменам",
-    "example_meaning_filter_whitelist": "адблакаваць доступ да дамена example.org і ўсім яго паддаменам",
-    "example_meaning_host_block": "Зараз AdGuard Home верне 127.0.0.1 для дамена example.org (але не для яго паддаменаў).",
-    "example_comment": "! Так можна дадаваць апісанне",
-    "example_comment_meaning": "каментар",
-    "example_comment_hash": "# І вось так таксама",
-    "example_regex_meaning": "блакуе доступ да даменаў, што адпавядаюць <0>зададзенаму рэгулярнаму выразу</0>",
-    "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_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": "Усе спісы ўжо абноўлены",
-    "updated_upstream_dns_toast": "Upstream DNS-серверы абноўлены",
-    "dns_test_ok_toast": "Паказаныя серверы DNS працуюць карэктна",
-    "dns_test_not_ok_toast": "Сервер \"{{key}}\": немагчыма выкарыстоўваць, праверце слушнасць напісання",
-    "unblock": "Адблакаваць",
-    "block": "Заблакаваць",
-    "time_table_header": "Час",
-    "date": "Дата",
-    "domain_name_table_header": "Дамен",
-    "domain_or_client": "Дамен ці кліент",
-    "type_table_header": "Тып",
-    "response_table_header": "Адказ",
-    "response_code": "Код адказа",
-    "client_table_header": "Кліент",
-    "empty_response_status": "Пуста",
-    "show_all_filter_type": "Паказаць усё",
-    "show_filtered_type": "Паказаць адфільтраваныя",
-    "no_logs_found": "Логі не знойдзены",
-    "refresh_btn": "Абнавіць",
-    "previous_btn": "Назад",
-    "next_btn": "Наперад",
-    "loading_table_status": "Загрузка...",
-    "page_table_footer_text": "Старонка",
-    "rows_table_footer_text": "радкоў",
-    "updated_custom_filtering_toast": "Занесены змены ў карыстацкія правілы",
-    "rule_removed_from_custom_filtering_toast": "Карыстацкае правіла выдалена: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Карыстацкае правіла дададзена: {{rule}}",
-    "query_log_response_status": "Статус: {{value}}",
-    "query_log_filtered": "Адфільтравана з дапамогай {{filter}}",
-    "query_log_confirm_clear": "Вы ўпэўнены, што хочаце ачысціць увесь часопіс запытаў?",
-    "query_log_cleared": "Часопіс запытаў паспяхова вычышчаны",
-    "query_log_updated": "Часопіс запытаў паспяхова абноўлены",
-    "query_log_clear": "Ачысціць часопіс запытаў",
-    "query_log_retention": "Захаванне часопіса запытаў",
-    "query_log_enable": "Уключыць часопіс",
-    "query_log_configuration": "Налада часопіса",
-    "query_log_disabled": "Часопіс запытаў выключаны, яго можна ўключыць у <0>наладах</0>",
-    "query_log_strict_search": "Ужывайце падвойныя двукоссі для строгага пошуку",
-    "query_log_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання запытаў? Пры скарачэнні інтэрвалу дадзеныя могуць быць згублены",
-    "anonymize_client_ip": "Ананімізацыя IP-адрасы кліента",
-    "anonymize_client_ip_desc": "Не захоўвайце поўны IP-адрас кліента ў часопісах і статыстыцы",
-    "dns_config": "Налады DNS-сервера",
-    "dns_cache_config": "Налада кэша DNS",
-    "dns_cache_config_desc": "Тут можна наладзіць кэш DNS",
-    "blocking_mode": "Рэжым блакавання",
-    "default": "Стандартны",
-    "nxdomain": "NXDOMAIN",
-    "null_ip": "Нулёвы IP",
-    "custom_ip": "Свой IP",
-    "blocking_ipv4": "Блакаванне IPv4",
-    "blocking_ipv6": "Блакаванне IPv6",
-    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_tls": "DNS-over-TLS",
-    "plain_dns": "Нешыфраваны DNS",
-    "form_enter_rate_limit": "Увядзіце rate limit",
-    "rate_limit": "Ограничение скорости",
-    "edns_enable": "Уключыць адпраўленне EDNS Client Subnet",
-    "edns_cs_desc": "Калі ўключыць гэту опцыю, AdGuard Home будзе адпраўляць падсеціва кліентаў на DNS-сервера.",
-    "rate_limit_desc": "Абмежаванне на колькасць запытаў у секунду для кожнага кліента (0 — неабмежавана)",
-    "blocking_ipv4_desc": "IP-адрас, што вяртаецца пры блакаванню A-запыту",
-    "blocking_ipv6_desc": "IP-адрас, што вяртаецца пры блакаванню AAAA-запыту",
-    "blocking_mode_default": "Стандартны: Адказвае з REFUSED, калі заблакавана правілам у стылі Adblock; адказвае з IP-адрасам, паказаным у правіле, калі заблакавана правілам у стылі /etc/hosts",
-    "blocking_mode_nxdomain": "NXDOMAIN: Адказвае з кодам NXDOMAIN\n",
-    "blocking_mode_null_ip": "Нулёвы IP: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA)",
-    "blocking_mode_custom_ip": "Карыстацкі IP: Адказвае з ручна наладжаным IP-адрасам",
-    "upstream_dns_client_desc": "Калі пакінуць поле пустым, AdGuard Home будзе звяртацца да сервераў, паказаных у <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-сервер, што блакуе рэкламу і трэкінг. Яго мэта – даць вам магчымасць кантраляваць усю ваша сеціва і ўсе падлучаныя прылады. Ён не патрабуе ўсталёўкі кліенцкіх праграм.",
-    "install_settings_title": "Ўэб-інтэрфейс адміністравання",
-    "install_settings_listen": "Інтэрфейс сеціва",
-    "install_settings_port": "Порт",
-    "install_settings_interface_link": "Ваш ўэб-інтэрфейс адміністравання AdGuard Home будзе даступны па наступных адрасах:",
-    "form_error_port": "Увядзіце карэктны порт",
-    "install_settings_dns": "DNS-сервер",
-    "install_settings_dns_desc": "Вам будзе трэба наладзіць свае прылады ці роўтар на выкарыстанне DNS-сервера на адным з наступных адрасоў:",
-    "install_settings_all_interfaces": "Усе інтэрфейсы",
-    "install_auth_title": "Аўтарызацыя",
-    "install_auth_desc": "Настойліва рэкамендуецца наладзіць аўтэнтыфікацыю паролем для ўэб-інтэрфейсу AdGuard Home. Нават калі ён даступны толькі ў вашай лакальнай сетцы, важна абараніць яго ад неабмежаванага доступу.",
-    "install_auth_username": "Імя карыстача",
-    "install_auth_password": "Пароль",
-    "install_auth_confirm": "Пацвердзіць пароль",
-    "install_auth_username_enter": "Увядзіце імя карыстача",
-    "install_auth_password_enter": "Увядзіце пароль",
-    "install_step": "Крок",
-    "install_devices_title": "Наладзьце вашы прылады",
-    "install_devices_desc": "Для таго, каб выкарыстоўваць AdGuard Home, вам трэба наладзіць вашы прылады на яго выкарыстанне.",
-    "install_submit_title": "Віншуем!",
-    "install_submit_desc": "Працэдура налады завершана і вы гатовы пачаць выкарыстанне AdGuard Home.",
-    "install_devices_router": "Роўтар",
-    "install_devices_router_desc": "Такая наладка аўтаматычна пакрые ўсе прылады, што выкарыстоўваюць ваш хатні роўтар, і вам не трэба будзе наладжваць кожнае з іх у асобнасці.",
-    "install_devices_address": "DNS-сервер AdGuard Home даступны па наступных адрасах",
-    "install_devices_router_list_1": "Адкрыйце налады вашага рутара. Звычайна вы можаце адкрыць іх у вашым браўзары (напрыклад, http://192.168.0.1/ ці http://192.168.1.1/). Вас могуць папрасіць увесці пароль. Калі вы не помніце яго, пароль часта можна скінуць, націснуўшы на кнопку на самым роўтары. Некаторыя роўтары патрабуюць адмысловага дадатку, які ў гэтым выпадку павінен быць ужо ўсталявана на ваш кампутар ці тэлефон.",
-    "install_devices_router_list_2": "Знайдзіце налады DHCP ці DNS. Знайдзіце літары \"DNS\" поруч з тэкставым полем, у якое можна ўвесці два ці тры шэрагі лічбаў, падзеленых на 4 групы ад адной до трох лічбаў.",
-    "install_devices_router_list_3": "Увядзіце туды адрас вашага AdGuard Home.",
-    "install_devices_router_list_4": "Вы не можаце ўсталяваць уласны DNS-сервер на некаторых тыпах маршрутызатараў. У гэтым выпадку можа дапамагчы налада AdGuard Home у якасці <a href='#dhcp'>DHCP-сервера</a>. У адваротным выпадку вам трэба звярнуцца да кіраўніцтва па наладзе 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": "Знайдзіце ў спісе пункт \"IP версіі 4 (TCP/IP)\", вылучыце яго і потым ізноў націсніце \"Уласцівасці\".",
-    "install_devices_windows_list_6": "Абярыце \"Выкарыстаць наступныя адрасы DNS-сервераў\" і ўвядзіце адрас AdGuard Home.",
-    "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": "У меню кіравання націсніце абразок «Налады».",
-    "install_devices_android_list_2": "Абярыце пункт «Wi-Fi». З'явіцца экран са спісам даступных сетак (наладка DNS недаступная для мабільных сетак).",
-    "install_devices_android_list_3": "Доўгім націскам па бягучым сеціве выклічце меню, у якім націсніце «Змяніць сеціва».",
-    "install_devices_android_list_4": "На некаторых прыладах можа запатрабавацца націснуць «Пашыраныя налады». Каб атрымаць магчымасць змяняць налады DNS, вам запатрабуецца перамкнуць «Налады IP» на «Карыстацкія».",
-    "install_devices_android_list_5": "Зараз можна змяніць палі «DNS 1» і «DNS 2». Увядзіце ў іх адрасы AdGuard Home.",
-    "install_devices_ios_list_1": "Увайдзіце ў меню налад прылады.",
-    "install_devices_ios_list_2": "Абярыце пункт «Wi-Fi» (для мабільных сетак ручная наладка DNS немагчыма).",
-    "install_devices_ios_list_3": "Націсніце на назву сетцы, да якой прылада падлучана ў дадзены момант.",
-    "install_devices_ios_list_4": "У поле «DNS» увядзіце ўвядзіце адрасы AdGuard Home.",
-    "get_started": "Паехалі",
-    "next": "Далей",
-    "open_dashboard": "Адкрыць Панэль кіравання",
-    "install_saved": "Паспяхова захавана",
-    "encryption_title": "Шыфраванне",
-    "encryption_desc": "Падтрымка шыфравання (HTTPS/TLS) для DNS і ўэб-інтэрфейсу адміністравання",
-    "encryption_config_saved": "Налады шыфравання захаваны",
-    "encryption_server": "Імя сервера",
-    "encryption_server_enter": "Увядзіце ваша даменавае імя",
-    "encryption_server_desc": "Для выкарыстання HTTPS вам трэба ўвесці імя сервера, якое падыходзіць вашаму SSL-сертыфікату.",
-    "encryption_redirect": "Аўтаматычна перанакіроўваць на HTTPS",
-    "encryption_redirect_desc": "Калі ўлучана, AdGuard Home будзе аўтаматычна перанакіроўваць вас з HTTP на HTTPS адрас.",
-    "encryption_https": "Порт HTTPS",
-    "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_certificates": "Сертыфікаты",
-    "encryption_certificates_desc": "Для выкарыстання шыфравання вам трэба падаць валідны ланцужок SSL-сертыфікатаў для вашага дамена. Вы можаце атрымаць дармовы сертыфікат на <0>{{link}}</0> ці вы можаце купіць яго ў аднаго з давераных Цэнтраў Сертыфікацыі.",
-    "encryption_certificates_input": "Скапіюйце сюды сертыфікаты ў PEM-кадоўцы.",
-    "encryption_status": "Статус",
-    "encryption_expire": "Мінае",
-    "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_chain_valid": "Ланцужок сертыфікатаў валідны",
-    "encryption_chain_invalid": "Ланцужок сертыфікатаў не валідны",
-    "encryption_key_valid": "Валідны {{type}} прыватны ключ",
-    "encryption_key_invalid": "Нявалідны {{type}} прыватны ключ",
-    "encryption_subject": "Суб'ект",
-    "encryption_issuer": "Выдавец",
-    "encryption_hostnames": "Імёны хастоў",
-    "encryption_reset": "Вы ўпэўнены, што хочаце скінуць налады шыфравання?",
-    "topline_expiring_certificate": "Ваш SSL-сертыфікат хутка мінае. Абновіце <0>Налады шыфравання</0>.",
-    "topline_expired_certificate": "Ваш SSL-сертыфікат мінуў. Абновіце <0>Налады шыфравання</0>.",
-    "form_error_port_range": "Увядзіце значэнне порта з інтэрвалу 80-65535",
-    "form_error_port_unsafe": "Гэта небяспечны порт",
-    "form_error_equal": "Не павінны быць роўныя",
-    "form_error_password": "Паролі не супадаюць",
-    "reset_settings": "Скінуць налады",
-    "update_announcement": "AdGuard Home {{version}} ужо даступная! <0>Націсніце сюды</0>, каб даведацца больш.",
-    "setup_guide": "Інструкцыя па наладзе",
-    "dns_addresses": "Адрасы DNS",
-    "dns_start": "DNS-сервер запускаецца",
-    "dns_status_error": "Памылка пры атрыманні стану DNS-сервера",
-    "down": "Уніз",
-    "fix": "Выправіць",
-    "dns_providers": "<0>Спіс вядомых DNS-правайдараў</0> на выбар.",
-    "update_now": "Абнавіць цяпер",
-    "update_failed": "Памылка аўто-абнаўлення. Калі ласка, <a>кіруйцеся інструкцыі</a> для абнаўлення ручна.",
-    "processing_update": "Калі ласка, пачакайце, AdGuard Home абнаўляецца",
-    "clients_title": "Кліенты",
-    "clients_desc": "Наладзьце прылады, што выкарыстоўваюць AdGuard Home",
-    "settings_global": "Глабальныя",
-    "settings_custom": "Свае",
-    "table_client": "Кліент",
-    "table_name": "Імя",
-    "save_btn": "Захаваць",
-    "client_add": "Дадаць кліента",
-    "client_new": "Новы кліент",
-    "client_edit": "Рэдагаваць кліента",
-    "client_identifier": "Ідэнтыфікатар",
-    "ip_address": "IP-адрас",
-    "client_identifier_desc": "Кліенты могуць быць ідэнтыфікаваны па IP-адрасе, CIDR ці MAC-адрасу. Звярніце ўвагу, што выкарыстанне MAC як ідэнтыфікатара магчыма, толькі калі AdGuard Home таксама з'яўляецца і <0>DHCP-серверам</0>",
-    "form_enter_ip": "Увядзіце IP",
-    "form_enter_mac": "Увядзіце MAC",
-    "form_enter_id": "Увядзіце ідэнтыфікатар",
-    "form_add_id": "Дадаць ідэнтыфікатар",
-    "form_client_name": "Увядзіце імя кліента",
-    "name": "Назва",
-    "client_global_settings": "Выкарыстаць глабальныя налады",
-    "client_deleted": "Кліент \"{{key}}\" паспяхова выдалены",
-    "client_added": "Кліент \"{{key}}\" паспяхова дададзены",
-    "client_updated": "Кліент \"{{key}}\" паспяхова абноўлены",
-    "clients_not_found": "Кліентаў не знойдзена",
-    "client_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць кліента \"{{key}}\"?",
-    "list_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць гэты спіс?",
-    "auto_clients_title": "Кліенты (runtime)",
-    "auto_clients_desc": "Дадзеныя пра кліентаў, якія скарыстаюць AdGuard Home, але не захоўваюцца ў наладах",
-    "access_title": "Налады доступу",
-    "access_desc": "Тут вы можаце наладзіць правілы доступу да DNS-серверу AdGuard Home.",
-    "access_allowed_title": "Дазволеныя кліенты",
-    "access_allowed_desc": "Спіс CIDR- ці IP-адрасоў. Калі ён наладжаны, AdGuard Home будзе прымаць запыты толькі з гэтых IP-адрасоў.",
-    "access_disallowed_title": "Забароненыя кліенты",
-    "access_disallowed_desc": "Спіс CIDR- ці IP-адрасоў. Калі ён наладжаны, AdGuard Home будзе ігнараваць запыты з гэтых IP-адрасоў.",
-    "access_blocked_title": "Заблакаваныя дамены",
-    "access_blocked_desc": "Не блытайце гэта з фільтрамі. AdGuard Home будзе ігнараваць DNS-запыты з гэтымі даменамі.",
-    "access_settings_saved": "Налады доступу паспяхова захаваны",
-    "updates_checked": "Праверка абнаўленняў прайшла паспяхова",
-    "updates_version_equal": "Версія AdGuard Home актуальная",
-    "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-пратакол падтрымваецца толькі на Android 9. Для іншых аперацыйных сістэм вам трэба будзе ўсталяваць дадатковае ПА.</0><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.",
-    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> падтрымвае <1>DNS-over-HTTPS</1>, але для налады яго, вам будзе трэба згенераваць для яго <2>DNS-адбітак</2>.",
-    "setup_dns_privacy_ios_2": "<0>AdGuard для iOS</0> падтрымвае <1>DNS-over-HTTPS</1> і <1>DNS-over-TLS</1>.",
-    "setup_dns_privacy_other_title": "Іншыя развязкі",
-    "setup_dns_privacy_other_1": "AdGuard Home сам можа быць кліентам зашыфраванага DNS на любай платформе.",
-    "setup_dns_privacy_other_2": "<0>dnsproxy</0> падтрымвае ўсе вядомыя зашыфраваныя DNS-пратаколы.",
-    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> падтрымвае <1>DNS-over-HTTPS</1>.",
-    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> падтрымвае <1>DNS-over-HTTPS</1>.",
-    "setup_dns_privacy_other_5": "Вы можаце знайсці яшчэ варыянты <0>тут</0> і <1>тут</1>.",
-    "setup_dns_notice": "Каб выкарыстоўваць <1>DNS-over-HTTPS</1> ці <1>DNS-over-TLS</1>, вам патрэбна <0>наладзіць шыфраванне</0> у наладах AdGuard Home.",
-    "rewrite_added": "Правіла перанакіравання DNS для \"{{key}}\" паспяхова дададзена",
-    "rewrite_deleted": "Правіла перанакіравання DNS для \"{{key}}\" паспяхова выдалена",
-    "rewrite_add": "Дадаць правіла перанакіравання DNS",
-    "rewrite_not_found": "Не знойдзена правілаў перанакіравання DNS",
-    "rewrite_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць правіла перанакіравання DNS для \"{{key}}\"?",
-    "rewrite_desc": "Дазваляе лёгка наладзіць карыстацкі DNS-адказ для пэўнага дамена.",
-    "rewrite_applied": "Ужыта правіла перанакіравання",
-    "rewrite_hosts_applied": "Перапісана па правіле файла hosts",
-    "dns_rewrites": "Перанакіраванні DNS",
-    "form_domain": "Увядзіце дамен",
-    "form_answer": "Увядзіце IP адрас ці дамен",
-    "form_error_domain_format": "Няслушны фармат дамена",
-    "form_error_answer_format": "Няслушны фармат адказу",
-    "configure": "Наладзіць",
-    "main_settings": "Асноўныя налады",
-    "block_services": "Выбраць заблакаваныя сэрвісы",
-    "blocked_services": "Заблакаваныя сэрвісы",
-    "blocked_services_desc": "Дазваляе хутка заблакаваць папулярныя сайты і сэрвісы.",
-    "blocked_services_saved": "Заблакаваныя сэрвісы паспяхова захаваны",
-    "blocked_services_global": "Выкарыстаць глабальныя заблакаваныя сэрвісы",
-    "blocked_service": "Заблакаваны сэрвіс",
-    "block_all": "Заблакаваць усё",
-    "unblock_all": "Адблакаваць усё",
-    "encryption_certificate_path": "Шлях да сертыфіката",
-    "encryption_private_key_path": "Шлях да зачыненага ключа",
-    "encryption_certificates_source_path": "Паказаць шлях да файла сертыфікатаў",
-    "encryption_certificates_source_content": "Уставіць змесціва сертыфікатаў",
-    "encryption_key_source_path": "Паказаць файл зачыненага ключа",
-    "encryption_key_source_content": "Уставіць змесціва зачыненага ключа",
-    "stats_params": "Канфігурацыя статыстыкі",
-    "config_successfully_saved": "Канфігурацыя паспяхова захавана",
-    "interval_24_hour": "24 гадзіны",
-    "interval_days": "{{count}} дзень",
-    "interval_days_plural": "{{count}} дзён",
-    "domain": "Дамен",
-    "answer": "Адказ",
-    "filter_added_successfully": "Спіс паспяхова дададзены",
-    "filter_removed_successfully": "Спіс паспяхова выдалены",
-    "filter_updated": "Спіс паспяхова абноўлены",
-    "statistics_configuration": "Канфігурацыя статыстыкі",
-    "statistics_retention": "Захаванне статыстыкі",
-    "statistics_retention_desc": "Калі вы зменшыце значэнне інтэрвалу, некаторыя дадзеныя могуць быць згублены",
-    "statistics_clear": " Ачысціць статыстыку",
-    "statistics_clear_confirm": "Вы ўпэўнены, што хочаце ачысціць статыстыку?",
-    "statistics_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання статыстыкі? Пры скарачэнні інтэрвалу дадзеныя могуць быць згублены",
-    "statistics_cleared": "Статыстыка паспяхова вычышчана",
-    "interval_hours": "{{count}} гадзіна",
-    "interval_hours_plural": "{{count}} гадзін",
-    "filters_configuration": "Налада фільтраў",
-    "filters_enable": "Уключыць фільтры",
-    "filters_interval": "Інтэрвал абнаўлення фільтраў",
-    "disabled": "Выключана",
-    "username_label": "Імя карыстача",
-    "username_placeholder": "Увядзіце імя карыстача",
-    "password_label": "Пароль",
-    "password_placeholder": "Увядзіце пароль",
-    "sign_in": "Увайсці",
-    "sign_out": "Выйсці",
-    "forgot_password": "Забылі пароль?",
-    "forgot_password_desc": "Калі ласка, выканаеце <0>гэтыя дзеянні</0> для стварэння новага пароля да вашага акаўнта.",
-    "location": "Месціва",
-    "orgname": "Назва арганізацыі",
-    "netname": "Назва сеціва",
-    "network": "Сеціва",
-    "descr": "Апісанне",
-    "whois": "Хто",
-    "filtering_rules_learn_more": "<0>Даведайцеся больш</0> пра стварэнне ўласных спісаў блакавання хастоў.",
-    "blocked_by_response": "Заблакавана па CNAME ці IP у адказе",
-    "blocked_by_cname_or_ip": "Заблакавана з дапамогай CNAME ці IP",
-    "try_again": "Паспрабаваць яшчэ раз",
-    "domain_desc": "Увядзіце імя ці маску дамена, які вы хочаце перанакіраваць.",
-    "example_rewrite_domain": "перанакіроўвае адказы толькі для гэтага дамена.",
-    "example_rewrite_wildcard": "перанакіроўвае адказы для ўсіх паддаменаў <0>example.org</0>.",
-    "rewrite_ip_address": "IP адрас: скарыстайце гэты IP у выглядзе А ці АААА адказу",
-    "rewrite_domain_name": "Даменавае імя: дадаць запіс CNAME",
-    "rewrite_A": "<0>A</0>: адмысловае значэнне, захоўваць запісы <0>A</0> з сервера для выгрузкі даных",
-    "rewrite_AAAA": "<0>AAAA</0>: адмысловае значэнне, захоўваць запісы <0>AAAA</0> з сервера для выгрузкі даных",
-    "disable_ipv6": "Адключыць IPv6",
-    "disable_ipv6_desc": "Калі гэта опцыя ўлучана, усе DNS-запыты адрасоў IPv6 (тып AAAA) будуць ігнаравацца.",
-    "fastest_addr": "Найхуткі IP-адрас",
-    "fastest_addr_desc": "Апытайце ўсе DNS-серверы і вярніце самы хуткі IP-адрас сярод усіх адказаў. Гэта замарудзіць выкананне DNS-запытаў, бо нам давядзецца чакаць адказаў ад усіх DNS-сервераў, але палепшыць агульную ўзаемасувязь.",
-    "autofix_warning_text": "Пры націску \"Выправіць\" AdGuard Home наладзіць вашу сістэму на выкарыстанне DNS-сервера AdGuard Home.",
-    "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 (перазагрузіць сістэмную службу)</0>.",
-    "autofix_warning_result": "У выніку ўсе DNS-запыты ад вашай сістэмы будуць па змаўчанні апрацоўвацца AdGuard Home.\n",
-    "tags_title": "Тэгі",
-    "tags_desc": "Вы можаце выбраць тэгі, якія адпавядаюць кліенту. Тэгі могуць быць улучаны ў правілы фільтрацыі і дазволяць вам ужываць іх больш дакладна. <0>Даведацца больш</0>.",
-    "form_select_tags": "Выбраць тэгі кліента",
-    "check_title": "Праверыць фільтрацыю",
-    "check_desc": "Праверыць фільтрацыю імя хаста",
-    "check": "Праверыць",
-    "form_enter_host": "Увядзіце імя хаста",
-    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстацкіх правілаў фільтрацыі",
-    "choose_from_list": "Абраць са спіса",
-    "add_custom_list": "Дадаць свой спіс",
-    "host_whitelisted": "Хост занесены ў белы спіс",
-    "check_ip": "IP-адрасы: {{ip}}",
-    "check_cname": "CNAME: {{cname}}",
-    "check_reason": "Прычына: {{reason}}",
-    "check_rule": "Правіла: {{rule}}",
-    "check_service": "Назва сэрвісу: {{service}}",
-    "check_not_found": "Не знойдзена ў вашым спісе фільтраў",
-    "client_confirm_block": "Вы ўпэўнены, што хочаце заблакаваць кліента \"{{ip}}\"?",
-    "client_confirm_unblock": "Вы ўпэўнены, што хочаце адблакаваць кліента \"{{ip}}\"?",
-    "client_blocked": "Кліент \"{{ip}}\" паспяхова заблакаваны",
-    "client_unblocked": "Кліент \"{{ip}}\" паспяхова адблакаваны",
-    "static_ip": "Статычны IP-адрас",
-    "static_ip_desc": "AdGuard Home з'яўляецца серверам, таму для карэктнай працы яму патрэбен статычны IP-адрас. У адваротным выпадку, у нейкі момант ваш роўтар можа прысвоіць гэтай прыладзе іншы IP-адрас.",
-    "set_static_ip": "Усталяваць статычны IP-адрас",
-    "install_static_ok": "Добрыя навіны! Ваш статычны IP-адрас ужо наладжаны",
-    "install_static_error": "AdGuard Home не можа аўтаматычна наладзіць яго для гэтага інтэрфейса сеціва. Калі ласка, паглядзіце інструкцыю пра тое, як гэта зрабіць ручна.",
-    "install_static_configure": "Мы выявілі выкарыстанне дынамічнага IP-адраса — <0>{{ip}}</0>. Хочаце выкарыстоўваць яго ў якасці статычнага адраса?",
-    "confirm_static_ip": "AdGuard Home наладзіць {{ip}} у якасці вашага статычнага IP-адраса. Хочаце працягнуць?",
-    "list_updated": "Абноўлены {{count}} спіс",
-    "list_updated_plural": "Абноўлена спісаў: {{count}}",
-    "dnssec_enable": "Уключыць DNSSEC",
-    "dnssec_enable_desc": "Усталюйце сцяг DNSSEC у выходных DNS-запытах і праверце вынік (патрабуецца распазнальнік з падтрымкай DNSSEC)",
-    "validated_with_dnssec": "Проверено с помощью DNSSEC",
-    "all_queries": "Усе запыты",
-    "show_blocked_responses": "Заблакавана",
-    "show_whitelisted_responses": "Белы спіс",
-    "show_processed_responses": "Апрацавана",
-    "blocked_safebrowsing": "Заблакавана згодна базе дадзеных Safebrowsing",
-    "blocked_adult_websites": "Заблакаваныя \"дарослыя\" сайты",
-    "blocked_threats": "Заблакавана пагроз",
-    "allowed": "Дазволены",
-    "filtered": "Адфільтраваныя",
-    "rewritten": "Перапісаныя",
-    "safe_search": "Бяспечны пошук",
-    "blocklist": "Чорны спіс",
-    "milliseconds_abbreviation": "мс",
-    "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-значэнне (мінімальнае), атрыманае з upstream-сервера",
-    "cache_ttl_max_override_desc": "Перавызначыць 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": "Наладзіць канфігурацыю для ўключэння DHCP-сервера",
-    "original_response": "Першапачатковы адказ",
-    "click_to_view_queries": "Націсніце, каб прагледзець запыты",
-    "port_53_faq_link": "Порт 53 часта заняты службамі \"DNSStubListener\" ці \"systemd-resolved\". Азнаёмцеся з <0>інструкцыяй</0> пра тое, як гэта дазволіць."
-}
--- a/client/src/__locales/bg.json
+++ b/client/src/__locales/bg.json
@@ -81,6 +81,7 @@
    "no_servers_specified": "Няма избрани услуги",
    "general_settings": "Общи настройки",
    "upstream_dns": "Главен DNS сървър",
+    "upstream_dns_hint": "Ако оставите празно, AdGuard Home ще използва <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> за главен. Използвай tls:// представка за DNS използващи TLS връзка.",
    "test_upstream_btn": "Тествай главния DNS",
    "apply_btn": "Приложи",
    "disabled_filtering_toast": "Забрани филтрирането",
@@ -138,8 +139,8 @@
    "page_table_footer_text": "Страница",
    "rows_table_footer_text": "редове",
    "updated_custom_filtering_toast": "Обновени местни правила за филтриране",
-    "rule_removed_from_custom_filtering_toast": "Премахнато от местни правила за филтриране: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Добавено до местни правила за филтриране: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Премахнато от местни правила за филтриране",
+    "rule_added_to_custom_filtering_toast": "Добавено до местни правила за филтриране",
    "plain_dns": "Обикновен DNS",
    "source_label": "Източник",
    "found_in_known_domain_db": "Намерен в списъците с домейни.",
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -11,8 +11,6 @@
    "save_config": "Uložit konfiguraci",
    "enabled_dhcp": "DHCP server zapnutý",
    "disabled_dhcp": "DHCP server vypnutý",
-    "unavailable_dhcp": "DHCP není k dispozici",
-    "unavailable_dhcp_desc": "AdGuard Home nemůže na vašem operačním systému provozovat DHCP server",
    "dhcp_title": "DHCP server (experimentální!)",
    "dhcp_description": "Pokud váš router neposkytuje možnost nastavit DHCP, můžete použít vlastní vestavěný DHCP server AdGuardu.",
    "dhcp_enable": "Zapnout DHCP server",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "Statické pronájmy DHCP",
    "dhcp_leases_not_found": "Nebyly nalezeny žádné pronájmy DHCP",
    "dhcp_config_saved": "Konfigurace DHCP serveru byla uložena",
-    "dhcp_ipv4_settings": "Nastavení DHCP IPv4",
-    "dhcp_ipv6_settings": "Nastavení DHCP IPv6",
    "form_error_required": "Povinné pole",
    "form_error_ip4_format": "Neplatný formát IPv4",
    "form_error_ip6_format": "Neplatný formát IPv6",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Neplatný formát ID klienta",
    "form_error_positive": "Musí být větší než 0",
    "form_error_negative": "Musí být rovno nebo větší než 0",
-    "range_end_error": "Musí být větší než začátek rozsahu",
    "dhcp_form_gateway_input": "IP brána",
    "dhcp_form_subnet_input": "Maska podsítě",
    "dhcp_form_range_title": "Rozsah IP adres",
@@ -132,8 +127,7 @@
    "encryption_settings": "Nastavení šifrování",
    "dhcp_settings": "Nastavení DHCP",
    "upstream_dns": "Odchozí DNS servery",
-    "upstream_dns_help": "Zadejte adresy serverů, jedno připojení na řádek. <a>Zjistěte více</a> o konfiguraci odchozích DNS serverů.",
-    "upstream_dns_configured_in_file": "Konfigurováno v {{path}}",
+    "upstream_dns_hint": "Pokud toto pole ponecháte prázdné, AdGuard Home použije <a href='https://www.quad9.net/' target='_blank'>Quad9</a> jako upstream.",
    "test_upstream_btn": "Test upstreamů",
    "upstreams": "Odesláno",
    "apply_btn": "Použít",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "obyčejný DNS (přes UDP)",
    "example_upstream_dot": "šifrovaný <0>DNS přes TLS</0>",
    "example_upstream_doh": "šifrovaný <0>DNS přes HTTPS</0>",
-    "example_upstream_doq": "šifrovaný <0>DNS přes QUIC</0>",
    "example_upstream_sdns": "můžete použít <0>DNS razítka</0> pro <1>DNSCrypt</1> nebo <2>DNS přes HTTPS</2> řešitele",
    "example_upstream_tcp": "obyčejný DNS (přes TCP)",
    "all_lists_up_to_date_toast": "Všechny seznamy jsou již aktuální",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": nemohl být použit, zkontrolujte, zda jste ho správně napsali",
    "unblock": "Odblokovat",
    "block": "Blokovat",
-    "disallow_this_client": "Blokovat tohoto klienta",
-    "allow_this_client": "Povolit tohoto klienta",
-    "block_for_this_client_only": "Blokovat pouze pro tohoto klienta",
-    "unblock_for_this_client_only": "Odblokovat pouze pro tohoto klienta",
    "time_table_header": "Čas",
    "date": "Datum",
    "domain_name_table_header": "Název domény",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Stránka",
    "rows_table_footer_text": "řádky",
    "updated_custom_filtering_toast": "Aktualizovaná vlastní pravidla filtrování",
-    "rule_removed_from_custom_filtering_toast": "Pravidlo odstraněno z vlastních pravidel filtrování: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Pravidlo přidáno do vlastních pravidel filtrování: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Pravidlo odstraněno z vlastních pravidel filtrování",
+    "rule_added_to_custom_filtering_toast": "Pravidlo přidáno do vlastních pravidel filtrování",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrováno pomocí {{filter}}",
    "query_log_confirm_clear": "Opravdu chcete vymazat celý protokol dotazů?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Režim blokování",
    "default": "Výchozí",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Nulová IP",
    "custom_ip": "Vlastní IP",
    "blocking_ipv4": "Blokování IPv4",
@@ -256,8 +244,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_refused": "REFUSED: Odezva pomocí kódu REFUSED",
+    "blocking_mode_default": "Výchozí: Odezva pomocí NXDOMAIN, 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_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)",
    "blocking_mode_custom_ip": "Vlastní IP. odezva s ručně nastavenou IP adresou",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Pokud je nakonfigurován port HTTPS, AdGuard Home administrátorské rozhraní bude přístupné přes HTTPS a bude také poskytovat DNS přes HTTPS na '/dns-query'.",
    "encryption_dot": "DNS přes TLS port",
    "encryption_dot_desc": "Pokud je tento port nakonfigurován, AdGuard Home bude na tomto portu spouštět DNS přes TLS server.",
-    "encryption_doq": "DNS přes QUIC port",
-    "encryption_doq_desc": "Pokud je tento port nakonfigurován, AdGuard Home spustí na tomto portu server DNS přes QUIC. Je to experimentální a nemusí být spolehlivé. V současnosti také není příliš mnoho klientů, kteří to podporují.",
    "encryption_certificates": "Certifikáty",
    "encryption_certificates_desc": "Chcete-li používat šifrování, musíte pro svou doménu poskytnout platný řetězec certifikátů SSL. Certifikát můžete získat bezplatně na adrese <0>{{link}}</ 0>, nebo jej můžete zakoupit od jednoho z důvěryhodných certifikačních úřadů.",
    "encryption_certificates_input": "Zde můžete nakopírovat/vložit certifikáty PEM.",
@@ -369,7 +354,7 @@
    "fix": "Opravit",
    "dns_providers": "Zde je <0>seznam známých poskytovatelů DNS</0>, z nichž si můžete vybrat.",
    "update_now": "Aktualizovat nyní",
-    "update_failed": "Automatická aktualizace selhala. Prosím <a>následujte tyto kroky</a> a aktualizujte ručně.",
+    "update_failed": "Automatická aktualizace selhala. Prosím <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>následujte tyto kroky</a> a aktualizujte ručně.",
    "processing_update": "Čekejte prosím, AdGuard Home se aktualizuje",
    "clients_title": "Klienti",
    "clients_desc": "Konfigurace zařízení připojených k AdGuard Home",
@@ -403,7 +388,7 @@
    "access_desc": "Zde můžete konfigurovat pravidla přístupu pro server DNS AdGuard Home.",
    "access_allowed_title": "Povolení klienti",
    "access_allowed_desc": "Seznam adres CIDR nebo IP. Pokud je nakonfigurován, AdGuard Home bude přijímat požadavky pouze z těchto IP adres.",
-    "access_disallowed_title": "Blokovaní klienti",
+    "access_disallowed_title": "Nepovolení klienti",
    "access_disallowed_desc": "Seznam adres CIDR nebo IP. Pokud je nakonfigurován, AdGuard Home bude odmítat požadavky pouze z těchto IP adres.",
    "access_blocked_title": "Blokované domény",
    "access_blocked_desc": "Nezaměňujte to s filtry. AdGuard Home odstraní dotazy DNS s těmito doménami v otázce dotazu. Zde můžete určit přesné názvy domén, zástupné znaky a pravidla URL adres, např. 'example.org', '*.example.org' nabo '||example.org^'.",
@@ -564,9 +549,10 @@
    "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_min_override_desc": "Přepište hodnotu TTL (minimální) obdrženou z odchozího serveru. Tato hodnota nemůže být větší než 3600 (1 hodina)",
    "cache_ttl_max_override_desc": "Přepište hodnotu TTL (maximální) obdrženou z odchozího serveru",
-    "ttl_cache_validation": "Minimální hodnota TTL mezipaměti musí být menší nebo rovna maximální hodnotě",
+    "min_exceeds_max_value": "Minimální hodnota přesahuje maximální hodnotu",
+    "value_not_larger_than": "Hodnota nesmí být vyšší než {{maximum}}",
    "filter_category_general": "Obecné",
    "filter_category_security": "Bezpečnost",
    "filter_category_regional": "Regionální",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Seznamy, které se specializují na blokování škodlivého software, zákeřných útoků nebo podvodných domén",
    "filter_category_regional_desc": "Seznamy, které jsou zaměřené na regionální reklamy a sledovací servery",
    "filter_category_other_desc": "Další seznamy zakázaných",
-    "setup_config_to_enable_dhcp_server": "Nastavte konfiguraci pro aktivaci DHCP serveru",
    "original_response": "Původní odezva",
    "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.",
-    "experimental": "Experimentální"
+    "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."
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -11,8 +11,6 @@
    "save_config": "Gem konfiguration",
    "enabled_dhcp": "DHCP-server aktiveret",
    "disabled_dhcp": "DHCP-server deaktiveret",
-    "unavailable_dhcp": "DHCP er ikke tilgængelig",
-    "unavailable_dhcp_desc": "AdGuard Home kan ikke køre en DHCP-server på dit OS",
    "dhcp_title": "DHCP-server (eksperimentel!)",
    "dhcp_description": "Hvis din router ikke tilbyder DHCP-indstillinger, kan du bruge AdGuards egen indbyggede DHCP-server.",
    "dhcp_enable": "Aktiver DHCP-server",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP static leases",
    "dhcp_leases_not_found": "Ingen DHCP-leases fundet",
    "dhcp_config_saved": "DHCP-konfiguration gemt",
-    "dhcp_ipv4_settings": "DHCP IPv4 Indstillinger",
-    "dhcp_ipv6_settings": "DHCP IPv6 Indstillinger",
    "form_error_required": "Obligatorisk felt",
    "form_error_ip4_format": "Ugyldigt IPv4-format",
    "form_error_ip6_format": "Ugyldigt IPv6-format",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Ugyldigt klient-ID-format",
    "form_error_positive": "Skal være større end 0",
    "form_error_negative": "Skal være lig med 0 eller større",
-    "range_end_error": "Skal være større end starten af intervallet",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Interval af IP-adresser",
@@ -132,8 +127,7 @@
    "encryption_settings": "Krypteringsindstillinger",
    "dhcp_settings": "DHCP-indstillinger",
    "upstream_dns": "Upstream DNS-servere",
-    "upstream_dns_help": "Indtast serveradresserne en pr. linje. <a>Lær mere</a> om konfiguration af upstream DNS-servere.",
-    "upstream_dns_configured_in_file": "Konfigureret i {{path}}",
+    "upstream_dns_hint": "Hvis du lader dette felt være tomt, vil AdGuard Home bruge <a href='https://www.quad9.net/' target='_blank'>Quad9</a> som en upstream.",
    "test_upstream_btn": "Test upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Anvend",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "almindelig DNS (over UDP)",
    "example_upstream_dot": "krypteret <0>DNS-over-TLS</0>",
    "example_upstream_doh": "krypteret <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "krypteret <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "du kan bruge <0>DNS Stamps<0> til <1>DNSCrypt>/1> eller <2>DNS-over-HTTPS</2> resolvers",
    "example_upstream_tcp": "almindelig DNS (over TCP)",
    "all_lists_up_to_date_toast": "Alle lister er allerede opdaterede",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": kunne ikke bruges, kontroller venligst at du har skrevet det korrekt",
    "unblock": "Fjern blokering",
    "block": "Bloker",
-    "disallow_this_client": "Afvis denne klient",
-    "allow_this_client": "Tillad denne klient",
-    "block_for_this_client_only": "Bloker kun for denne klient",
-    "unblock_for_this_client_only": "Fjern blokering kun for denne klient",
    "time_table_header": "Tid",
    "date": "Dato",
    "domain_name_table_header": "Domænenavn",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Side",
    "rows_table_footer_text": "rækker",
    "updated_custom_filtering_toast": "De brugerdefinerede filtreringsregler er blevet opdateret",
-    "rule_removed_from_custom_filtering_toast": "Regel fjernet fra de brugerdefinerede filtreringsregler: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regel tilføjet til de brugerdefinerede filtreringsregler: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regel fjernet fra de brugerdefinerede filtreringsregler",
+    "rule_added_to_custom_filtering_toast": "Regel tilføjet til de brugerdefinerede filtreringsregler",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtreret af {{filter}}",
    "query_log_confirm_clear": "Er du sikker på, at du vil rydde hele forespørgselsloggen?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Blokeringstilstand",
    "default": "Standard",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Null IP",
    "custom_ip": "Tilpasset IP",
    "blocking_ipv4": "IPv4-blokering",
@@ -253,11 +241,10 @@
    "rate_limit": "Hyppighedsgrænse",
    "edns_enable": "Aktiver EDNS Client Subnet",
    "edns_cs_desc": "Hvis det er aktiveret, vil AdGuard Home sende klienters subnets til DNS-serverne.",
-    "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)",
+    "rate_limit_desc": "Antallet af anmodninger pr. sekund, som en enkelt klient får lov til at fremsætte (0: 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_refused": "REFUSED: Svar med en REFUSED kode",
+    "blocking_mode_default": "Standard: Svar med NXDOMAIN, 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_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)",
    "blocking_mode_custom_ip": "Brugerdefineret IP: Svar med en manuelt indstillet IP-adresse",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Hvis HTTPS-porten er konfigureret, vil AdGuard Home admin grænsefladen være tilgængelig via HTTPS, og den vil give DNS-over-HTTPS på '/dns-query' placeringen.",
    "encryption_dot": "DNS-over-TLS port",
    "encryption_dot_desc": "Hvis denne port er konfigureret, vil AdGuard Home køre en DNS-over-TLS server over denne port.",
-    "encryption_doq": "DNS-over-QUIC port",
-    "encryption_doq_desc": "Hvis denne port er konfigureret, vil AdGuard Home køre en DNS-over-QUIC server på denne port. Den er eksperimentel og er måske ikke pålidelig. Der er heller ikke mange klienter, der understøtter den i øjeblikket.",
    "encryption_certificates": "Certifikater",
    "encryption_certificates_desc": "For at kunne bruge kryptering skal du angive en gyldig SSL-certifikatkæde til dit domæne. Du kan få et gratis certifikat på <0>{{link}}</ 0> eller du kan købe det fra en af de pålidelige Certifikatmyndigheder.",
    "encryption_certificates_input": "Kopier/indsæt dine PEM-kodede certifikater her.",
@@ -369,7 +354,7 @@
    "fix": "Reparer",
    "dns_providers": "Her er en <0>liste over kendte DNS-udbydere</ 0> at vælge imellem.",
    "update_now": "Opdater nu",
-    "update_failed": "Automatisk opdatering mislykkedes. Følg <a>disse trin</a> for at opdatere manuelt.",
+    "update_failed": "Automatisk opdatering mislykkedes. Følg venligst <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>trinene</a> for at opdatere manuelt.",
    "processing_update": "Vent venligst, AdGuard Home bliver opdateret",
    "clients_title": "Klienter",
    "clients_desc": "Konfigurer enheder, der er forbundet til AdGuard Home",
@@ -564,9 +549,10 @@
    "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_min_override_desc": "Overskriv TTL-værdi (minimum) modtaget fra upstream-serveren. Denne værdi kan ikke være større end 3600 (1 time)",
    "cache_ttl_max_override_desc": "Overskriv TTL-værdi (maksimum) modtaget fra upstream-serveren",
-    "ttl_cache_validation": "Minimum cache TTL-værdi skal være mindre end eller lig med den maksimale værdi",
+    "min_exceeds_max_value": "Minimumsværdien overstiger maksimumværdien",
+    "value_not_larger_than": "Værdien kan ikke være større end {{maximum}}",
    "filter_category_general": "Generelt",
    "filter_category_security": "Sikkerhed",
    "filter_category_regional": "Regional",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Lister, der er specialiserede i at blokere malware, phishing eller scam-domæner",
    "filter_category_regional_desc": "Lister, der fokuserer på regionale annoncer og tracking-servere",
    "filter_category_other_desc": "Andre blokeringslister",
-    "setup_config_to_enable_dhcp_server": "Opsætningskonfiguration for at aktivere DHCP-server",
    "original_response": "Oprindeligt svar",
    "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.",
-    "experimental": "Eksperimentel"
+    "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."
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -11,8 +11,6 @@
    "save_config": "Konfiguration speichern",
    "enabled_dhcp": "DHCP-Server aktiviert",
    "disabled_dhcp": "DHCP-Server deaktiviert",
-    "unavailable_dhcp": "DHCP ist nicht verfügbar",
-    "unavailable_dhcp_desc": "AdGuard Home konnte keinen DHCP-Server auf Ihrem Betriebssystem ausführen",
    "dhcp_title": "DHCP-Server (experimental!)",
    "dhcp_description": "Wenn Ihr Router keine DHCP-Einstellungen bietet, können Sie den integrierten DHCP-Server von AdGuard verwenden.",
    "dhcp_enable": "DHCP-Server aktivieren",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP statische Leases",
    "dhcp_leases_not_found": "Keine DHCP-Leasingverträge gefunden\n",
    "dhcp_config_saved": "Gespeicherte DHCP-Server-Konfiguration",
-    "dhcp_ipv4_settings": "DHCP-IPv4-Einstellungen",
-    "dhcp_ipv6_settings": "DHCP-IPv6-Einstellungen",
    "form_error_required": "Pflichtfeld",
    "form_error_ip4_format": "Ungültiges IPv4-Format",
    "form_error_ip6_format": "Ungültiges IPv6-Format",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Ungültiges Client-ID-Format",
    "form_error_positive": "Muss größer als 0 sein.",
    "form_error_negative": "Muss gleich oder größer als 0 (Null) sein",
-    "range_end_error": "Muss größer als der Bereichsbeginn sein",
    "dhcp_form_gateway_input": "Gateway-IP",
    "dhcp_form_subnet_input": "Subnetz-Maske",
    "dhcp_form_range_title": "Bereich von IP-Adressen",
@@ -50,7 +45,7 @@
    "dhcp_warning": "Wenn Sie den DHCP-Server trotzdem aktivieren möchten, stellen Sie sicher, dass sich in Ihrem Netzwerk kein anderer aktiver DHCP-Server befindet. Andernfalls kann es bei angeschlossenen Geräten zu einem Ausfall des Internets kommen!",
    "dhcp_error": "Es konnte nicht ermittelt werden, ob es einen anderen DHCP-Server im Netzwerk gibt.",
    "dhcp_static_ip_error": "Um den DHCP-Server nutzen zu können, muss eine statische IP-Adresse festgelegt werden. Es konnte nicht ermittelt werden, ob diese Netzwerkschnittstelle mit statischer IP-Adresse konfiguriert ist. Bitte legen Sie eine statische IP-Adresse manuell fest.",
-    "dhcp_dynamic_ip_found": "Ihr System verwendet die dynamische Konfiguration der IP-Adresse für die Schnittstelle <0>{{interfaceName}}</0>. Um den DHCP-Server nutzen zu können, muss eine statische IP-Adresse festgelegt werden. Ihre aktuelle IP-Adresse ist <0>{{ipAddress}}</0>. Diese IP-Adresse wird automatisch als statisch festgelegt, sobald Sie auf die Schaltfläche „DHCP aktivieren” klicken.",
+    "dhcp_dynamic_ip_found": "Ihr System verwendet die dynamische Konfiguration der IP-Adresse für die Schnittstelle <0>{{interfaceName}}</0>. Um den DHCP-Server nutzen zu können, muss eine statische IP-Adresse festgelegt werden. Ihre aktuelle IP-Adresse ist <0>{{ipAddress}}}</0>. Diese IP-Adresse wird automatisch als statisch festgelegt, sobald Sie auf die Schaltfläche „DHCP aktivieren” klicken.",
    "dhcp_lease_added": "Statischer Lease „{{key}}” erfolgreich hinzugefügt",
    "dhcp_lease_deleted": "Statischer Lease „{{key}}” erfolgreich entfernt",
    "dhcp_new_static_lease": "Neuer statischer Lease",
@@ -81,7 +76,7 @@
    "on": "AN",
    "off": "AUS",
    "copyright": "Urheberrecht",
-    "homepage": "Homepage",
+    "homepage": "Startseite",
    "report_an_issue": "Fehlerbericht senden",
    "privacy_policy": "Datenschutzerklärung",
    "enable_protection": "Schutz aktivieren",
@@ -104,21 +99,21 @@
    "no_clients_found": "Keine Clients gefunden",
    "general_statistics": "Allgemeine Statistiken",
    "number_of_dns_query_days": "Anzahl der in den letzten {{count}} Tagen verarbeiteten DNS-Anfragen",
-    "number_of_dns_query_days_plural": "Anzahl der DNS-Abfragen, die in den letzten {{count}} Tagen verarbeitet wurden",
+    "number_of_dns_query_days_plural": "Anzahl der DNS-Abfragen, die in den letzten {{count}}} Tagen verarbeitet wurden",
    "number_of_dns_query_24_hours": "Anzahl der in den letzten 24 Stunden durchgeführten DNS-Anfragen",
    "number_of_dns_query_blocked_24_hours": "Anzahl der durch Werbefilter und Host-Blocklisten geblockten DNS-Anfragen",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Anzahl der durch das AdGuard-Modul „Internetsicherheit” gesperrten DNS-Anfragen",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Anzahl der durch das AdGuard-Modul für Internet-Sicherheit blockierten DNS-Anfragen",
    "number_of_dns_query_blocked_24_hours_adult": "Anzahl der blockierten Webseiten für Erwachsene",
    "enforced_save_search": "SafeSearch erzwungen",
    "number_of_dns_query_to_safe_search": "Anzahl der DNS-Anfragen bei denen SafeSearch für Suchanfragen erzwungen wurde",
    "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",
+    "block_domain_use_filters_and_hosts": "Domains durch Filter und Host-Dateien blockieren",
    "filters_block_toggle_hint": "Sie können Blockierregeln in den <a href='#filters'>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_browsing_sec": "AdGuard Webservice für Internet-Sicherheit verwenden",
+    "use_adguard_browsing_sec_hint": "AdGuard Home überprüft, ob die Domain durch den Webservice für Internet-Sicherheit geblacklistet ist. 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",
-    "use_adguard_parental_hint": "AdGuard Home wird prüfen, ob die Domain jugendgefährdende Inhalte enthält. Zum Schutz Ihrer Privatsphäre wird die selbe API wie für den Webservice für Internetsicherheit verwendet.",
+    "use_adguard_parental_hint": "AdGuard Home wird überprüfen, ob die Domain Inhalte hat, die nur für Erwachsene geeignet sind. Zum Schutz Ihrer Privatsphäre wird die gleiche API wie für den Webservice für Internet-Sicherheit verwendet.",
    "enforce_safe_search": "SafeSearch erzwingen",
    "enforce_save_search_hint": "AdGuard kann SafeSearch für folgende Suchmaschinen erzwingen: Google, Youtube, Bing und Yandex.",
    "no_servers_specified": "Keine Server festgelegt",
@@ -132,8 +127,7 @@
    "encryption_settings": "Verschlüsselungseinstellungen",
    "dhcp_settings": "DHCP-Einstellungen",
    "upstream_dns": "Upstream-DNS-Server",
-    "upstream_dns_help": "Geben Sie pro Zeile eine Serveradresse ein. <a>Weitere Informationen</a> zur Konfiguration von Upstream-DNS-Servern.",
-    "upstream_dns_configured_in_file": "Konfiguriert in {{path}}",
+    "upstream_dns_hint": "Wenn Sie dieses Feld leer lassen wird AdGuard Home <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> als Upstream verwenden. Verwenden Sie das Präfix tls:// für DNS über TLS-Server.",
    "test_upstream_btn": "Upstreams testen",
    "upstreams": "Upstreams",
    "apply_btn": "Anwenden",
@@ -169,9 +163,9 @@
    "edit_blocklist": "Sperrliste bearbeiten",
    "edit_allowlist": "Freigabeliste bearbeiten",
    "choose_blocklist": "Sperrliste wählen",
-    "choose_allowlist": "Freigabeliste wählen",
-    "enter_valid_blocklist": "Gültige Webadresse der Sperrliste eingeben.",
-    "enter_valid_allowlist": "Gültige Webadresse der Positivliste eingeben.",
+    "choose_allowlist": "Zulassungsliste wählen",
+    "enter_valid_blocklist": "Geben Sie eine gültige Adresse in die Sperrliste ein.",
+    "enter_valid_allowlist": "Geben Sie eine gültige Adresse in die Freigabeliste ein.",
    "form_error_url_format": "Ungültiges URL-Format",
    "form_error_url_or_path_format": "Ungültige URL oder absoluter Pfad der Liste",
    "custom_filter_rules": "Benutzerdefinierte Filterregeln",
@@ -183,11 +177,10 @@
    "example_comment": "! Hier steht ein Kommentar",
    "example_comment_meaning": "Nur ein Kommentar",
    "example_comment_hash": "# Auch ein Kommentar",
-    "example_regex_meaning": "Zugriff auf die Domains sperren, die dem <0>angegebenen regulärem Ausdruck</0> entsprechen",
+    "example_regex_meaning": "Zugriff auf die Domains blockieren, die dem <0>spezifizierten regulären Ausdruck</0> entsprechen",
    "example_upstream_regular": "regulärer DNS (über UDP)",
    "example_upstream_dot": "verschlüsseltes <0>DNS-over-TLS</0>",
    "example_upstream_doh": "verschlüsseltes <0>DNS_over_HTTPS</0>",
-    "example_upstream_doq": "verschlüsseltes <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "Sie können <0>DNS-Stempel</0> für <1>DNSCrypt</1> oder <2>DNS-over-HTTPS</2> Resolver benutzen",
    "example_upstream_tcp": "regulärer DNS (über TCP)",
    "all_lists_up_to_date_toast": "Alle Listen sind bereits auf dem neuesten Stand",
@@ -195,11 +188,7 @@
    "dns_test_ok_toast": "Angegebene DNS-Server arbeiten ordnungsgemäß",
    "dns_test_not_ok_toast": "Server \"{{key}}\": konnte nicht verwendet werden, bitte überprüfen Sie die korrekte Schreibweise",
    "unblock": "Entsperren",
-    "block": "Sperren",
-    "disallow_this_client": "Diesen Client sperren",
-    "allow_this_client": "Diesen Client zulassen",
-    "block_for_this_client_only": "Nur für diesen Client sperren",
-    "unblock_for_this_client_only": "Nur für diesen Client freigeben",
+    "block": "Blockieren",
    "time_table_header": "Zeit",
    "date": "Datum",
    "domain_name_table_header": "Domainname",
@@ -215,12 +204,12 @@
    "refresh_btn": "Aktualisieren",
    "previous_btn": "Vorherige",
    "next_btn": "Nächste",
-    "loading_table_status": "Wird geladen …",
+    "loading_table_status": "Laden...",
    "page_table_footer_text": "Seite",
    "rows_table_footer_text": "Reihen",
    "updated_custom_filtering_toast": "Die benutzerdefinierten Filterregeln wurden aktualisiert",
-    "rule_removed_from_custom_filtering_toast": "Regel wurde aus den benutzerdefinierten Filterregeln entfernt: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regel wurde zu den benutzerdefinierten Filterregeln hinzugefügt: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regel wurde aus den benutzerdefinierten Filterregeln entfernt",
+    "rule_added_to_custom_filtering_toast": "Regel wurde zu den benutzerdefinierten Filterregeln hinzugefügt",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Gefiltert nach {{filter}}",
    "query_log_confirm_clear": "Möchten Sie wirklich das Abfrageprotokoll vollständig löschen?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Sperrmodus",
    "default": "Standard",
    "nxdomain": "NXDomain",
-    "refused": "REFUSED",
    "null_ip": "Null-IP-Adresse",
    "custom_ip": "Benutzerdefinierte IP",
    "blocking_ipv4": "IPv4-Sperren",
@@ -256,8 +244,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_refused": "REFUSED: mit abgelehntem Code REFUSED",
+    "blocking_mode_default": "Standard: Mit NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "Benutzerdefinierte IP: Mit einer manuell eingestellten IP-Adresse antworten",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Wenn der HTTPS-Port konfiguriert ist, ist die AdGuard Home-Administrationsschnittstelle über HTTPS zugänglich und bietet auch DNS-over-HTTTPS am Server „/dns-query”.",
    "encryption_dot": "DNS-over-TLS",
    "encryption_dot_desc": "Wenn dieser Port konfiguriert ist, führt AdGuard Home auf diesem Port einen DNS-over-TLS-Server aus.",
-    "encryption_doq": "Port für DNS-over-QUIC",
-    "encryption_doq_desc": "Wenn dieser Port eingerichtet ist, wird AdGuard Home einen DNS-over-QUIC-Server auf diesem Port ausführen. Es ist experimentell und möglicherweise nicht zuverlässig. Außerdem gibt es im Moment nicht allzu viele Clients, die ihn unterstützen.",
    "encryption_certificates": "Zertifikate",
    "encryption_certificates_desc": "Um die Verschlüsselung verwenden zu können, müssen Sie eine gültige SSL-Zertifikatskette für Ihre Domain angeben. Sie können ein kostenloses Zertifikat für <0>{{link}}</0> erhalten oder es bei einer der vertrauenswürdigen Zertifizierungsstellen kaufen.",
    "encryption_certificates_input": "Kopieren Sie Ihre PEM-codierten Zertifikate und fügen Sie sie hier ein.",
@@ -369,7 +354,7 @@
    "fix": "Beheben",
    "dns_providers": "Hier finden Sie eine <0>Liste der bekannten DNS-Anbieter</0> zur Auswahl.",
    "update_now": "Jetzt aktualisieren",
-    "update_failed": "Das automatische Aktualisieren ist fehlgeschlagen. Bitte <a>folgen Sie den Schritten</a>, um manuell zu aktualisieren.",
+    "update_failed": "Das automatische Aktualisieren ist fehlgeschlagen. Bitte <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>folgen Sie den Schritten</a>, um manuell zu aktualisieren.",
    "processing_update": "Bitte warten Sie, AdGuard Home wird aktualisiert …",
    "clients_title": "Clients",
    "clients_desc": "Geräte einrichten, die mit AdGuard Home verbunden sind",
@@ -559,14 +544,15 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "Größe des Zwischenspeichers",
    "cache_size_desc": "Größe des DNS-Zwischenspeichers (in Bytes)",
-    "cache_ttl_min_override": "TTL-Minimalwert überschreiben (in Sekunden)",
-    "cache_ttl_max_override": "TTL-Höchstwert überschreiben (in Sekunden)",
+    "cache_ttl_min_override": "TTL-Minimalwert überschreiben",
+    "cache_ttl_max_override": "TTL-Höchstwert überschreiben",
    "enter_cache_size": "Größe des Zwischenspeichers eingeben",
    "enter_cache_ttl_min_override": "TTL-Minimalwert eingeben",
    "enter_cache_ttl_max_override": "TTL-Höchstwert eingeben",
-    "cache_ttl_min_override_desc": "Überschreibt den TTL-Minimalwert, der vom vorgeschalteten Server empfangen wurde. Dieser Wert darf nicht mehr als 3600 (Sek.) (≙ 1 Stunde) betragen.",
+    "cache_ttl_min_override_desc": "Überschreibt den TTL-Minimalwert, der vom vorgeschalteten Server empfangen wurde. Dieser Wert darf nicht größer als 3600 (Sek.) (≙ 1 Stunde) betragen.",
    "cache_ttl_max_override_desc": "Überschreibt den TLL-Maximalwert, der vom vorgeschalteten Server empfangenen wurde",
-    "ttl_cache_validation": "Der minimale Cache des TTL-Wertes muss kleiner oder gleich dem maximalen Wert sein",
+    "min_exceeds_max_value": "Minimalwert überschreitet Maximalwert",
+    "value_not_larger_than": "Wert darf höchstens {{maximum}} betragen",
    "filter_category_general": "Allgemein",
    "filter_category_security": "Sicherheit",
    "filter_category_regional": "Regional",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Listen, die auf das Sperren von Malware, Phishing- oder Scam-Domains spezialisiert sind",
    "filter_category_regional_desc": "Listen, die sich auf regionale Werbeanzeigen und Tracking-Server konzentrieren",
    "filter_category_other_desc": "Weitere Sperrlisten",
-    "setup_config_to_enable_dhcp_server": "Einrichten der Konfiguration zur Aktivierung des DHCP-Servers",
    "original_response": "Ursprüngliche Antwort",
    "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.",
-    "experimental": "Experimentell"
+    "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."
 }
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -1,7 +1,6 @@
 {
    "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",
@@ -12,8 +11,6 @@
    "save_config": "Save config",
    "enabled_dhcp": "DHCP server enabled",
    "disabled_dhcp": "DHCP server disabled",
-    "unavailable_dhcp": "DHCP is unavailable",
-    "unavailable_dhcp_desc": "AdGuard Home cannot run a DHCP server on your OS",
    "dhcp_title": "DHCP server (experimental!)",
    "dhcp_description": "If your router does not provide DHCP settings, you can use AdGuard's own built-in DHCP server.",
    "dhcp_enable": "Enable DHCP server",
@@ -24,8 +21,6 @@
    "dhcp_static_leases": "DHCP static leases",
    "dhcp_leases_not_found": "No DHCP leases found",
    "dhcp_config_saved": "DHCP config successfully saved",
-    "dhcp_ipv4_settings": "DHCP IPv4 Settings",
-    "dhcp_ipv6_settings": "DHCP IPv6 Settings",
    "form_error_required": "Required field",
    "form_error_ip4_format": "Invalid IPv4 format",
    "form_error_ip6_format": "Invalid IPv6 format",
@@ -34,7 +29,6 @@
    "form_error_client_id_format": "Invalid client ID format",
    "form_error_positive": "Must be greater than 0",
    "form_error_negative": "Must be equal to 0 or greater",
-    "range_end_error": "Must be greater than range start",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Range of IP addresses",
@@ -133,8 +127,7 @@
    "encryption_settings": "Encryption settings",
    "dhcp_settings": "DHCP settings",
    "upstream_dns": "Upstream DNS servers",
-    "upstream_dns_help": "Enter servers addresses one per line. <a>Learn more</a> about configuring upstream DNS servers.",
-    "upstream_dns_configured_in_file": "Configured in {{path}}",
+    "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://www.quad9.net/' target='_blank'>Quad9</a> as an upstream.",
    "test_upstream_btn": "Test upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Apply",
@@ -188,7 +181,6 @@
    "example_upstream_regular": "regular DNS (over UDP)",
    "example_upstream_dot": "encrypted <0>DNS-over-TLS</0>",
    "example_upstream_doh": "encrypted <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "encrypted <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "you can use <0>DNS Stamps</0> for <1>DNSCrypt</1> or <2>DNS-over-HTTPS</2> resolvers",
    "example_upstream_tcp": "regular DNS (over TCP)",
    "all_lists_up_to_date_toast": "All lists are already up-to-date",
@@ -197,10 +189,6 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly",
    "unblock": "Unblock",
    "block": "Block",
-    "disallow_this_client": "Disallow this client",
-    "allow_this_client": "Allow this client",
-    "block_for_this_client_only": "Block for this client only",
-    "unblock_for_this_client_only": "Unblock for this client only",
    "time_table_header": "Time",
    "date": "Date",
    "domain_name_table_header": "Domain name",
@@ -220,8 +208,8 @@
    "page_table_footer_text": "Page",
    "rows_table_footer_text": "rows",
    "updated_custom_filtering_toast": "Updated the custom filtering rules",
-    "rule_removed_from_custom_filtering_toast": "Rule removed from the custom filtering rules: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Rule added to the custom filtering rules: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Rule removed from the custom filtering rules",
+    "rule_added_to_custom_filtering_toast": "Rule added to the custom filtering rules",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtered by {{filter}}",
    "query_log_confirm_clear": "Are you sure you want to clear the entire query log?",
@@ -242,25 +230,21 @@
    "blocking_mode": "Blocking mode",
    "default": "Default",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Null IP",
    "custom_ip": "Custom IP",
    "blocking_ipv4": "Blocking IPv4",
    "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",
    "edns_enable": "Enable EDNS Client Subnet",
    "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.",
-    "rate_limit_desc": "The number of requests per second that a single client is allowed to make (setting it to 0 means unlimited)",
+    "rate_limit_desc": "The number of requests per second that a single client is allowed to make (0: 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 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_default": "Default: Respond with NXDOMAIN when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule",
    "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)",
    "blocking_mode_custom_ip": "Custom IP: Respond with a manually set IP address",
@@ -337,8 +321,6 @@
    "encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '/dns-query' location.",
    "encryption_dot": "DNS-over-TLS port",
    "encryption_dot_desc": "If this port is configured, AdGuard Home will run a DNS-over-TLS server on this port.",
-    "encryption_doq": "DNS-over-QUIC port",
-    "encryption_doq_desc": "If this port is configured, AdGuard Home will run a DNS-over-QUIC server on this port. It's experimental and may not be reliable. Also, there are not too many clients that support it at the moment.",
    "encryption_certificates": "Certificates",
    "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on <0>{{link}}</0> or you can buy it from one of the trusted Certificate Authorities.",
    "encryption_certificates_input": "Copy/paste your PEM-encoded certificates here.",
@@ -372,7 +354,7 @@
    "fix": "Fix",
    "dns_providers": "Here is a <0>list of known DNS providers</0> to choose from.",
    "update_now": "Update now",
-    "update_failed": "Auto-update failed. Please <a>follow these steps</a> to update manually.",
+    "update_failed": "Auto-update failed. Please <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>follow the steps</a> to update manually.",
    "processing_update": "Please wait, AdGuard Home is being updated",
    "clients_title": "Clients",
    "clients_desc": "Configure devices connected to AdGuard Home",
@@ -417,8 +399,7 @@
    "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>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_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_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.",
@@ -531,7 +512,6 @@
    "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}}\"?",
@@ -566,12 +546,13 @@
    "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 (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",
+    "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. This value can't larger than 3600 (1 hour)",
+    "cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server",
+    "min_exceeds_max_value": "Minimum value exceeds maximum value",
+    "value_not_larger_than": "Value can't be larger than {{maximum}}",
    "filter_category_general": "General",
    "filter_category_security": "Security",
    "filter_category_regional": "Regional",
@@ -580,11 +561,7 @@
    "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains",
    "filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
    "filter_category_other_desc": "Other blocklists",
-    "setup_config_to_enable_dhcp_server": "Setup config to enable DHCP server",
    "original_response": "Original response",
    "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"
-}
+    "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."
+}
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -11,8 +11,6 @@
    "save_config": "Guardar configuración",
    "enabled_dhcp": "Servidor DHCP habilitado",
    "disabled_dhcp": "Servidor DHCP deshabilitado",
-    "unavailable_dhcp": "DHCP no disponible",
-    "unavailable_dhcp_desc": "AdGuard Home no puede ejecutar un servidor DHCP en tu SO",
    "dhcp_title": "Servidor DHCP (experimental)",
    "dhcp_description": "Si tu router no proporciona la configuración DHCP, puedes utilizar el propio servidor DHCP incorporado de AdGuard.",
    "dhcp_enable": "Habilitar servidor DHCP",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "Asignaciones DHCP estáticas",
    "dhcp_leases_not_found": "No se han encontrado asignaciones DHCP",
    "dhcp_config_saved": "Configuración DHCP guardado correctamente",
-    "dhcp_ipv4_settings": "Configuración DHCP IPv4",
-    "dhcp_ipv6_settings": "Configuración DHCP IPv6",
    "form_error_required": "Campo obligatorio",
    "form_error_ip4_format": "Formato IPv4 no válido",
    "form_error_ip6_format": "Formato IPv6 no válido",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Formato de ID de cliente no válido",
    "form_error_positive": "Debe ser mayor que 0",
    "form_error_negative": "Debe ser igual o mayor que 0",
-    "range_end_error": "Debe ser mayor que el inicio de rango",
    "dhcp_form_gateway_input": "IP de puerta de enlace",
    "dhcp_form_subnet_input": "Máscara de subred",
    "dhcp_form_range_title": "Rango de direcciones IP",
@@ -132,8 +127,7 @@
    "encryption_settings": "Configuración de cifrado",
    "dhcp_settings": "Configuración DHCP",
    "upstream_dns": "Servidores DNS de subida",
-    "upstream_dns_help": "Ingresa las direcciones de los servidores una por línea. <a>Más información</a> sobre la configuración de los servidores DNS de subida.",
-    "upstream_dns_configured_in_file": "Configurado en {{path}}",
+    "upstream_dns_hint": "Si se mantiene este campo vacío, AdGuard Home utilizará <a href='https://www.quad9.net/' target='_blank'>Quad9</a> como DNS de subida.",
    "test_upstream_btn": "Probar DNS de subida",
    "upstreams": "DNS de subida",
    "apply_btn": "Aplicar",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "DNS regular (mediante UDP)",
    "example_upstream_dot": "cifrado <0>DNS mediante TLS</0>",
    "example_upstream_doh": "cifrado <0>DNS mediante HTTPS</0>",
-    "example_upstream_doq": "cifrado <0>DNS mediante QUIC</0>",
    "example_upstream_sdns": "puedes usar <0>DNS Stamps</0> para <1>DNSCrypt</1> o resolutores <2>DNS mediante HTTPS</2>",
    "example_upstream_tcp": "DNS regular (mediante TCP)",
    "all_lists_up_to_date_toast": "Todas las listas ya están actualizadas",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Servidor \"{{key}}\": no se puede utilizar, por favor revisa si lo has escrito correctamente",
    "unblock": "Desbloquear",
    "block": "Bloquear",
-    "disallow_this_client": "No permitir a este cliente",
-    "allow_this_client": "Permitir a este cliente",
-    "block_for_this_client_only": "Bloquear solo para este cliente",
-    "unblock_for_this_client_only": "Desbloquear solo para este cliente",
    "time_table_header": "Hora",
    "date": "Fecha",
    "domain_name_table_header": "Nombre del dominio",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Página",
    "rows_table_footer_text": "filas",
    "updated_custom_filtering_toast": "Reglas de filtrado personalizado actualizadas",
-    "rule_removed_from_custom_filtering_toast": "Regla eliminada de las reglas de filtrado personalizado: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regla añadida a las reglas de filtrado personalizado: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regla eliminada de las reglas de filtrado personalizado",
+    "rule_added_to_custom_filtering_toast": "Regla añadida a las reglas de filtrado personalizado",
    "query_log_response_status": "Estado: {{value}}",
    "query_log_filtered": "Filtrado por {{filter}}",
    "query_log_confirm_clear": "¿Está seguro de que desea borrar todo el registro de consultas?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Modo de bloqueo",
    "default": "Predeterminado",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "IP nulo",
    "custom_ip": "IP personalizada",
    "blocking_ipv4": "Bloqueo de IPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "Límite de cantidad",
    "edns_enable": "Habilitar subred de cliente EDNS",
    "edns_cs_desc": "Si está habilitado, AdGuard Home enviará las subredes de los clientes a los servidores DNS.",
-    "rate_limit_desc": "Número de peticiones por segundo que un solo cliente puede hacer (establecerlo en 0 significa ilimitado)",
+    "rate_limit_desc": "Número de peticiones por segundo que un solo cliente puede hacer (0: 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_refused": "REFUSED: Responde con el código REFUSED",
+    "blocking_mode_default": "Predeterminado: Responde con NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "IP personalizada: Responde con una dirección IP establecida manualmente",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Si el puerto HTTPS está configurado, la interfaz de administración de AdGuard Home será accesible a través de HTTPS, y también proporcionará DNS mediante HTTPS en la ubicación '/dns-query'.",
    "encryption_dot": "Puerto DNS mediante TLS",
    "encryption_dot_desc": "Si este puerto está configurado, AdGuard Home ejecutará un servidor DNS mediante TLS en este puerto.",
-    "encryption_doq": "Puerto DNS mediante QUIC",
-    "encryption_doq_desc": "Si este puerto está configurado, AdGuard Home ejecutará un servidor DNS mediante QUIC en este puerto. Es experimental y puede no ser confiable. Además, no hay muchos clientes que lo soporten por el momento.",
    "encryption_certificates": "Certificados",
    "encryption_certificates_desc": "Para utilizar el cifrado, debes proporcionar una cadena de certificado SSL válida para tu dominio. Puedes obtener un certificado gratuito en <0>{{link}}</0> o puedes comprarlo en una de las autoridades de certificación de confianza.",
    "encryption_certificates_input": "Copia/pega aquí tu certificado codificado PEM.",
@@ -353,14 +338,14 @@
    "encryption_issuer": "Emisor",
    "encryption_hostnames": "Nombres de hosts",
    "encryption_reset": "¿Está seguro de que desea restablecer la configuración de cifrado?",
-    "topline_expiring_certificate": "Tu certificado SSL está a punto de expirar. Actualiza la <0>configuración de cifrado</0>.",
-    "topline_expired_certificate": "Tu certificado SSL ha expirado. Actualiza la <0>configuración de cifrado</0>.",
+    "topline_expiring_certificate": "Tu certificado SSL está a punto de expirar. Actualice la <0>configuración de cifrado</0>.",
+    "topline_expired_certificate": "Tu certificado SSL ha expirado. Actualice la <0>configuración de cifrado</0>.",
    "form_error_port_range": "Ingresa el valor del puerto en el rango de 80 a 65535",
    "form_error_port_unsafe": "Este es un puerto inseguro",
    "form_error_equal": "No debería ser igual",
    "form_error_password": "La contraseña no coincide",
    "reset_settings": "Restablecer configuración",
-    "update_announcement": "¡AdGuard Home {{version}} ya está disponible! <0>Haz clic aquí</0> para más información.",
+    "update_announcement": "¡AdGuard Home {{version}} ya está disponible! <0>Haga clic aquí</0> para más información.",
    "setup_guide": "Guía de configuración",
    "dns_addresses": "Direcciones DNS",
    "dns_start": "El servidor DNS está iniciando",
@@ -369,7 +354,7 @@
    "fix": "Corregir",
    "dns_providers": "Aquí hay una <0>lista de proveedores DNS</0> conocidos para elegir.",
    "update_now": "Actualizar ahora",
-    "update_failed": "Error en la actualización automática. Por favor <a>sigue estos pasos</a> para actualizar manualmente.",
+    "update_failed": "Error en la actualización automática. Por favor <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>sigue los pasos</a> para actualizar manualmente.",
    "processing_update": "Por favor espera, AdGuard Home se está actualizando",
    "clients_title": "Clientes",
    "clients_desc": "Configurar dispositivos conectados con AdGuard Home",
@@ -412,8 +397,8 @@
    "updates_version_equal": "AdGuard Home está actualizado",
    "check_updates_now": "Buscar actualizaciones ahora",
    "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_1": "<0>DNS mediante TLS:</0> Utilice la cadena <1>{{address}}</1>.",
+    "setup_dns_privacy_2": "<0>DNS mediante HTTPS:</0> Utilice 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_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>.",
@@ -425,7 +410,7 @@
    "setup_dns_privacy_other_2": "<0>dnsproxy</0> soporta todos los protocolos DNS seguros conocidos.",
    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> soporta <1>DNS mediante HTTPS</1>.",
    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> soporta <1>DNS mediante HTTPS</1>.",
-    "setup_dns_privacy_other_5": "Encontrarás más implementaciones <0>aquí</0> y <1>aquí</1>.",
+    "setup_dns_privacy_other_5": "Encontrará más implementaciones <0>aquí</0> y <1>aquí</1>.",
    "setup_dns_notice": "Para utilizar <1>DNS mediante HTTPS</1> o <1>DNS mediante TLS</1>, debes <0>configurar el cifrado</0> en la configuración de AdGuard Home.",
    "rewrite_added": "Reescritura DNS para \"{{key}}\" añadido correctamente",
    "rewrite_deleted": "Reescritura DNS para \"{{key}}\" eliminado correctamente",
@@ -468,7 +453,7 @@
    "filter_updated": "La lista ha sido actualizada correctamente",
    "statistics_configuration": "Configuración de estadísticas",
    "statistics_retention": "Retención de estadísticas",
-    "statistics_retention_desc": "Si disminuye el valor del intervalo, se perderán algunos datos",
+    "statistics_retention_desc": "Si disminuye el valor del intervalo, algunos datos estarán perdidos",
    "statistics_clear": "Borrar estadísticas",
    "statistics_clear_confirm": "¿Está seguro de que desea borrar las estadísticas?",
    "statistics_retention_confirm": "¿Está seguro de que desea cambiar la retención de estadísticas? Si disminuye el valor del intervalo, se perderán algunos datos",
@@ -505,7 +490,7 @@
    "rewrite_A": "<0>A</0>: valor especial, mantiene registros <0>A</0> del DNS de subida",
    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantiene registros <0>AAAA</0> del DNS de subida",
    "disable_ipv6": "Deshabilitar IPv6",
-    "disable_ipv6_desc": "Si esta función está habilitada, se descartarán todas las consultas DNS para direcciones IPv6 (tipo AAAA).",
+    "disable_ipv6_desc": "Si esta función está habilitada, se eliminarán todas las consultas DNS para direcciones IPv6 (tipo AAAA).",
    "fastest_addr": "Dirección IP más rápida",
    "fastest_addr_desc": "Consulta todos los servidores DNS y devuelve la dirección IP más rápida de todas las respuestas. Esto ralentizará las consultas DNS, y se debe esperar las respuestas de todos los servidores DNS, pero mejora la conectividad general.",
    "autofix_warning_text": "Si haces clic en \"Corregir\", AdGuard Home configurará tu sistema para utilizar el servidor DNS de AdGuard Home.",
@@ -564,9 +549,10 @@
    "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_min_override_desc": "Anula el valor TTL (mínimo) recibido del servidor DNS de subida. Este valor no puede ser superior a 3600 (1 hora)",
    "cache_ttl_max_override_desc": "Anula el valor TTL (máximo) recibido del servidor DNS de subida",
-    "ttl_cache_validation": "El valor TTL mínimo de la caché debe ser menor o igual al valor máximo",
+    "min_exceeds_max_value": "El valor mínimo supera al valor máximo",
+    "value_not_larger_than": "El valor no puede ser mayor que {{maximum}}",
    "filter_category_general": "General",
    "filter_category_security": "Seguridad",
    "filter_category_regional": "Regional",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Listas que se especializan en bloquear dominios de malware, phishing o estafa",
    "filter_category_regional_desc": "Listas que se centran en anuncios regionales y servidores de rastreo",
    "filter_category_other_desc": "Otras listas de bloqueo",
-    "setup_config_to_enable_dhcp_server": "Configuración para habilitar el servidor DHCP",
    "original_response": "Respuesta original",
    "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.",
-    "experimental": "experimental"
+    "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."
 }
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -124,6 +124,7 @@
    "encryption_settings": "تنظیمات رمزگُذاری",
    "dhcp_settings": "تنظیمات DHCP",
    "upstream_dns": "سرورهای DNS جریان ارسالی",
+    "upstream_dns_hint": "اگر این فیلد را خالی نگه دارید، AdGuard Home از <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> بعنوان یک جریان ارسالی استفاده می کند. از پیشوند tls:// برای سرورهای DNS over TLS استفاده کنید.",
    "test_upstream_btn": "تست جریان ارسالی",
    "upstreams": "جریان ارسالی",
    "apply_btn": "اِعمال",
@@ -201,8 +202,8 @@
    "page_table_footer_text": "صفحه",
    "rows_table_footer_text": "سطر",
    "updated_custom_filtering_toast": "دستورات فیلترینگ دستی بروز رسانی شده است",
-    "rule_removed_from_custom_filtering_toast": "دستور از دستورات فیلترینگ دستی حذف شد {{rule}}",
-    "rule_added_to_custom_filtering_toast": "دستور به دستورات فیلترینگ دستی اضافه شد {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "دستور از دستورات فیلترینگ دستی حذف شد",
+    "rule_added_to_custom_filtering_toast": "دستور به دستورات فیلترینگ دستی اضافه شد",
    "query_log_response_status": "وضعیت: {{value}}",
    "query_log_filtered": "فیلتر شده با {{filter}}",
    "query_log_confirm_clear": "آیا واقعا میخواهید کل وقایع جستار را پاک کنید؟",
@@ -230,9 +231,10 @@
    "rate_limit": "میزان محدودیت",
    "edns_enable": "فعالسازی زیرشبکه کلاینت EDNS",
    "edns_cs_desc": "اگر فعال باشد،AdGuard Home زیرشبکه های کلاینت ها را به سرورهای DNS می فرستد.",
+    "rate_limit_desc": "تعداد درخواست های بر ثانیه مجازی که یک کلاینت میتواند بسازد (0: نامحدود)",
    "blocking_ipv4_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده A",
    "blocking_ipv6_desc": "آدرس آی پی برگشت داده شده برای درخواست مسدود شده AAAA",
-    "blocking_mode_default": "پیش فرض: وقتی مسدود شود با دستور سبک-مسدودساز تبلیغ REFUSED پاسخ میدهد،پاسخ با آدرس آی پی تعیین شده در دستور وقتی با دستور /etc/hosts-style rule مسدود شود",
+    "blocking_mode_default": "پیش فرض: وقتی مسدود شود با دستور سبک-مسدودساز تبلیغ NXDOMAIN پاسخ میدهد،پاسخ با آدرس آی پی تعیین شده در دستور وقتی با دستور /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": "آی پی دستی: پاسخ با آدرس آی پی دستی تنظیم شده",
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -104,7 +104,7 @@
    "number_of_dns_query_blocked_24_hours": "Un nombre de requêtes DNS bloquées par les filtres  adblock et les listes de blocage des hosts",
    "number_of_dns_query_blocked_24_hours_by_sec": "Un nombre de requêtes DNS bloquées par le module Sécurité de navigation d'AdGuard",
    "number_of_dns_query_blocked_24_hours_adult": "Un nombre de sites à contenu adulte bloqués",
-    "enforced_save_search": "Recherche sécurisée forcée",
+    "enforced_save_search": "Recherche sécurisée renforcée",
    "number_of_dns_query_to_safe_search": "Un nombre de requêtes DNS faites avec la Recherche securisée",
    "average_processing_time": "Temps moyen de traitement",
    "average_processing_time_hint": "Temps moyen (en millisecondes) de traitement d'une requête DNS",
@@ -127,6 +127,7 @@
    "encryption_settings": "Paramètres de chiffrement",
    "dhcp_settings": "Paramètres DHCP",
    "upstream_dns": "Serveurs DNS upstream",
+    "upstream_dns_hint": "Si vous laissez ce champ vide, AdGuard Home va utiliser <a href='https://www.quad9.net/' target='_blank'>Quad9</a> comme upstream.",
    "test_upstream_btn": "Tester les upstreams",
    "upstreams": "En amont",
    "apply_btn": "Appliquer",
@@ -207,8 +208,8 @@
    "page_table_footer_text": "Page",
    "rows_table_footer_text": "lignes",
    "updated_custom_filtering_toast": "Règles de filtrage d'utilisateur mises à jour",
-    "rule_removed_from_custom_filtering_toast": "Règle retirée des règles d'utilisateur: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Règle ajoutée aux règles d'utilisateur: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Règle retirée des règles d'utilisateur",
+    "rule_added_to_custom_filtering_toast": "Règle ajoutée aux règles d'utilisateur",
    "query_log_response_status": "Statut : {{value}}",
    "query_log_filtered": "Filtré par {{filter}}",
    "query_log_confirm_clear": "Êtes-vous sûr de vouloir effacer tout le journal des requêtes ?",
@@ -229,7 +230,6 @@
    "blocking_mode": "Mode du blocage",
    "default": "Par défaut",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "IP nulle",
    "custom_ip": "IP personnalisée",
    "blocking_ipv4": "Blocage IPv4",
@@ -241,10 +241,10 @@
    "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 (0 : 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_refused": "REFUSED: Répondre avec le code REFUSED",
+    "blocking_mode_default": "Par défaut : Répondre avec NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "IP personnalisée : Répondre avec une adresse IP définie manuellement",
@@ -547,7 +547,10 @@
    "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_min_override_desc": "Remplacer la valeur TTL (minimum) reçue du serveur en amont. Cette valeur ne peut pas dépasser 3600 (1 heure)",
    "cache_ttl_max_override_desc": "Remplacer la valeur TTL (maximale) reçue du serveur en amont",
+    "min_exceeds_max_value": "La valeur minimum excède la valeur maximum",
+    "value_not_larger_than": "La valeur ne peut pas dépasser {{maximum}}",
    "filter_category_general": "Général",
    "filter_category_security": "Sécurité",
    "filter_category_regional": "Régional",
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -11,8 +11,6 @@
    "save_config": "Spremi konfiguraciju",
    "enabled_dhcp": "DHCP poslužitelj je omogućen",
    "disabled_dhcp": "DHCP poslužitelj je onemogućen",
-    "unavailable_dhcp": "DHCP je nedostupan",
-    "unavailable_dhcp_desc": "AdGuard Home ne može pokrenuti DHCP poslužitelj na vašem OS-u",
    "dhcp_title": "DHCP poslužitelj (eksperimentalno!)",
    "dhcp_description": "Ukoliko vaš router ne pruža DHCP postavke, možete koristiti AdGuardov ugrađeni DHCP poslužitelj.",
    "dhcp_enable": "Omogući DHCP poslužitelj",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP static leases",
    "dhcp_leases_not_found": "Nisu pronađeni DHCP leases",
    "dhcp_config_saved": "Postavke DHCP poslužitelja su uspješno spremljene",
-    "dhcp_ipv4_settings": "DHCP IPv4 postavke",
-    "dhcp_ipv6_settings": "DHCP IPv6 postavke",
    "form_error_required": "Obavezno polje",
    "form_error_ip4_format": "Nevažeći IPv4 format",
    "form_error_ip6_format": "Nevažeći IPv6 format",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Nevažeći format ID-a klijenta",
    "form_error_positive": "Mora biti veće od 0",
    "form_error_negative": "Mora biti jednako ili veće od 0",
-    "range_end_error": "Mora biti veće od početne vrijednosti raspona",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet maskiranje",
    "dhcp_form_range_title": "Raspon IP adresa",
@@ -106,7 +101,7 @@
    "number_of_dns_query_days": "Broj DNS upita obrađenih u posljednja {{count}} dana",
    "number_of_dns_query_days_plural": "Broj DNS upita obrađenih u posljednja {{count}} dana",
    "number_of_dns_query_24_hours": "Broj DNS upita obrađenih u posljednja 24 sata",
-    "number_of_dns_query_blocked_24_hours": "Broj DNS zahtjeva koji su blokirani od strane filtara za blokiranje oglasa i lista nedopuštenih poslužitelja",
+    "number_of_dns_query_blocked_24_hours": "Broj DNS zahtjeva koji su blokirani od strane filtara za blokiranje oglasa i lista neželjenih poslužitelja",
    "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahtjeva koje je blokirao modul AdGuard zaštita pregledavanja",
    "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih stranica s sadržajem za odrasle",
    "enforced_save_search": "Omogućeno sigurno pretraživanje",
@@ -116,7 +111,7 @@
    "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>.",
    "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_browsing_sec_hint": "AdGuard Home će provjeriti nalazi li se domena na popisu neželjenih 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",
    "use_adguard_parental_hint": "AdGuard Home provjeriti će sadrži li domena sadržaj za odrasle. Koristi isti API za zaštitu privatnosti kao i naša usluga zaštite pregledavanja.",
    "enforce_safe_search": "Omogući sigurno pretraživanje",
@@ -124,16 +119,15 @@
    "no_servers_specified": "Nije odabran nijedan poslužitelj",
    "general_settings": "Opće postavke",
    "dns_settings": "DNS postavke",
-    "dns_blocklists": "DNS popisi nedopuštenih",
-    "dns_allowlists": "DNS popisi dopuštenih",
-    "dns_blocklists_desc": "AdGuard Home će blokirati domene koje odgovaraju popisu nedopuštenih.",
-    "dns_allowlists_desc": "Domene iz DNS popisa dopuštenih će biti omogućene čak i kada se nalaze na nekoj listi nedopuštenih.",
+    "dns_blocklists": "DNS popisi blokiranih",
+    "dns_allowlists": "DNS popisi omogućenih",
+    "dns_blocklists_desc": "AdGuard Home će blokirati domene koje odgovaraju popisu blokiranih.",
+    "dns_allowlists_desc": "Domene iz DNS popisa omogućenih će biti omogućene čak i kada se nalaze na nekoj listi blokiranih.",
    "custom_filtering_rules": "Prilagođena pravila filtriranja",
    "encryption_settings": "Postavke šifriranja",
    "dhcp_settings": "DHCP postavke",
    "upstream_dns": "Upstream DNS poslužitelji",
-    "upstream_dns_help": "Unesite adrese poslužitelja po jednu u retku. <a>Saznajte više</a> o postavljanju uzlaznih DNS poslužitelja.",
-    "upstream_dns_configured_in_file": "Postavljeno u {{path}}",
+    "upstream_dns_hint": "Ako se ovo polje ostavi prazno, AdGuard Home će koristiti <a href='https://www.quad9.net/' target='_blank'>Quad9</a> kao upstream.",
    "test_upstream_btn": "Testiraj upstream-ove",
    "upstreams": "Upstreams",
    "apply_btn": "Primijeni",
@@ -156,22 +150,22 @@
    "delete_table_action": "Ukloni",
    "elapsed": "Proteklo",
    "filters_and_hosts_hint": "AdGuard Home razumije osnovna pravila blokiranja oglasa i sintaksu hosts datoteka.",
-    "no_blocklist_added": "Nema dodanih popisa nedopuštenih",
-    "no_whitelist_added": "Nema dodanih popisa dopuštenih",
-    "add_blocklist": "Dodaj popis nedopuštenih",
-    "add_allowlist": "Dodaj popis dopuštenih",
+    "no_blocklist_added": "Nema dodanih popisa blokiranih",
+    "no_whitelist_added": "Nema dodanih popisa omogućenih",
+    "add_blocklist": "Dodaj popis blokiranih",
+    "add_allowlist": "Dodaj popis omogućenih",
    "cancel_btn": "Poništi",
    "enter_name_hint": "Unesite naziv",
    "enter_url_or_path_hint": "Unesite URL ili putanju liste",
    "check_updates_btn": "Provjeri ažuriranja",
-    "new_blocklist": "Novi popis nedopuštenih",
-    "new_allowlist": "Novi popis dopuštenih",
-    "edit_blocklist": "Uredi popis nedopuštenih",
-    "edit_allowlist": "Uredi popis dopuštenih",
-    "choose_blocklist": "Odaberite popis nedopuštenih",
+    "new_blocklist": "Novi popis blokiranih",
+    "new_allowlist": "Novi popis omogućenih",
+    "edit_blocklist": "Uredi popis blokiranih",
+    "edit_allowlist": "Uredi popis omogućenih",
+    "choose_blocklist": "Odaberite popis blokiranih",
    "choose_allowlist": "Odaberite popis dopuštenih",
-    "enter_valid_blocklist": "Unesite valjani URL za popis nedopuštenih.",
-    "enter_valid_allowlist": "Unesite valjani URL za popis dopuštenih.",
+    "enter_valid_blocklist": "Unesite valjani URL za popis blokiranih.",
+    "enter_valid_allowlist": "Unesite valjani URL za popis omogućenih.",
    "form_error_url_format": "Nevažeći URL format",
    "form_error_url_or_path_format": "Nevažeći URL ili putanja od liste",
    "custom_filter_rules": "Prilagođena pravila filtriranja",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "zadani DNS (putem UDP)",
    "example_upstream_dot": "šifrirano <0>DNS-over-TLS</0>",
    "example_upstream_doh": "šifrirano <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "šifrirano <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "možete koristiti <0>DNS Stamps</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2> rezolvere",
    "example_upstream_tcp": "zadani DNS (putem TCP)",
    "all_lists_up_to_date_toast": "Svi popisi su ažurirani",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "\"{{key}}\" poslužitelja: ne može se upotrijebiti, provjerite jeste li to ispravno napisali",
    "unblock": "Odblokiraj",
    "block": "Blokiraj",
-    "disallow_this_client": "Onemogući ovog klijenta",
-    "allow_this_client": "Omogući ovog klijenta",
-    "block_for_this_client_only": "Blokiraj samo za ovog klijenta",
-    "unblock_for_this_client_only": "Odblokiraj samo za ovog klijenta",
    "time_table_header": "Vrijeme",
    "date": "Datum",
    "domain_name_table_header": "Naziv domene",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Stranica",
    "rows_table_footer_text": "redova",
    "updated_custom_filtering_toast": "Ažurirana su prilagođena pravila filtriranja",
-    "rule_removed_from_custom_filtering_toast": "Pravilo je uklonjeno iz prilagođenih pravila filtriranja: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Pravilo je dodano u prilagođena pravila filtriranja: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Pravilo je uklonjeno iz prilagođenih pravila filtriranja",
+    "rule_added_to_custom_filtering_toast": "Pravilo je dodano u prilagođena pravila filtriranja",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrirao {{filter}}",
    "query_log_confirm_clear": "Jeste li sigurni da želite ukloniti zapise upita?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Način blokiranja",
    "default": "Zadano",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Null IP",
    "custom_ip": "Prilagođen IP",
    "blocking_ipv4": "Blokiranje IPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "Ograničenje",
    "edns_enable": "Omogući EDNS Client Subnet",
    "edns_cs_desc": "Ako je omogućeno, AdGuard Home će slati podmreže klijenata na DNS poslužitelje.",
-    "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu (postavljanje na 0 znači neograničeno)",
+    "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu (0: 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_refused": "REFUSED: Odgovorite s REFUSED kôdom",
+    "blocking_mode_default": "Zadano: Odgovor s NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "Prilagođeni IP: Odgovor s ručno postavljenom IP adresom",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Ako je HTTPS port postavljen, AdGuard Home administracijsko sučelje biti će dostupno putem HTTPS-a, a također će pružiti DNS-over-HTTPS na '/dns-query' lokaciji.",
    "encryption_dot": "DNS-over-TLS port",
    "encryption_dot_desc": "Ako je ovaj port postavljen, AdGuard Home će pokrenuti DNS-over-TLS poslužitelj na ovom portu.",
-    "encryption_doq": "DNS-over-QUIC port",
-    "encryption_doq_desc": "Ako je ovaj port postavljen, AdGuard Home će na ovom portu pokrenuti DNS-over-QUIC poslužitelj. Eksperimentalno je i možda nije pouzdano. Također, trenutno nema previše klijenata koji to podržavaju.",
    "encryption_certificates": "Certifikati",
    "encryption_certificates_desc": "Da biste koristili šifriranje, za svoju domenu morate osigurati važeći lanac SSL certifikata. Besplatan certifikat možete dobiti na <0>{{link}}</0> ili ga možete kupiti od jednog od pouzdanih izdavatelja certifikata.",
    "encryption_certificates_input": "Zalijepite svoje PEM-kodirane certifikate ovdje.",
@@ -369,7 +354,7 @@
    "fix": "Popravi",
    "dns_providers": "Ovo je <0>popis poznatih DNS poslužitelja</0> za izbor.",
    "update_now": "Ažuriraj sada",
-    "update_failed": "Neuspješno automatsko ažuriranje. Molimo <a>pratite ove korake</a> za ručno ažuriranje.",
+    "update_failed": "Ne uspješno automatsko ažuriranje. Molimo, <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>pratite ove korake</a> za ručno ažuriranje.",
    "processing_update": "Molimo pričekajte, AdGuard Home se ažurira",
    "clients_title": "Klijenti",
    "clients_desc": "Postavite uređaje povezane na AdGuard Home",
@@ -555,18 +540,19 @@
    "filtered": "Filtrirano",
    "rewritten": "Prepisano",
    "safe_search": "Sigurno pretraživanje",
-    "blocklist": "Popis nedopuštenih",
+    "blocklist": "Popis neželjenih",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Veličina predmemorije",
    "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",
+    "cache_ttl_min_override": "Nadjačaj minimalni TTL",
+    "cache_ttl_max_override": "Nadjačaj maksimalni TTL",
    "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_min_override_desc": "Nadjačaj TTL vrijednost (minimum) dobivenu od upstream poslužitelja. Ova vrijednost ne može biti veća od 3600 (1 sat)",
    "cache_ttl_max_override_desc": "Nadjačaj TTL vrijednost (maksimum) dobivenu od upstream poslužitelja",
-    "ttl_cache_validation": "Minimalna vrijednost TTL predmemorije mora biti manja ili jednaka maksimalnoj vrijednosti",
+    "min_exceeds_max_value": "Minimalna vrijednost je veća od maksimalne",
+    "value_not_larger_than": "Vrijednost ne može biti veća od {{maximum}}",
    "filter_category_general": "Općenito",
    "filter_category_security": "Sigurnost",
    "filter_category_regional": "Regionalno",
@@ -574,11 +560,8 @@
    "filter_category_general_desc": "Popisi koji blokiraju pratitelje i oglase na većini uređaja",
    "filter_category_security_desc": "Popisi koju su specijalizirani za blokiranje zlonamjernih programa, krađe identiteta ili domena za obmanu",
    "filter_category_regional_desc": "Popisi koji se fokusiraju na regionalne oglase i poslužitelje za praćenje",
-    "filter_category_other_desc": "Ostali popisi nedopuštenih",
-    "setup_config_to_enable_dhcp_server": "Postavite postavke za omogućavanje DHCP poslužitelja",
+    "filter_category_other_desc": "Ostali popisi blokiranih",
    "original_response": "Originalni odgovor",
    "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.",
-    "experimental": "Eksperimentalno"
+    "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."
 }
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -1,566 +0,0 @@
-{
-    "client_settings": "Kliens beállítások",
-    "example_upstream_reserved": "Megadhat egy DNS kiszolgálót <0>egy adott domainhez vagy domainekhez</0>",
-    "upstream_parallel": "Használjon párhuzamos lekéréseket a domainek feloldásának felgyorsításához az összes upstream kiszolgálóra való egyidejű lekérdezéssel",
-    "parallel_requests": "Párhuzamos lekérések",
-    "load_balancing": "Terheléselosztás",
-    "load_balancing_desc": "Egyszerre csak egy szerverről történjen lekérdezés. Az AdGuard Home egy súlyozott, véletlenszerű algoritmust fog használni a megfelelő szerver kiválasztására, így a leggyorsabb szervert gyakrabban fogja használni.",
-    "bootstrap_dns": "Bootstrap DNS kiszolgálók",
-    "bootstrap_dns_desc": "Bootstrap DNS szerverek feloldják a megadott DoH/DoT feloldók IP-címeit.",
-    "check_dhcp_servers": "DHCP szerverek keresése",
-    "save_config": "Konfiguráció mentése",
-    "enabled_dhcp": "DHCP szerver engedélyezve",
-    "disabled_dhcp": "DHCP szerver letiltva",
-    "unavailable_dhcp": "A DHCP nem elérhető",
-    "unavailable_dhcp_desc": "Az AdGuard Home nem tud DHCP szervert futtatni az operációs rendszerén",
-    "dhcp_title": "DHCP szerver (kísérleti!)",
-    "dhcp_description": "Ha a router nem nyújt DHCP beállításokat, akkor használhatja helyette az AdGuard saját, beépített DHCP szerverét.",
-    "dhcp_enable": "DHCP szerver engedélyezése",
-    "dhcp_disable": "DHCP szerver letiltása",
-    "dhcp_not_found": "Biztonságos a beépített DHCP szerver engedélyezése - ugyanis nem találtunk aktív DHCP szervert a hálózaton. Javasoljuk azonban, hogy ellenőrizze kézileg is, mivel az automatikus tesztünk jelenleg nem ad 100%-os garanciát.",
-    "dhcp_found": "Egy aktív DHCP szerver található a hálózaton. Nem biztonságos a beépített DHCP szerver engedélyezése.",
-    "dhcp_leases": "DHCP bérletek",
-    "dhcp_static_leases": "Statikus DHCP bérletek",
-    "dhcp_leases_not_found": "Nem találhatóak DHCP bérletek",
-    "dhcp_config_saved": "DHCP beállítások elmentve",
-    "dhcp_ipv4_settings": "DHCP IPv4 Beállítások",
-    "dhcp_ipv6_settings": "DHCP IPv6 Beállítások",
-    "form_error_required": "Kötelező mező",
-    "form_error_ip4_format": "Érvénytelen IPv4 formátum",
-    "form_error_ip6_format": "Érvénytelen IPv6 formátum",
-    "form_error_ip_format": "Érvénytelen IP formátum",
-    "form_error_mac_format": "Érvénytelen MAC formátum",
-    "form_error_client_id_format": "Érvénytelen kliens ID formátum",
-    "form_error_positive": "0-nál nagyobbnak kell lennie",
-    "form_error_negative": "Legalább 0-nak kell lennie",
-    "range_end_error": "Nagyobbnak kell lennie, mint a tartomány kezdete",
-    "dhcp_form_gateway_input": "Átjáró IP",
-    "dhcp_form_subnet_input": "Alhálózati maszk",
-    "dhcp_form_range_title": "IP-címek tartománya",
-    "dhcp_form_range_start": "Tartomány kezdete",
-    "dhcp_form_range_end": "Tartomány vége",
-    "dhcp_form_lease_title": "DHCP bérlési ideje (másodpercben)",
-    "dhcp_form_lease_input": "Bérlési idő",
-    "dhcp_interface_select": "DHCP interfész kiválasztása",
-    "dhcp_hardware_address": "Hardvercím",
-    "dhcp_ip_addresses": "IP-címek",
-    "ip": "IP",
-    "dhcp_table_hostname": "Hosztnév",
-    "dhcp_table_expires": "Lejár",
-    "dhcp_warning": "Ha mindenképpen engedélyezni szeretné a DHCP szervert, akkor győződjön meg arról, hogy nincs-e más aktív DHCP szerver a hálózaton. Ellenkező esetben tönkreteheti az eszközei internetkapcsolatát!",
-    "dhcp_error": "Nem tudtuk meghatározni, hogy van-e másik DHCP szerver a hálózaton.",
-    "dhcp_static_ip_error": "A DHCP szerver használatához statikus IP-címet kell beállítani. Nem sikerült meghatározni, hogy ez a hálózati interfész statikus IP-cím használatával van-e beállítva. Állítson be kézzel egy statikus IP-címet.",
-    "dhcp_dynamic_ip_found": "A rendszer dinamikus IP-cím konfigurációt használ az <0>{{interfaceName}}</0> interfészhez. A DHCP szerver használatához statikus IP-címet kell beállítani. Jelenlegi IP-címe: <0>{{ipAddress}}</0>. Automatikusan beállítjuk ezt az IP címet statikusnak, ha rányom a DHCP engedélyezése gombra.",
-    "dhcp_lease_added": "Statikus bérlet \"{{key}}\" sikeresen hozzáadva",
-    "dhcp_lease_deleted": "Statikus bérlet \"{{key}}\" sikeresen törölve",
-    "dhcp_new_static_lease": "Új statikus bérlet",
-    "dhcp_static_leases_not_found": "Nem találhatóak statikus DHCP bérletek",
-    "dhcp_add_static_lease": "Statikus bérlet hozzáadása",
-    "dhcp_reset": "Biztosan visszaállítja a DHCP beállításokat?",
-    "country": "Ország",
-    "city": "Város",
-    "delete_confirm": "Biztosan törli a \"{{key}}\" -t?",
-    "form_enter_hostname": "Adja meg a hosztnevet",
-    "error_details": "Hiba részletei",
-    "response_details": "Válasz részletei",
-    "request_details": "Kérés részletei",
-    "client_details": "Kliens részletei",
-    "details": "Részletek",
-    "back": "Vissza",
-    "dashboard": "Irányítópult",
-    "settings": "Beállítások",
-    "filters": "Szűrők",
-    "filter": "Szűrő",
-    "query_log": "Lekérdezési napló",
-    "compact": "Kompakt",
-    "nothing_found": "Nincs találat",
-    "faq": "GYIK",
-    "version": "Verzió",
-    "address": "Cím",
-    "protocol": "Protokoll",
-    "on": "BE",
-    "off": "KI",
-    "copyright": "Copyright",
-    "homepage": "Honlap",
-    "report_an_issue": "Probléma bejelentése",
-    "privacy_policy": "Adatvédelmi irányelvek",
-    "enable_protection": "Védelem engedélyezése",
-    "enabled_protection": "Védelem engedélyezve",
-    "disable_protection": "Védelem letiltása",
-    "disabled_protection": "Letiltott védelem",
-    "refresh_statics": "Statisztikák frissítése",
-    "dns_query": "DNS lekérdezések",
-    "blocked_by": "<0>Szűrők által blokkolt</0>",
-    "stats_malware_phishing": "Blokkolt kártevő/adathalászat",
-    "stats_adult": "Blokkolva a felnőtt tartalmak által",
-    "stats_query_domain": "Leglátogatottabb domainek",
-    "for_last_24_hours": "az utóbbi 24 órában",
-    "for_last_days": "az utóbbi {{count}} napban",
-    "for_last_days_plural": "az utóbbi {{count}} napban",
-    "no_domains_found": "Nem található domain",
-    "requests_count": "Kérések száma",
-    "top_blocked_domains": "Legtöbbet blokkolt domainek",
-    "top_clients": "Legaktívabb kliensek",
-    "no_clients_found": "Nem található kliens",
-    "general_statistics": "Általános statisztikák",
-    "number_of_dns_query_days": "Lekérdezések száma az utolsó {{count}} napban",
-    "number_of_dns_query_days_plural": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} napban",
-    "number_of_dns_query_24_hours": "Az elmúlt 24 órában feldolgozott DNS lekérdezések száma",
-    "number_of_dns_query_blocked_24_hours": "A hirdetésblokkoló szűrők és a hosztfájlok által letiltott DNS kérések száma",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Az AdGuard böngészési biztonság modulja által letiltott DNS kérések száma",
-    "number_of_dns_query_blocked_24_hours_adult": "Blokkolt felnőtt tartalmak száma",
-    "enforced_save_search": "Kényszerített biztonságos keresés",
-    "number_of_dns_query_to_safe_search": "A biztonságos keresésre kényszerített DNS lekérdezések száma",
-    "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.",
-    "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",
-    "use_adguard_parental_hint": "Az AdGuard Home ellenőrzi, hogy a domain tartalmaz-e felnőtteknek szóló anyagokat. Ugyanazokat az adatvédelmi API-kat használja, mint a böngésző biztonsági webszolgáltatás.",
-    "enforce_safe_search": "Biztonságos keresés kényszerítése",
-    "enforce_save_search_hint": "Az AdGuard Home a következő keresőmotorokban biztosíthatja a biztonságos keresést: Google, Youtube, Bing, DuckDuckGo és Yandex.",
-    "no_servers_specified": "Nincsenek megadott kiszolgálók",
-    "general_settings": "Általános beállítások",
-    "dns_settings": "DNS beállítások",
-    "dns_blocklists": "DNS blokkolási listák",
-    "dns_allowlists": "DNS engedélyezési listák",
-    "dns_blocklists_desc": "Az AdGuard Home blokkolni fogja azokat a domaineket, amik szerepelnek a blokkolási listán.",
-    "dns_allowlists_desc": "A DNS engedélyezési listán szereplő domainek engedélyezve lesznek, akkor is, ha szerepelnek bármelyik blokkolási listán.",
-    "custom_filtering_rules": "Egyéni szűrési szabályok",
-    "encryption_settings": "Titkosítási beállítások",
-    "dhcp_settings": "DHCP beállítások",
-    "upstream_dns": "Upstream DNS-kiszolgálók",
-    "test_upstream_btn": "Upstreamek tesztelése",
-    "upstreams": "Upstream-ek",
-    "apply_btn": "Alkalmaz",
-    "disabled_filtering_toast": "Szűrés letiltva",
-    "enabled_filtering_toast": "Szűrés engedélyezve",
-    "disabled_safe_browsing_toast": "Bbiztonságos böngészés letiltva",
-    "enabled_safe_browsing_toast": "Biztonságos böngészés engedélyezve",
-    "disabled_parental_toast": "Szülői felügyelet letiltva",
-    "enabled_parental_toast": "Szülői felügyelet engedélyezve",
-    "disabled_safe_search_toast": "Biztonságos keresés letiltva",
-    "enabled_save_search_toast": "Biztonságos keresés engedélyezve",
-    "enabled_table_header": "Engedélyezve",
-    "name_table_header": "Név",
-    "list_url_table_header": "Lista URL-je",
-    "rules_count_table_header": "Szabályok száma",
-    "last_time_updated_table_header": "Utoljára frissítve",
-    "actions_table_header": "Műveletek",
-    "request_table_header": "Kérés",
-    "edit_table_action": "Szerkesztés",
-    "delete_table_action": "Törlés",
-    "elapsed": "Eltelt",
-    "filters_and_hosts_hint": "Az AdGuard Home tudja értelmezni az alapvető hirdetésblokkolási szabályok, valamint a hosztfájlok szintaxisát.",
-    "no_blocklist_added": "Nincsnek blokkolási listák hozzáadva",
-    "no_whitelist_added": "Nincsenek engedélyezési listák hozzáadva",
-    "add_blocklist": "Blokkolási lista hozzáadása",
-    "add_allowlist": "Engedélyezési lista hozzáadása",
-    "cancel_btn": "Mégse",
-    "enter_name_hint": "Adja meg a nevet",
-    "enter_url_or_path_hint": "Írjon be egy URL-t vagy egy útvonalat a listához",
-    "check_updates_btn": "Frissítések keresése",
-    "new_blocklist": "Új blokkolási lista",
-    "new_allowlist": "Új engedélyezési lista",
-    "edit_blocklist": "Blokkolási lista módosítása",
-    "edit_allowlist": "Engedélyezési lista módosítása",
-    "choose_blocklist": "Blokkolási lista választás",
-    "choose_allowlist": "Engedélyezési lista választás",
-    "enter_valid_blocklist": "Adjon meg egy érvényes URL-t a blokkolási listához.",
-    "enter_valid_allowlist": "Adjon meg egy érvényes URL-t az engedélyezési listához.",
-    "form_error_url_format": "Érvénytelen URL formátum",
-    "form_error_url_or_path_format": "Helytelen URL vagy elérési út a listához",
-    "custom_filter_rules": "Egyéni szűrési szabályok",
-    "custom_filter_rules_hint": "Adjon meg egy szabályt egy sorban. Használhat egyszerű hirdetésblokkolási szabályokat vagy hosztfájl szintaxist.",
-    "examples_title": "Példák",
-    "example_meaning_filter_block": "letiltja a hozzáférést az example.org domainhez, valamint annak az összes aldomainjéhez is",
-    "example_meaning_filter_whitelist": "feloldja a hozzáférést az example.org domainhez, valamint annak az összes aldomainjéhez is",
-    "example_meaning_host_block": "Az AdGuard Home mostantol a 127.0.0.1 címre irányítja az example.org domaint (de az aldomaineket nem).",
-    "example_comment": "! Ide írhat egy megjegyzést",
-    "example_comment_meaning": "csak egy megjegyzés",
-    "example_comment_hash": "# Ez is egy megjegyzés",
-    "example_regex_meaning": "megakadályozza a hozzáférést a reguláris kifejezéssel egyező domaineknél",
-    "example_upstream_regular": "hagyományos DNS (UDP felett)",
-    "example_upstream_dot": "titkosított <0>DNS-over-TLS</0>",
-    "example_upstream_doh": "titkosított <0>DNS-over-HTTPS</0>",
-    "example_upstream_sdns": "használhatja a <0> DNS Stamps</0>-ot a <1>DNSCrypt</1> vagy a <2>DNS-over-HTTPS</2> feloldások érdekében",
-    "example_upstream_tcp": "hagyományos DNS (TCP felett)",
-    "all_lists_up_to_date_toast": "Már minden lista naprakész",
-    "updated_upstream_dns_toast": "Frissítette az upstream DNS-kiszolgálókat",
-    "dns_test_ok_toast": "A megadott DNS-kiszolgálók megfelelően működnek",
-    "dns_test_not_ok_toast": "Szerver \"{{key}}\": nem használható, ellenőrizze, hogy helyesen írta-e be",
-    "unblock": "Feloldás",
-    "block": "Blokkolás",
-    "time_table_header": "Idő",
-    "date": "Dátum",
-    "domain_name_table_header": "Domain név",
-    "domain_or_client": "Domain vagy kliens",
-    "type_table_header": "Típus",
-    "response_table_header": "Válasz",
-    "response_code": "Válaszkód",
-    "client_table_header": "Kliens",
-    "empty_response_status": "Üres",
-    "show_all_filter_type": "Összes mutatása",
-    "show_filtered_type": "Szűrtek megjelenítése",
-    "no_logs_found": "Nem található napló",
-    "refresh_btn": "Frissítés",
-    "previous_btn": "Előző",
-    "next_btn": "Következő",
-    "loading_table_status": "Betöltés...",
-    "page_table_footer_text": "Oldal",
-    "rows_table_footer_text": "sor",
-    "updated_custom_filtering_toast": "Egyéni szűrőszabályok frissítve",
-    "rule_removed_from_custom_filtering_toast": "Szabály eltávolítva az egyéni szűrőszabályok közül: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Szabály hozzáadva az egyéni szűrőszabályokhoz: {{rule}}",
-    "query_log_response_status": "Állapot: {{value}}",
-    "query_log_filtered": "{{filter}} által szűrve",
-    "query_log_confirm_clear": "Biztosan törölni szerené a lekérdezési naplót?",
-    "query_log_cleared": "A lekérdezési napló sikeresen törölve",
-    "query_log_updated": "A lekérdezési napló sikeresen frissítve lett",
-    "query_log_clear": "Lekérdezési napló törlése",
-    "query_log_retention": "Lekérdezési naplók megtartása",
-    "query_log_enable": "Naplózás engedélyezése",
-    "query_log_configuration": "Naplózás beállítása",
-    "query_log_disabled": "Lekérdezési napló kikapcsolva. Bekapcsolható a <0>beállításokban</0>",
-    "query_log_strict_search": "Használjon \"dupla idézőjelet\" a pontos kereséshez",
-    "query_log_retention_confirm": "Biztos benne, hogy megváltoztatja a kérések naplójának megőrzési idejét? Ha csökkentette az értéket, a megadottnál korábbi adatok elvesznek",
-    "anonymize_client_ip": "Kliens IP-címének anonimizálása",
-    "anonymize_client_ip_desc": "Ne mentse el a kliens teljes IP-címét a naplókban és a statisztikákban",
-    "dns_config": "DNS szerver beállításai",
-    "dns_cache_config": "DNS gyorsítótár beállításai",
-    "dns_cache_config_desc": "Itt tudja konfigurálni a DNS gyorsítótárat",
-    "blocking_mode": "Blokkolás módja",
-    "default": "Alapértelmezett",
-    "nxdomain": "NXDOMAIN",
-    "null_ip": "Null IP-cím",
-    "custom_ip": "Egyedi IP",
-    "blocking_ipv4": "IPv4 blokkolása",
-    "blocking_ipv6": "IPv6 blokkolása",
-    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_tls": "DNS-over-TLS",
-    "plain_dns": "Egyszerű DNS",
-    "form_enter_rate_limit": "Adja meg a kérések maximális számát",
-    "rate_limit": "Kérések korlátozása",
-    "edns_enable": "EDNS kliens alhálózat engedélyezése",
-    "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",
-    "upstream_dns_client_desc": "Ha üresen hagyja ezt a mezőt, az AdGuard Home azokat a szervereket fogja használni, amik a <0>DNS beállításokban</0> vannak beállítva.",
-    "tracker_source": "Követő forrása",
-    "source_label": "Forrás",
-    "found_in_known_domain_db": "Benne van az ismert domainek listájában.",
-    "category_label": "Kategória",
-    "rule_label": "Szabály",
-    "list_label": "Lista",
-    "unknown_filter": "Ismeretlen szűrő: {{filterId}}",
-    "known_tracker": "Ismert követő",
-    "install_welcome_title": "Üdvözli az AdGuard Home!",
-    "install_welcome_desc": "Az AdGuard Home egy, a teljes hálózatot lefedő hirdetés és követő blokkoló DNS szerver. Az a célja, hogy lehetővé tegye a teljes hálózat és az összes eszköz vezérlését, és nem igényel kliensoldali programot.",
-    "install_settings_title": "Webes admin felület",
-    "install_settings_listen": "Figyelő felület",
-    "install_settings_port": "Port",
-    "install_settings_interface_link": "Az AdGuard Home webes admin felülete elérhető a következő címe(ke)n:",
-    "form_error_port": "Adjon meg egy érvényes portot",
-    "install_settings_dns": "DNS szerver",
-    "install_settings_dns_desc": "Be kell állítania az eszközeit vagy a routerét, hogy használni tudja a DNS szervert a következő címeken:",
-    "install_settings_all_interfaces": "Minden felület",
-    "install_auth_title": "Hitelesítés",
-    "install_auth_desc": "Erősen ajánlott a jelszavas hitelesítés beállítása az AdGuard Home webes admin felületéhez. Még akkor is, ha csak a helyi hálózaton érhető el, óvja meg az illetéktelen hozzáférésektől.",
-    "install_auth_username": "Felhasználónév",
-    "install_auth_password": "Jelszó",
-    "install_auth_confirm": "Jelszó megerősítése",
-    "install_auth_username_enter": "Felhasználónév megadása",
-    "install_auth_password_enter": "Jelszó megadása",
-    "install_step": "Lépés",
-    "install_devices_title": "Állítsa be az eszközeit",
-    "install_devices_desc": "Az AdGuard Home használatának megkezdéséhez be kell állítania az eszközeit, hogy azok használni tudják.",
-    "install_submit_title": "Gratulálunk!",
-    "install_submit_desc": "A telepítési folyamat befejeződött, minden készen áll az AdGuard Home használatára.",
-    "install_devices_router": "Router",
-    "install_devices_router_desc": "Ez a beállítás lefed minden eszközt, amik az Ön routeréhez csatlakoznak, így azokat nem kell külön, kézzel beállítania.",
-    "install_devices_address": "Az AdGuard DNS szerver a következő címeket figyeli",
-    "install_devices_router_list_1": "Nyissa meg a router beállításait. Ez általában a böngészőn keresztül történik egy URL megadásával (pl. http://192.168.0.1/ vagy http://192.168.1.1/). Ez az oldal valószínűleg felhasználónevet és jelszót fog kérni. Ha nem tudja a belépési adatokat, nézze meg a router dobozát, a router alján levő fehér címkét vagy a technikai dokumentációt az interneten, végső esetben pedig visszaállíthatja a routert. Néhány router speciális alkalmazást igényel, amik lehetséges, hogy már telepítve vannak a számítógépére vagy a mobil eszközére.",
-    "install_devices_router_list_2": "Keresse meg a DHCP/DNS beállításokat. Keresse a DNS szót egy olyan mező mellett, amely egy 4 csoportból álló, 1-3 számjegyű számsort vár.",
-    "install_devices_router_list_3": "Adja meg az AdGuard Home szerver címét itt.",
-    "install_devices_router_list_4": "Bizonyos típusú routereknél nem állíthat be egyéni DNS-kiszolgálót. Ebben az esetben segíthet, ha az AdGuard Home-t DHCP-szerverként állítja be. Ellenkező esetben keresse meg az adott router kézikönyvében a DNS-kiszolgálók testreszabását.",
-    "install_devices_windows_list_1": "Nyissa meg a Vezérlőpultot a Start menün vagy a Windows keresőn keresztül.",
-    "install_devices_windows_list_2": "Válassza a Hálózat és internet kategóriát, majd pedig a Hálózati és megosztási központot.",
-    "install_devices_windows_list_3": "A képernyő bal oldalán keresse meg az Adapterbeállítások módosítása lehetőséget és kattintson rá.",
-    "install_devices_windows_list_4": "Válassza ki a jelenleg is használt kapcsolatot, majd jobb egérgombbal kattintson rá és a megjelenő menüből válassza a Tulajdonságok elemet.",
-    "install_devices_windows_list_5": "Keresse meg az Internet Protocol Version 4 (TCP/IP) elemet a listában, válassza ki, majd ismét kattintson a Tulajdonságokra.",
-    "install_devices_windows_list_6": "Válassza a Következő DNS címek használata lehetőséget és adja meg az AdGuard Home szerver címeit.",
-    "install_devices_macos_list_1": "Kattintson az Apple ikonra és válassza a Rendszerbeállításokat.",
-    "install_devices_macos_list_2": "Kattintson a Hálózat lehetőségre.",
-    "install_devices_macos_list_3": "Válassza ki az első kapcsolatot a listából és kattintson a Haladó beállításokra.",
-    "install_devices_macos_list_4": "Válassza ki a DNS fület és adja meg az AdGuard Home szerver címeit.",
-    "install_devices_android_list_1": "Az Android kezdőképernyőjén érintse meg a Beállítások gombot.",
-    "install_devices_android_list_2": "Érintse meg a Wi-Fi gombot a menüben. Ekkor a képernyőre kerül az összes elérhető hálózat (mobilinternethez nem lehet egyedi DNS-t megadni).",
-    "install_devices_android_list_3": "Nyomjon hosszan arra a hálózatra a listából, amelyikre éppen csatlakozva van, majd válassza a Hálózat módosítása lehetőséget.",
-    "install_devices_android_list_4": "Egyes eszközökön előfordulhat, hogy a további beállítások megtekintéséhez a Speciális/haladó beállítások részt kell megnyitni. Az Android DNS-beállításainak módosításához ekkor az IP-beállításokat DHCP-ről statikusra kell váltania.",
-    "install_devices_android_list_5": "Változtassa meg a DNS 1 és a DNS 2 értékét az AdGuard Home szerver címeire.",
-    "install_devices_ios_list_1": "A kezdőképernyőn érintse meg a Beállítások gombot.",
-    "install_devices_ios_list_2": "Válassza ki a Wi-Fi-t a bal oldali menüből (mobilinternetnél nem lehetséges a DNS beállítása).",
-    "install_devices_ios_list_3": "Érintse meg a jelenleg használt hálózat nevét.",
-    "install_devices_ios_list_4": "A DNS mezőbe adja meg az AdGuard Home szerver címeit.",
-    "get_started": "Kezdés",
-    "next": "Következő",
-    "open_dashboard": "Irányítópult megnyitása",
-    "install_saved": "Sikeres mentés",
-    "encryption_title": "Titkosítás",
-    "encryption_desc": "Titkosítás (HTTPS/TLS) támogatása mind a DNS, mind pedig a webes admin felület számára",
-    "encryption_config_saved": "Titkosítási beállítások mentve",
-    "encryption_server": "Szerver neve",
-    "encryption_server_enter": "Adja meg az Ön domain címét",
-    "encryption_server_desc": "A HTTPS használatához be kell írnia egy, az SSL-tanúsítvánnyal megegyező kiszolgálónevet.",
-    "encryption_redirect": "Automatikus átirányítás HTTPS kapcsolatra",
-    "encryption_redirect_desc": "Ha be van jelölve, az AdGuard Home automatikusan átirányítja a HTTP kapcsolatokat a biztonságos HTTPS protokollra.",
-    "encryption_https": "HTTPS port",
-    "encryption_https_desc": "Ha a HTTPS port konfigurálva van, akkor az AdGuard Home admin felülete elérhető lesz a HTTPS-en keresztül, és ezenkívül DNS-over-HTTPS-t is biztosít a '/dns-query' helyen.",
-    "encryption_dot": "DNS-over-TLS port",
-    "encryption_dot_desc": "Ha ez a port be van állítva, az AdGuard Home DNS-over-TLS szerverként tud futni ezen a porton.",
-    "encryption_certificates": "Tanúsítványok",
-    "encryption_certificates_desc": "A titkosítás használatához érvényes SSL tanúsítványláncot kell megadnia a domainjéhez. Ingyenes tanúsítványt kaphat a <0>{{link}}</0> webhelyen, vagy megvásárolhatja az egyik megbízható tanúsítványkibocsátó hatóságtól.",
-    "encryption_certificates_input": "Másolja be ide a PEM-kódolt tanúsítványt.",
-    "encryption_status": "Állapot",
-    "encryption_expire": "Lejár",
-    "encryption_key": "Privát kulcs",
-    "encryption_key_input": "Másolja ki és illessze be ide a tanúsítványa PEM-kódolt privát kulcsát.",
-    "encryption_enable": "Titkosítás engedélyezése (HTTPS, DNS-over-HTTPS, és DNS-over-TLS)",
-    "encryption_enable_desc": "Ha a titkosítás engedélyezve van, az AdGuard Home admin felülete működik HTTPS-en keresztül, és a DNS szerver is várja a kéréseket DNS-over-HTTPS-en, valamint DNS-over-TLS-en keresztül.",
-    "encryption_chain_valid": "A tanúsítványlánc érvényes",
-    "encryption_chain_invalid": "A tanúsítványlánc érvénytelen",
-    "encryption_key_valid": "Ez egy érvényes {{type}} privát kulcs",
-    "encryption_key_invalid": "Ez egy érvénytelen {{type}} privát kulcs",
-    "encryption_subject": "Tárgy",
-    "encryption_issuer": "Kibocsátó",
-    "encryption_hostnames": "Hosztnevek",
-    "encryption_reset": "Biztosan visszaállítja a titkosítási beállításokat?",
-    "topline_expiring_certificate": "Az SSL-tanúsítványa hamarosan lejár. Frissítse a <0>Titkosítási beállításokat</0>.",
-    "topline_expired_certificate": "Az SSL-tanúsítványa lejárt. Frissítse a <0>Titkosítási beállításokat</0>.",
-    "form_error_port_range": "A port értékét a 80-65535 tartományban adja meg",
-    "form_error_port_unsafe": "Ez a port nem biztonságos",
-    "form_error_equal": "Nem egyezhetnek",
-    "form_error_password": "A jelszavak nem egyeznek",
-    "reset_settings": "Beállítások visszaállítása",
-    "update_announcement": "Az AdGuard Home {{version}} verziója elérhető! <0>Kattintson ide</0> további információkért.",
-    "setup_guide": "Beállítási útmutató",
-    "dns_addresses": "DNS címek",
-    "dns_start": "A DNS szerver indul",
-    "dns_status_error": "Hiba történt a DNS szerver állapotának ellenőrzésekor",
-    "down": "Nem elérhető",
-    "fix": "Állandó",
-    "dns_providers": "Itt van az <0>ismert DNS szolgáltatók listája</0>, amelyekből választhat.",
-    "update_now": "Frissítés most",
-    "update_failed": "Az automatikus frissítés nem sikerült. Kérjük, hogy <a>kövesse ezeket a lépéseket</a> a manuális frissítéshez.",
-    "processing_update": "Kérjük várjon, az AdGuard Home frissítése folyamatban van",
-    "clients_title": "Kliensek",
-    "clients_desc": "Az AdGuard Home-hoz csatlakozó eszközök kezelése",
-    "settings_global": "Globális",
-    "settings_custom": "Egyéni",
-    "table_client": "Kliens",
-    "table_name": "Név",
-    "save_btn": "Mentés",
-    "client_add": "Kliens hozzáadása",
-    "client_new": "Új kliens",
-    "client_edit": "Kliens módosítása",
-    "client_identifier": "Azonosító",
-    "ip_address": "IP cím",
-    "client_identifier_desc": "A klienseket be lehet azonosítani IP-cím, CIDR, valamint MAC-cím alapján. Kérjük, vegye figyelembe, hogy a MAC-cím alapján történő azonosítás csak akkor működik, ha az AdGuard Home egyben <0>DHCP szerverként</0> is funkcionál",
-    "form_enter_ip": "IP-cím megadása",
-    "form_enter_mac": "MAC-cím megadása",
-    "form_enter_id": "Azonosító megadása",
-    "form_add_id": "Azonosító hozzáadása",
-    "form_client_name": "Adja meg a kliens nevét",
-    "name": "Név",
-    "client_global_settings": "Globális beállítások használata",
-    "client_deleted": "A(z) \"{{key}}\" kliens sikeresen el lett távolítva",
-    "client_added": "A(z) \"{{key}}\" kliens sikeresen hozzá lett adva",
-    "client_updated": "A(z) \"{{key}}\" kliens sikeresen frissítve lett",
-    "clients_not_found": "Nem található kliens",
-    "client_confirm_delete": "Biztosan törölni szeretné a(z) \"{{key}}\" klienst?",
-    "list_confirm_delete": "Biztosan törölni kívánja ezt a listát?",
-    "auto_clients_title": "Kliensek (futási idő)",
-    "auto_clients_desc": "Az AdGuard Home-ot használó, de a konfigurációban nem tárolt kliensek adatai",
-    "access_title": "Hozzáférési beállítások",
-    "access_desc": "Itt konfigurálhatja az AdGuard Home DNS-kiszolgáló hozzáférési szabályait.",
-    "access_allowed_title": "Engedélyezett kliensek",
-    "access_allowed_desc": "A CIDR vagy IP címek listája. Ha konfigurálva van, az AdGuard Home csak az ezekről az IP-címekről fogadja el a kéréseket.",
-    "access_disallowed_title": "Nem engedélyezett kliensek",
-    "access_disallowed_desc": "A CIDR vagy IP címek listája. Ha konfigurálva van, az AdGuard Home eldobja a lekérdezéseket ezekről az IP-címekről.",
-    "access_blocked_title": "Nem engedélyezett domainek",
-    "access_blocked_desc": "Ne keverje össze ezt a szűrőkkel. Az AdGuard Home az összes DNS kérést el fogja dobni, ami ezekkel a domainekkel kapcsolatos. Itt megadhatja a pontos domainneveket, a helyettesítő karaktereket és az urlfilter-szabályokat, pl. 'example.org', '*.example.org' or '||example.org^'.",
-    "access_settings_saved": "A hozzáférési beállítások sikeresen mentésre kerültek",
-    "updates_checked": "A frissítések sikeresen ellenőrizve lettek",
-    "updates_version_equal": "Az AdGuard Home naprakész",
-    "check_updates_now": "Frissítések ellenőrzése most",
-    "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.",
-    "setup_dns_privacy_ios_1": "A <0>DNSCloak</0> támogatja a <1>DNS-over-HTTPS</1>-t, de ahhoz, hogy a saját szerverhez konfigurálhassa, létre kell hoznia egy <2>DNS bélyeget</2> hozzá.",
-    "setup_dns_privacy_ios_2": "Az <0>AdGuard for iOS</0> támogatja a <1>DNS-over-HTTPS</1> és a <1>DNS-over-TLS</1> beállításokat.",
-    "setup_dns_privacy_other_title": "Egyéb megvalósítások",
-    "setup_dns_privacy_other_1": "Maga az AdGuard Home bármilyen platformon biztonságos DNS-kliens lehet.",
-    "setup_dns_privacy_other_2": "A <0>dnsproxy</0> támogatja az összes ismert biztonságos DNS protokollt.",
-    "setup_dns_privacy_other_3": "A <0>dnscrypt-proxy</0> támogatja a <1>DNS-over-HTTPS</1>-t.",
-    "setup_dns_privacy_other_4": "A <0>Mozilla Firefox</0> támogatja a <1>DNS-over-HTTPS</1>-t.",
-    "setup_dns_privacy_other_5": "További megvalósításokat találhat <0>ide</0> és <1>ide</1> kattintva.",
-    "setup_dns_notice": "Ahhoz, hogy a <1>DNS-over-HTTPS</1> vagy a <1>DNS-over-TLS</1> valamelyikét használja, muszáj <0>beállítania a titkosítást</0> az AdGuard Home beállításaiban.",
-    "rewrite_added": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen hozzáadva",
-    "rewrite_deleted": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen törölve",
-    "rewrite_add": "DNS átírás hozzáadása",
-    "rewrite_not_found": "Nem találhatók DNS átírások",
-    "rewrite_confirm_delete": "Biztosan törölni szeretné a DNS átírást ehhez: \"{{key}}\"?",
-    "rewrite_desc": "Lehetővé teszi, hogy egyszerűen beállítson egyéni DNS választ egy adott domain névhez.",
-    "rewrite_applied": "Alkalmazott átírási szabály",
-    "rewrite_hosts_applied": "Átírva egy hoszt szabály által",
-    "dns_rewrites": "DNS átírások",
-    "form_domain": "Adja meg a domain nevet vagy a helyettesítő karaktert",
-    "form_answer": "Adjon meg egy IP-címet vagy egy domain nevet",
-    "form_error_domain_format": "Érvénytelen domain formátum",
-    "form_error_answer_format": "Érvénytelen válasz formátum",
-    "configure": "Beállítás",
-    "main_settings": "Fő beállítások",
-    "block_services": "Speciális szolgáltatások blokkolása",
-    "blocked_services": "Blokkolt szolgáltatások",
-    "blocked_services_desc": "Lehetővé teszi a népszerű oldalak és szolgáltatások blokkolását.",
-    "blocked_services_saved": "Blokkolt szolgáltatások sikeresen mentve",
-    "blocked_services_global": "A globálisan tiltott szolgáltatások használata",
-    "blocked_service": "Blokkolt szolgáltatás",
-    "block_all": "Összes blokkolása",
-    "unblock_all": "Összes feloldása",
-    "encryption_certificate_path": "Tanúsítvány útvonala",
-    "encryption_private_key_path": "Privát kulcs útvonala",
-    "encryption_certificates_source_path": "Tanúsítványfájl útvonalának megadása",
-    "encryption_certificates_source_content": "Tanúsítvány tartalmának megadása",
-    "encryption_key_source_path": "Privát kulcsfájl beállítása",
-    "encryption_key_source_content": "Privát kulcs tartalmának megadása",
-    "stats_params": "Statisztikai beállítások",
-    "config_successfully_saved": "A beállítások sikeresen el lettek mentve",
-    "interval_24_hour": "24 óra",
-    "interval_days": "{{count}} nap",
-    "interval_days_plural": "{{count}} nap",
-    "domain": "Domain",
-    "answer": "Válasz",
-    "filter_added_successfully": "A lista sikeresen hozzá lett adva",
-    "filter_removed_successfully": "A lista sikeresen el lett távolítva",
-    "filter_updated": "A lista sikeresen frissítve lett",
-    "statistics_configuration": "Statisztikai beállítások",
-    "statistics_retention": "Statisztika megőrzése",
-    "statistics_retention_desc": "Ha csökkenti az intervallum értékét, az előtte levő adatok elvesznek",
-    "statistics_clear": " Statisztikák visszaállítása",
-    "statistics_clear_confirm": "Biztosan vissza akarja állítani a statisztikákat?",
-    "statistics_retention_confirm": "Biztos benne, hogy megváltoztatja a statisztika megőrzési idejét? Ha csökkentette az értéket, a megadottnál korábbi adatok elvesznek",
-    "statistics_cleared": "A statisztikák sikeresen vissza lettek állítva",
-    "interval_hours": "{{count}} óra",
-    "interval_hours_plural": "{{count}} óra",
-    "filters_configuration": "Szűrők beállításai",
-    "filters_enable": "Szűrők engedélyezése",
-    "filters_interval": "Szűrőfrissítési gyakoriság",
-    "disabled": "Kikapcsolva",
-    "username_label": "Felhasználónév",
-    "username_placeholder": "Felhasználónév megadása",
-    "password_label": "Jelszó",
-    "password_placeholder": "Jelszó megadása",
-    "sign_in": "Bejelentkezés",
-    "sign_out": "Kijelentkezés",
-    "forgot_password": "Elfelejtette a jelszót?",
-    "forgot_password_desc": "Kérjük, hogy kövesse <0>ezeket a lépéseket</0> a jelszó visszaállításához.",
-    "location": "Helyzet",
-    "orgname": "Szervezet neve",
-    "netname": "Hálózat neve",
-    "network": "Hálózat",
-    "descr": "Leírás",
-    "whois": "Whois",
-    "filtering_rules_learn_more": "<0>Tudjon meg többet</0> a saját hosztlisták létrehozásáról.",
-    "blocked_by_response": "Blokkolva a CNAME vagy a válasz IP-címe alapján",
-    "blocked_by_cname_or_ip": "CNAME vagy IP által blokkolva",
-    "try_again": "Próbálja újra",
-    "domain_desc": "Adja meg a domain nevet vagy a helyettesítő karaktert ahhoz a címhez, amit át kíván íratni.",
-    "example_rewrite_domain": "csak ehhez a domainhez írja át a válaszokat.",
-    "example_rewrite_wildcard": "az <0>example.org</0> összes aldomainjéhez átírja a válaszokat.",
-    "rewrite_ip_address": "IP-cím: használja ezt az IP-t A vagy AAAA válaszban",
-    "rewrite_domain_name": "Domain név: CNAME rekord hozzáadása",
-    "rewrite_A": "<0>A</0>: speciális érték, megtartja az upstream felől érkező <0>A</0> rekordokat",
-    "rewrite_AAAA": "<0>AAAA</0>: speciális érték, megtartja az upstream felől érkező <0>AAAA</0> rekordokat",
-    "disable_ipv6": "IPv6 letiltása",
-    "disable_ipv6_desc": "Ha ez a szolgáltatás engedélyezve van, akkor az összes IPv6-cím (AAAA típus) DNS-lekérdezése elveszik.",
-    "fastest_addr": "Leggyorsabb IP-cím",
-    "fastest_addr_desc": "Kérdezze le az összes DNS-kiszolgálót, és adja vissza a leggyorsabb IP-címet a válaszok közül. Ez lelassítja a DNS-lekérdezéseket, mivel az összes DNS-kiszolgáló esetében meg kell várnunk a válaszokat, de javítja az összeköttetést.",
-    "autofix_warning_text": "Ha a \"Javítás\" lehetőségre kattint, az AdGuard Home megpróbálja beállítani a rendszerét, hogy használja az AdGuard Home DNS szervert.",
-    "autofix_warning_list": "A következő feladatokat hajtja végre: <0>A DNSStubListener rendszer kikapcsolása</0><0>Beállítja a DNS-kiszolgáló címét 127.0.0.1-re.</0><0>Lecseréli az /etc/resolv.conf szimbolikus útvonalat erre: /run/systemd/resolve/resolv.conf</0><0>A DNSStubListener leállítása (a rendszer által feloldott szolgáltatás újratöltése)</0>",
-    "autofix_warning_result": "Mindennek eredményeként az Ön rendszeréből származó összes DNS-kérést alapértelmezés szerint az AdGuard Home dolgozza fel.",
-    "tags_title": "Címkék",
-    "tags_desc": "Kiválaszthatja a klienseknek megfelelő címkéket. A címkék beilleszthetők a szűrési szabályokba, és lehetővé teszik azok pontosabb alkalmazását. <0>További információ</0>",
-    "form_select_tags": "Válasszon kliens címkéket",
-    "check_title": "Szűrés ellenőrzése",
-    "check_desc": "Ellenőrzi, hogy a hosztnév szűrve van-e",
-    "check": "Ellenőrzés",
-    "form_enter_host": "Adja meg a hosztnevet",
-    "filtered_custom_rules": "Szűrve van az egyéni szűrési szabályok alapján",
-    "choose_from_list": "Választás a listából",
-    "add_custom_list": "Egyedi lista hozzáadása",
-    "host_whitelisted": "Ez a hoszt a kivételek között szerepel",
-    "check_ip": "IP-címek: {{ip}}",
-    "check_cname": "CNAME: {{cname}}",
-    "check_reason": "Indok: {{reason}}",
-    "check_rule": "Szabály: {{rule}}",
-    "check_service": "Szolgáltatás neve: {{service}}",
-    "check_not_found": "Nem található az Ön szűrőlistái között",
-    "client_confirm_block": "Biztosan blokkolni szeretné a(z) \"{{ip}}\" klienst?",
-    "client_confirm_unblock": "Biztosan fel szeretné oldani a(z) \"{{ip}}\" kliens blokkolását?",
-    "client_blocked": "A(z) \"{{ip}}\" kliens sikeresen blokkolva",
-    "client_unblocked": "A(z) \"{{ip}}\" kliens blokkolása sikeresen feloldva",
-    "static_ip": "Statikus IP-cím",
-    "static_ip_desc": "Az AdGuard Home egy szerver, tehát statikus IP-címre van szüksége a megfelelő működéshez. Ellenkező esetben a router valamikor más IP-címet rendelhet ehhez az eszközhöz.",
-    "set_static_ip": "Statikus IP-cím beállítása",
-    "install_static_ok": "Jó hír! A statikus IP-cím már be van állítva",
-    "install_static_error": "Az AdGuard Home nem tudja automatikusan konfigurálni ezt a hálózati felületet. Kérjük, nézzen utána, hogyan kell ezt manuálisan elvégezni.",
-    "install_static_configure": "Úgy észleltük, hogy dinamikus IP-cím van használatban — <0>{{ip}}</0>. Szeretné ezt statikus IP-címként használni?",
-    "confirm_static_ip": "Az AdGuard Home beállítja az {{ip}} IP-címet az Ön statikus IP-címének. Biztosan folytatni kívánja?",
-    "list_updated": "{{count}} lista frissítve lett",
-    "list_updated_plural": "{{count}} lista frissítve lett",
-    "dnssec_enable": "DNSSEC engedélyezése",
-    "dnssec_enable_desc": "Állítsa be a DNSSEC jelzőt a kimenő DNS-lekérdezésekbe, és ellenőrizze az eredményt (szükséges a DNSSEC-kompatibilis feloldás)",
-    "validated_with_dnssec": "DNSSEC által ellenőrizve",
-    "all_queries": "Minden kérés",
-    "show_blocked_responses": "Blokkolva",
-    "show_whitelisted_responses": "Kivételezett",
-    "show_processed_responses": "Feldolgozva",
-    "blocked_safebrowsing": "Blokkolva a biztonságos böngészés által",
-    "blocked_adult_websites": "Blokkolva a felnőtt tartalmak által",
-    "blocked_threats": "Blokkolt fenyegetések",
-    "allowed": "Engedve",
-    "filtered": "Megszűrt",
-    "rewritten": "Átírt",
-    "safe_search": "Biztonságos keresés",
-    "blocklist": "Tiltólista",
-    "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",
-    "filter_category_other": "Egyéb",
-    "filter_category_general_desc": "Olyan listák, amelyek blokkolják a nyomkövetést és a hirdetéseket a legtöbb eszközön",
-    "filter_category_security_desc": "Olyan listák, amelyek a kártékony, adathalász vagy átverős oldalak tiltására vannak kifejlesztve",
-    "filter_category_regional_desc": "Olyan listák, amelyek a regionális hirdetések, valamint a nyomkövető szerverek ellen vannak kifejlesztve",
-    "filter_category_other_desc": "További tiltólisták",
-    "setup_config_to_enable_dhcp_server": "Konfiguráció beállítása a DHCP-kiszolgáló engedélyezéséhez",
-    "original_response": "Eredeti válasz",
-    "click_to_view_queries": "Kattintson a lekérésekért",
-    "port_53_faq_link": "Az 53-as portot gyakran a \"DNSStubListener\" vagy a \"systemd-resolved\" (rendszer által feloldott) szolgáltatások használják. Kérjük, olvassa el <0>ezt az útmutatót</0> a probléma megoldásához."
-}
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -11,8 +11,6 @@
    "save_config": "Simpan pengaturan",
    "enabled_dhcp": "Server DHCP diaktifkan",
    "disabled_dhcp": "Server DHCP dinonaktifkan",
-    "unavailable_dhcp": "DHCP tidak tersedia",
-    "unavailable_dhcp_desc": "Adguard Home tidak dapat menjalankan server DHCP pada OS Anda",
    "dhcp_title": "Server DHCP",
    "dhcp_description": "Jika router Anda tidak mendukung pengaturan DHCP, Anda dapat menggunakan server DHCP bawaan AdGuard.",
    "dhcp_enable": "Aktifkan server DHCP",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP static leases",
    "dhcp_leases_not_found": "DHCP lease tidak ditemukan",
    "dhcp_config_saved": "Pengaturan server DHCP tersimpan",
-    "dhcp_ipv4_settings": "Pengaturan DHCP IPv4",
-    "dhcp_ipv6_settings": "Pengaturan DHCP IPv6",
    "form_error_required": "Kolom yang harus diisi",
    "form_error_ip4_format": "Format IPv4 tidak valid",
    "form_error_ip6_format": "Format IPv6 tidak valid",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Format client ID tidak valid",
    "form_error_positive": "Harus lebih dari 0",
    "form_error_negative": "Harus berjumlah 0 atau lebih besar dari 0",
-    "range_end_error": "Harus lebih besar dari rentang awal",
    "dhcp_form_gateway_input": "IP gateway",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Rentang alamat IP",
@@ -132,6 +127,7 @@
    "encryption_settings": "Pengaturan enkripsi",
    "dhcp_settings": "Pengaturan DHCP",
    "upstream_dns": "Server DNS hulu",
+    "upstream_dns_hint": "Jika Anda mengosongkan kolom ini, AdGuard Home akan menggunakan  <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> sebagai hulu. Gunakan tls:// untuk server DNS over TLS.",
    "test_upstream_btn": "Uji hulu",
    "upstreams": "Upstream",
    "apply_btn": "Terapkan",
@@ -212,8 +208,8 @@
    "page_table_footer_text": "Halaman",
    "rows_table_footer_text": "baris",
    "updated_custom_filtering_toast": "Perbarui aturan penyaringan khusus",
-    "rule_removed_from_custom_filtering_toast": "Aturan dihapus dari aturan penyaringan khusus: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Aturan ditambah ke aturan penyaringan khusus: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Aturan dihapus dari aturan penyaringan khusus",
+    "rule_added_to_custom_filtering_toast": "Aturan ditambah ke aturan penyaringan khusus",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Difilter oleh {{filter}}",
    "query_log_confirm_clear": "Apakah Anda yakin ingin menghapus seluruh kueri log?",
@@ -245,9 +241,10 @@
    "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 (0: 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": "Standar: Respon pakai NXDOMAIN saat diblokir oleh aturan gaya Adblock; membalas dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh /et /aturan hosts-style",
    "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",
@@ -357,7 +354,7 @@
    "fix": "Perbaiki",
    "dns_providers": "Berikut adalah <0>daftar penyedia DNS yang dikenal</0> untuk dipilih.",
    "update_now": "Perbarui sekarang",
-    "update_failed": "Pembaruan otomatis gagal. Silahkan <a>ikuti petunjuk ini</a> untuk perbarui secara manual.",
+    "update_failed": "Pembaruan otomatis telah gagal. Harap <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>ikuti petunjuk</a> untuk perbarui secara manual.",
    "processing_update": "Silahkan tunggu, AdGuard Home sedang diperbarui",
    "clients_title": "Klien",
    "clients_desc": "Atur perangkat yang terhubung ke AdGuard Home",
@@ -552,7 +549,10 @@
    "enter_cache_size": "Masukkan ukuran cache",
    "enter_cache_ttl_min_override": "Masukkan TTL minimum",
    "enter_cache_ttl_max_override": "Masukkan TTL maksimum",
+    "cache_ttl_min_override_desc": "Ganti nilai TTL (minimum) yang diterima dari server upstream. Nilai ini tidak boleh lebih dari 3600 (1 jam)",
    "cache_ttl_max_override_desc": "Ganti nilai TTL (maksimum) yang diterima dari server upstream",
+    "min_exceeds_max_value": "Nilai minimum melebihi nilai maksimum",
+    "value_not_larger_than": "Nilai tidak bisa lebih dari {{maximum}}",
    "filter_category_general": "Umum",
    "filter_category_security": "Keamanan",
    "filter_category_regional": "Wilayah",
@@ -561,7 +561,6 @@
    "filter_category_security_desc": "Daftar yang khusus pada pemblokiran malware, phishing, atau domain penipuan",
    "filter_category_regional_desc": "Daftar yang berfokus pada iklan regional dan server pelacakan",
    "filter_category_other_desc": "Daftar hitam lain",
-    "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."
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -1,30 +1,26 @@
 {
    "client_settings": "Impostazioni client",
    "example_upstream_reserved": "Puoi specificare un server DNS<0>per uno specifico dominio(i)</0>",
-    "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server",
+    "upstream_parallel": "Usa le query 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.",
+    "load_balancing_desc": "Interroga un server per volta. AdGuardHome userà l'algoritmo soppesato casualmente per scegliere il server così che quello più veloce sarà usato più spesso.",
    "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_desc": "Server DNS usati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstreams.",
    "check_dhcp_servers": "Controlla la presenza di server DHCP",
    "save_config": "Salva configurazione",
-    "enabled_dhcp": "Server DHCP attivo",
-    "disabled_dhcp": "Server DHCP disattivato",
-    "unavailable_dhcp": "DHCP non disponibile",
-    "unavailable_dhcp_desc": "AdGuard Home non può eseguire un server DHCP sul tuo sistema operativo",
+    "enabled_dhcp": "Server DHCP abilitato",
+    "disabled_dhcp": "Server DHCP disabilitato",
    "dhcp_title": "Server DHCP",
-    "dhcp_description": "Se il tuo router non supporta la configurazione delle impostazioni del DHCP puoi utilizzare il server DHCP incluso in AdGuard.",
-    "dhcp_enable": "Attiva server DHCP",
-    "dhcp_disable": "Disattiva server DHCP",
+    "dhcp_description": "Se il tuo router non supporta la configurazione delle impostazioni del DHCP puoi usare il server DHCP incluso in AdGuard.",
+    "dhcp_enable": "Abilita server DHCP",
+    "dhcp_disable": "Disabilita server DHCP",
    "dhcp_not_found": "Nessun server DHCP attivo trovato nella rete. Puoi attivare il server DHCP built-in senza problemi.",
    "dhcp_found": "Trovati server DHCP attivi nella rete. Non è consigliato attivare il server DHCP built-in",
    "dhcp_leases": "Leases DHCP",
    "dhcp_static_leases": "Leases DHCP statici",
    "dhcp_leases_not_found": "Nessun lease DHCP trovato",
    "dhcp_config_saved": "Configurazione server DHCP salvata",
-    "dhcp_ipv4_settings": "Impostazioni DHCP IPv4",
-    "dhcp_ipv6_settings": "Impostazioni DHCP IPv6",
    "form_error_required": "Campo richiesto",
    "form_error_ip4_format": "Formato IPv4 non valido",
    "form_error_ip6_format": "Formato IPv6 non valido",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Formato ID cliente non valido",
    "form_error_positive": "Deve essere maggiore di 0",
    "form_error_negative": "Deve essere maggiore o uguale a 0 (zero)",
-    "range_end_error": "Deve essere maggiore dell'intervallo di inizio",
    "dhcp_form_gateway_input": "IP Gateway",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Range indirizzi IP",
@@ -47,10 +42,10 @@
    "ip": "IP",
    "dhcp_table_hostname": "Nome host",
    "dhcp_table_expires": "Scaduto",
-    "dhcp_warning": "Se si desidera attivare il server DHCP integrato, assicurarsi che non vi siano altri server DHCP attivi. Altrimenti, possono sussistere problemi di rete per i dispositivi collegati!",
+    "dhcp_warning": "Se si desidera abilitare il server DHCP integrato, assicurarsi che non vi siano altri server DHCP attivi. Altrimenti, possono sussistere problemi di rete per i dispositivi collegati!",
    "dhcp_error": "Impossibile determinare se è presente un altro server DHCP nella rete.",
    "dhcp_static_ip_error": "Pe rutilizzare un server DHCP, bisogna impostare un indirizzo IP statico. Non siamo riusciti a determinare se questa interfaccia di rete sia configurata per utilizzare un indirizzo IP statico. Per favore impostare un indirizzo IP statico manualmente.",
-    "dhcp_dynamic_ip_found": "Il tuo sistema utilizza indirizzi IP dinamici per questa interfaccia <0>{{interfaceName}}</0>. Per utilizzare un server DHCP bisogna impostare un indirizzo IP statico. Il tuo indirizzo attuale è <0>{{ipAddress}}</0>. Imposteremo automaticamente questo indirizzo come statico premendo il pulsante Attiva DHCP.",
+    "dhcp_dynamic_ip_found": "Il tuo sistema utilizza indirizzi IP dinamici per questa interfaccia  <0>{{interfaceName}}</0>. Per utilizzare un server DHCP bisogna impostare un indirizzo IP statico. Il tuo indirizzo attuale è  <0>{{ipAddress}}</0>. Imposteremo automaticamente questo indirizzo come statico premendo il pulsante Abilita DHCP",
    "dhcp_lease_added": "Lease statici \"{{key}}\" aggiunti correttamente",
    "dhcp_lease_deleted": "Lease statico \"{{key}}\" eliminato correttamente",
    "dhcp_new_static_lease": "Nuovo lease statico",
@@ -71,11 +66,11 @@
    "settings": "Impostazioni",
    "filters": "Filtri",
    "filter": "Filtro",
-    "query_log": "Registro Richieste",
+    "query_log": "Query Log",
    "compact": "Compatto",
    "nothing_found": "Non è stato trovato nulla",
    "faq": "FAQ",
-    "version": "Versione",
+    "version": "versione",
    "address": "Indirizzo",
    "protocol": "Protocollo",
    "on": "ATTIVO",
@@ -83,13 +78,13 @@
    "copyright": "Copyright",
    "homepage": "Pagina iniziale",
    "report_an_issue": "Segnala un problema",
-    "privacy_policy": "Politica sulla riservatezza",
-    "enable_protection": "Attiva protezione",
-    "enabled_protection": "Protezione attiva",
-    "disable_protection": "Disattiva protezione",
-    "disabled_protection": "Protezione disattivata",
+    "privacy_policy": "Politica sulla privacy",
+    "enable_protection": "Abilita protezione",
+    "enabled_protection": "Protezione abilitata",
+    "disable_protection": "Disabilita protezione",
+    "disabled_protection": "Protezione disabilitata",
    "refresh_statics": "Aggiorna statistiche",
-    "dns_query": "Richieste DNS",
+    "dns_query": "Query DNS",
    "blocked_by": "<0>Bloccato dai Filtri</0>",
    "stats_malware_phishing": "Malware/phishing bloccati",
    "stats_adult": "Siti per adulti bloccati",
@@ -103,11 +98,11 @@
    "top_clients": "Client più utilizzati",
    "no_clients_found": "Nessun client trovato",
    "general_statistics": "Statistiche generali",
-    "number_of_dns_query_days": "Numero di richieste DNS elaborate negli ultimi {{count}} giorni",
-    "number_of_dns_query_days_plural": "Numero di richieste DNS elaborate negli ultimi {{count}} giorni",
-    "number_of_dns_query_24_hours": "Numero di richieste DNS elaborate nelle ultime 24 ore",
-    "number_of_dns_query_blocked_24_hours": "Numero di richieste DNS bloccate dai filtri per annunci e dalle liste di host bloccati",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Numero di richieste DNS bloccate dal modulo AdGuard \"sicurezza di navigazione\"",
+    "number_of_dns_query_days": "Numero delle query DNS elaborate negli ultimi {{count}} giorni",
+    "number_of_dns_query_days_plural": "Numero delle query DNS elaborate negli ultimi {{count}} giorni",
+    "number_of_dns_query_24_hours": "Numero di query DNS elaborate nelle ultime 24 ore",
+    "number_of_dns_query_blocked_24_hours": "Numero di richieste DNS bloccate dai filtri adblock e dalle liste di host bloccati",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Numero di richieste DNS bloccate dal modulo AdGuard browsing security",
    "number_of_dns_query_blocked_24_hours_adult": "Numero di siti per adulti bloccati",
    "enforced_save_search": "Ricerca sicura forzata",
    "number_of_dns_query_to_safe_search": "Numero di richieste DNS dai motori di ricerca per i quali la Ricerca Sicura è stata forzata",
@@ -115,36 +110,35 @@
    "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>.",
-    "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",
-    "use_adguard_parental_hint": "AdGuard Home verificherà se il dominio contiene materiale per adulti. Utilizza le stesse API privacy-friendly del servizio web \"sicurezza di navigazione\".",
+    "use_adguard_browsing_sec": "Usa il servizio AdGuard Browsing Security",
+    "use_adguard_browsing_sec_hint": "AdGuard Home controllerà se il dominio è stato bloccato dal servizio web browsing security. Per eseguire il controllo userà delle API privacy-friendly: verrà inviato al server solo un breve prefisso dell'hash SHA256 del nome del dominio.",
+    "use_adguard_parental": "Usa il servizio parental control di AdGuard",
+    "use_adguard_parental_hint": "AdGuard Home controllerà se il dominio contiene materiale per adulti. Usa le stesse API privacy-friendly del servizio web browsing security.",
    "enforce_safe_search": "Forza ricerca sicura",
    "enforce_save_search_hint": "AdGuard Home può forzare la ricerca sicura sui seguenti motori di ricerca: Google, YouTube, Bing e Yandex",
    "no_servers_specified": "Nessun server specificato",
    "general_settings": "Impostazioni generali",
    "dns_settings": "Impostazioni DNS",
-    "dns_blocklists": "Lista Nera DNS",
-    "dns_allowlists": "Lista Bianca DNS",
-    "dns_blocklists_desc": "AdGuard Home bloccherà i domini che corrispondenti alla lista nera.",
+    "dns_blocklists": "Lista di blocco DNS",
+    "dns_allowlists": "Lista DNS consentiti",
+    "dns_blocklists_desc": "AdGuard Home bloccherà i domini che corrispondenti alla lista di blocco.",
    "dns_allowlists_desc": "I domini DNS consentiti saranno consentiti anche se sono nella lista di blocco.",
    "custom_filtering_rules": "Regole filtri personalizzati",
-    "encryption_settings": "Impostazioni di crittografia",
+    "encryption_settings": "Impostazioni di criptazione",
    "dhcp_settings": "Impostazioni DHCP",
    "upstream_dns": "Server DNS upstream",
-    "upstream_dns_help": "Immetti un indirizzo server per linea. <a>Per saperne di più</a> sulla configurazione dei server DNS upstream.",
-    "upstream_dns_configured_in_file": "Configurato su {{path}}",
+    "upstream_dns_hint": "Se lasci vuoto questo campo, AdGuard Home imposterà i <a href='https://1.1.1.1/' target='_blank'>DNS di Cloudflare</a> come upstream. Inserisci il prefisso tls:// per i server con DNS over TLS",
    "test_upstream_btn": "Testa gli upstream",
    "upstreams": "Upstream",
    "apply_btn": "Applica",
-    "disabled_filtering_toast": "Disattiva filtri",
-    "enabled_filtering_toast": "Attiva filtri",
-    "disabled_safe_browsing_toast": "Disattiva navigazione sicura",
-    "enabled_safe_browsing_toast": "Attiva navigazione sicura",
-    "disabled_parental_toast": "Disattiva il Controllo Parentale",
-    "enabled_parental_toast": "Attiva Controllo Parentale",
-    "disabled_safe_search_toast": "Disattiva Ricerca Sicura",
-    "enabled_save_search_toast": "Attiva Ricerca Sicura",
+    "disabled_filtering_toast": "Disabilita filtri",
+    "enabled_filtering_toast": "Abilita filtri",
+    "disabled_safe_browsing_toast": "Disabilita navigazione sicura",
+    "enabled_safe_browsing_toast": "Abilita navigazione sicura",
+    "disabled_parental_toast": "Disabilita il filtro famiglia",
+    "enabled_parental_toast": "Abilita il filtro famiglia",
+    "disabled_safe_search_toast": "Disabilita Ricerca Sicura",
+    "enabled_save_search_toast": "Abilita Ricerca Sicura",
    "enabled_table_header": "Attivo",
    "name_table_header": "Nome",
    "list_url_table_header": "Elenco URL",
@@ -155,9 +149,9 @@
    "edit_table_action": "Modifica",
    "delete_table_action": "Elimina",
    "elapsed": "Trascorso",
-    "filters_and_hosts_hint": "AdGuard Home è in grado di comprendere la sintassi delle regole di blocco per annunci o quelle dei file hosts.",
+    "filters_and_hosts_hint": "AdGuard Home è in grado di comprendere la sintassi delle regole di adblock o quelle dei file hosts",
    "no_blocklist_added": "Non è stata aggiunta alcuna lista di blocco",
-    "no_whitelist_added": "Non è stata aggiunta alcuna lista bianca",
+    "no_whitelist_added": "Non è stata aggiunta alcuna lista dei consentiti",
    "add_blocklist": "Aggiungi lista di blocco",
    "add_allowlist": "Aggiungi lista dei consentiti",
    "cancel_btn": "Annulla",
@@ -175,7 +169,7 @@
    "form_error_url_format": "Formato url non valido",
    "form_error_url_or_path_format": "URL o percorso assoluto della lista non valido",
    "custom_filter_rules": "Regole filtri personalizzate",
-    "custom_filter_rules_hint": "Inserisci una regola per riga. Puoi utilizzare la sintassi delle regole di blocco per annunci o quelle dei file hosts.",
+    "custom_filter_rules_hint": "Inserisci una regola per riga. Puoi usare la sintassi delle regole di adblock o quelle dei file hosts.",
    "examples_title": "Esempi",
    "example_meaning_filter_block": "blocca accesso al dominio example.org e a tutti i suoi sottodomini",
    "example_meaning_filter_whitelist": "permette l'accesso al dominio example.org e a tutti i suoi sottodimini",
@@ -187,19 +181,14 @@
    "example_upstream_regular": "DNS regolari (via UDP)",
    "example_upstream_dot": "<0>DNS_over_TLS</0> crittografato",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0> crittografato",
-    "example_upstream_doq": "<0>DNS_over_QUIC</0> crittografato",
-    "example_upstream_sdns": "puoi utilizzare <0>DNS Stamps</0> per <1>DNSCrypt</1> oppure dei resolver con <2>DNS-over-HTTPS</2>",
+    "example_upstream_sdns": "puoi usare <0>DNS Stamps</0> per <1>DNSCrypt</1> oppure dei resolver con <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "DNS regolari (via TCP)",
    "all_lists_up_to_date_toast": "Tutte le liste sono aggiornate",
    "updated_upstream_dns_toast": "Server DNS upstream aggiornati",
    "dns_test_ok_toast": "I server DNS specificati funzionano correttamente",
-    "dns_test_not_ok_toast": "Server \"{{key}}\": non può essere utilizzato, assicurati di averlo digitato correttamente",
+    "dns_test_not_ok_toast": "Server \"{{key}}\": non può essere usato, assicurati di averlo digitato correttamente",
    "unblock": "Sblocca",
    "block": "Blocca",
-    "disallow_this_client": "Blocca questo client",
-    "allow_this_client": "Consenti questo client",
-    "block_for_this_client_only": "Blocca solo per questo client",
-    "unblock_for_this_client_only": "Sblocca solo per questo client",
    "time_table_header": "Ora",
    "date": "Data",
    "domain_name_table_header": "Nome dominio",
@@ -211,7 +200,7 @@
    "empty_response_status": "Vuoto",
    "show_all_filter_type": "Mostra tutti",
    "show_filtered_type": "Mostra filtrati",
-    "no_logs_found": "Nessun registro trovato",
+    "no_logs_found": "Nessun log trovato",
    "refresh_btn": "Aggiorna",
    "previous_btn": "Precedente",
    "next_btn": "Successivo",
@@ -219,29 +208,28 @@
    "page_table_footer_text": "Pagina",
    "rows_table_footer_text": "righe",
    "updated_custom_filtering_toast": "Le regole dei filtri personalizzate sono state aggiornate",
-    "rule_removed_from_custom_filtering_toast": "Regola rimossa dalle regole dei filtri personalizzate: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regola aggiunta alle regole dei filtri personalizzate: {{rule}}",
-    "query_log_response_status": "Stato: {{value}}",
+    "rule_removed_from_custom_filtering_toast": "Regola rimossa dalle regole dei filtri personalizzate",
+    "rule_added_to_custom_filtering_toast": "Regola aggiunta alle regole dei filtri personalizzate",
+    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrato da {{filter}}",
-    "query_log_confirm_clear": "Sei sicuro di voler eliminare il registro richieste?",
-    "query_log_cleared": "Il registro richieste è stato correttamente cancellato",
-    "query_log_updated": "Il registro richieste è stato aggiornato con successo",
-    "query_log_clear": "Cancella registri richieste",
-    "query_log_retention": "Conservazione dei registri richieste",
-    "query_log_enable": "Attiva registro",
-    "query_log_configuration": "Configurazione registri",
-    "query_log_disabled": "Il registro richieste è stato disattivato e può essere configurata dalle <0>impostazioni</0>",
-    "query_log_strict_search": "Utilizzare le doppie virgolette per una ricerca precisa",
-    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
+    "query_log_confirm_clear": "Sei sicuro di voler eliminare la query log?",
+    "query_log_cleared": "La query log è stata cancellata correttamente",
+    "query_log_updated": "Il log query è stato aggiornato con successo",
+    "query_log_clear": "Cancella query logs",
+    "query_log_retention": "Ritenzione query logs",
+    "query_log_enable": "Abilita log",
+    "query_log_configuration": "Configurazione logs",
+    "query_log_disabled": "La query log è stata disabilitata e può essere configurata nel <0>impostazioni</0>",
+    "query_log_strict_search": "Utilizzare le virgolette doppie per la ricerca rigorosa",
+    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro di query? Se si diminuisce il valore di intervallo, alcuni dati saranno persi",
    "anonymize_client_ip": "Anonimizza client IP",
-    "anonymize_client_ip_desc": "Non salvare l'indirizzo IP completo del client nel registro e nelle statistiche",
+    "anonymize_client_ip_desc": "Non salvare l'indirizzo IP completo del client nei log e nelle statistiche",
    "dns_config": "Configurazione server DNS",
    "dns_cache_config": "Configurazione cache DNS",
    "dns_cache_config_desc": "Qui puoi configurare la cache DNS",
    "blocking_mode": "Modalità di blocco",
    "default": "Predefinito",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Nessun IP",
    "custom_ip": "IP personalizzato",
    "blocking_ipv4": "Blocca IPv4",
@@ -251,13 +239,12 @@
    "plain_dns": "DNS semplice",
    "form_enter_rate_limit": "Imposta limite delle richieste",
    "rate_limit": "Limite delle richieste",
-    "edns_enable": "Attiva client di sottorete EDNS",
-    "edns_cs_desc": "Se attivato, AdGuard Home invierà le sottoreti dei client ai server DNS.",
-    "rate_limit_desc": "Il numero di richieste al secondo che un singolo client può fare (0: illimitato)",
+    "edns_enable": "Abilita client di sottorete EDNS",
+    "edns_cs_desc": "Se abilitato, AdGuard Home invierà le sottoreti cdei client ai server DNS.",
+    "rate_limit_desc": "Il numero di richieste al secondo chheun 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_refused": "REFUSED: Risposta con codice di REFUSED",
+    "blocking_mode_default": "Predefinito: Rispondi con NXDOMAIN quando bloccato da una regola di Adblock; rispondi con l'indirizzo IP specificato nella regola quando bloccato dalla regola / etc / hosts-style",
    "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)",
    "blocking_mode_custom_ip": "IP personalizzato: Rispondi con un indirizzo IP impostato manualmente",
@@ -299,12 +286,12 @@
    "install_devices_router_list_2": "Trova le impostazioni DHCP / DNS. Cerca le lettere DNS accanto a un campo che consente due o tre serie di numeri, ciascuno suddiviso in quattro gruppi di 1-3 cifre.",
    "install_devices_router_list_3": "Inserisci qui gli indirizzi del tuo server AdGuard Home.",
    "install_devices_router_list_4": "Non puoi impostare un server DNS personalizzato o alcun tipo di router. In questi casi potrebbe essere di aiuto impostare la pagina principale di AdGuard come <0>server DHCP</0>. In alternativa, dovresti cercare sul manuale il modo per personalizzare i server DNS per il tuo particolare modello di router.",
-    "install_devices_windows_list_1": "Apri il Pannello di controllo tramite il menu Start o la ricerca di Windows.",
+    "install_devices_windows_list_1": "Aprire il Pannello di controllo tramite il menu Start o la ricerca di Windows.",
    "install_devices_windows_list_2": "Vai a Rete e categoria Internet e poi a Centro connessioni di rete e condivisione.",
    "install_devices_windows_list_3": "Sul lato sinistro dello schermo, trova le impostazioni della scheda Cambia e fai clic su di esso.",
    "install_devices_windows_list_4": "Seleziona la tua connessione attiva, fai clic destro su di essa e scegli Proprietà.",
    "install_devices_windows_list_5": "Trova Protocollo Internet versione 4 (TCP / IP) nell'elenco, selezionalo e quindi fai nuovamente clic su Proprietà.",
-    "install_devices_windows_list_6": "Scegli \"Utilizza i seguenti indirizzi del server DNS\" ed inserisci gli indirizzi del tuo server AdGuard Home.",
+    "install_devices_windows_list_6": "Scegli Usa i seguenti indirizzi del server DNS e inserisci gli indirizzi del tuo server AdGuard Home.",
    "install_devices_macos_list_1": "Fai clic sull'icona Apple e vai su Preferenze di Sistema.",
    "install_devices_macos_list_2": "Clicca sulla rete.",
    "install_devices_macos_list_3": "Seleziona la prima connessione nel tuo elenco e fai clic su Avanzate.",
@@ -315,7 +302,7 @@
    "install_devices_android_list_4": "Su alcuni dispositivi, potrebbe essere necessario selezionare la casella Avanzate per visualizzare ulteriori impostazioni. Per regolare le impostazioni del tuo DNS Android, dovrai cambiare le impostazioni IP da DHCP a Statico.",
    "install_devices_android_list_5": "Cambia i valori DNS 1 e DNS 2 negli indirizzi del tuo server AdGuard Home.",
    "install_devices_ios_list_1": "Dalla schermata principale, tocca Impostazioni.",
-    "install_devices_ios_list_2": "Scegli Wi-Fi nel menu a sinistra (impossibile configurare DNS per reti mobile).",
+    "install_devices_ios_list_2": "Scegli Wi-Fi nel menu a sinistra (impossibile configurare DNS per reti mobili).",
    "install_devices_ios_list_3": "Toccare il nome della rete attualmente attiva.",
    "install_devices_ios_list_4": "Nel campo DNS inserisci gli indirizzi del tuo server AdGuard Home.",
    "get_started": "Inizia",
@@ -334,17 +321,15 @@
    "encryption_https_desc": "Se la porta HTTPS è configurata, l'interfaccia di amministrazione di AdGuard Home sarà accessibile tramite HTTPS e fornirà anche DNS-over-HTTPS nella posizione \"/ dns-query\".",
    "encryption_dot": "DNS-su porta-TLS",
    "encryption_dot_desc": "Se questa porta è configurata, AdGuard Home eseguirà un server DNS-over-TLS su questa porta.",
-    "encryption_doq": "DNS-su porta-QUIC",
-    "encryption_doq_desc": "Se questa porta è configurata, AdGuard Home eseguirà un server DNS su porta QUIC. Questa opzione è sperimentale e potrebbe non risultare affidabile. Inoltre, al momento non sono molti i client a supportarla.",
    "encryption_certificates": "Certificati",
    "encryption_certificates_desc": "Per utilizzare la crittografia, è necessario fornire una catena di certificati SSL valida per il proprio dominio. Puoi ottenere un certificato gratuito su <0> {{link}} </ 0> o puoi acquistarlo da una delle Autorità di certificazione attendibili.",
    "encryption_certificates_input": "Copia / incolla qui i certificati codificati PEM.",
    "encryption_status": "Stato",
    "encryption_expire": "Scaduto",
    "encryption_key": "Chiave privata",
-    "encryption_key_input": "Copia/Incolla qui la tua chiave privata codificata PEM per il tuo certificato.",
-    "encryption_enable": "Attiva crittografia (HTTPS, DNS-su-HTTPS e DNS-su-TLS)",
-    "encryption_enable_desc": "Se la crittografia è attiva, l'interfaccia di amministrazione di AdGuard Home funzionerà su HTTPS e il server DNS ascolterà le richieste su DNS-over-HTTPS e DNS-over-TLS.",
+    "encryption_key_input": "Copia / incolla qui la tua chiave privata codificata PEM del tuo certificato.",
+    "encryption_enable": "Abilita crittografia (HTTPS, DNS-su-HTTPS e DNS-su-TLS)",
+    "encryption_enable_desc": "Se la crittografia è abilitata, l'interfaccia di amministrazione di AdGuard Home funzionerà su HTTPS e il server DNS ascolterà le richieste su DNS-over-HTTPS e DNS-over-TLS.",
    "encryption_chain_valid": "La catena di certificati è valida",
    "encryption_chain_invalid": "La catena di certificati non è valida",
    "encryption_key_valid": "Questa è una chiave privata {{type}} valida",
@@ -369,7 +354,7 @@
    "fix": "Risolvi",
    "dns_providers": "Qui c'è una <0>list di provider DNS</0> da cui scegliere",
    "update_now": "Aggiorna ora",
-    "update_failed": "Aggiornamento automatico non riuscito. Si prega di <a>seguire questi passi</a>per aggiornare manualmente.",
+    "update_failed": "L' auto aggiornamento è fallito. Perfavore <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>segui questi passi</a>per aggiornare manualmente.",
    "processing_update": "Perfavore aspetta, AdGuard Home si sta aggiornando",
    "clients_title": "Client",
    "clients_desc": "Configura i dispositivi connessi ad AdGuard Home",
@@ -390,7 +375,7 @@
    "form_add_id": "Aggiungi identificatore",
    "form_client_name": "Inserisci nome client",
    "name": "Nome",
-    "client_global_settings": "Utilizza le impostazioni globali",
+    "client_global_settings": "Usa le impostazioni globali",
    "client_deleted": "Client \"{{key}}\" eliminato correttamente",
    "client_added": "Client \"{{key}}\" aggiunto correttamente",
    "client_updated": "Client \"{{key}}\" aggiornato correttamente",
@@ -406,7 +391,7 @@
    "access_disallowed_title": "Client non permessi",
    "access_disallowed_desc": "Una lista in CIDR o indirizzi IP. Se configurata AdGuard Home non accetterà richieste da questi indirizzi ip.",
    "access_blocked_title": "Domini bloccati",
-    "access_blocked_desc": "Non confondere questi elementi con i filtri. AdGuard Home eliminerà le richieste DNS con questi domini in fase di elaborazione della richiesta.",
+    "access_blocked_desc": "Non confondere questi elementi con i filtri. AdGuard Home eliminerà le query DNS con questi domini nell'elaborazione della query.",
    "access_settings_saved": "Impostazioni di accesso salvate correttamente",
    "updates_checked": "Aggiornamenti controllati con successo",
    "updates_version_equal": "AdGuard Home è aggiornato",
@@ -467,18 +452,18 @@
    "filter_removed_successfully": "La lista è stata correttamente rimossa",
    "filter_updated": "Il filtro è stato aggiornato correttamente",
    "statistics_configuration": "Configurazione delle statistiche",
-    "statistics_retention": "Conservazione delle statistiche",
-    "statistics_retention_desc": "Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
+    "statistics_retention": "Conservazione statistiche",
+    "statistics_retention_desc": "Se si diminuisce il valore di intervallo, alcuni dati saranno persi",
    "statistics_clear": " Azzera statistiche",
    "statistics_clear_confirm": "Sei sicuro di voler azzerare le statistiche?",
-    "statistics_retention_confirm": "Sei sicuro di voler modificare la conservazione delle statistiche? Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
+    "statistics_retention_confirm": "Sei sicuro di modificare la conservazione statistiche? Se si diminuisce il valore di intervallo, alcuni dati saranno persi",
    "statistics_cleared": "Statistiche azzerate correttamente",
    "interval_hours": "{{count}} ora",
    "interval_hours_plural": "{{count}} ore",
    "filters_configuration": "Configurazione filtri",
-    "filters_enable": "Attiva i filtri",
+    "filters_enable": "Abilita i filtri",
    "filters_interval": "Intervallo aggiornamento filtri",
-    "disabled": "Disattivato",
+    "disabled": "Disabilitato",
    "username_label": "Nome utente",
    "username_placeholder": "Inserisci nome utente",
    "password_label": "Password",
@@ -493,9 +478,8 @@
    "network": "Rete",
    "descr": "Descrizione",
    "whois": "Chi è",
-    "filtering_rules_learn_more": "<0>Leggi altro</0> su come creare le tue liste host.",
+    "filtering_rules_learn_more": "<0>Leggi altro</0> su come creare i tuoi host blacklist.",
    "blocked_by_response": "Bloccato per CNAME o IP in risposta",
-    "blocked_by_cname_or_ip": "Bloccato da CNAME o IP",
    "try_again": "Riprova",
    "domain_desc": "Inserire il nome di dominio o carattere jolly che si vuole riscrivere.",
    "example_rewrite_domain": "riscrivi risposte per questo dominio soltanto.",
@@ -504,8 +488,8 @@
    "rewrite_domain_name": "Nome dominio: aggiungi una registrazione CNAME",
    "rewrite_A": "<0>A</0>: valore speciale, mantieni registrazioni <0>A</0> dall'upstream",
    "rewrite_AAAA": "<0>AAAA</0>: valore speciale, mantieni registrazioni <0>AAAA</0> dall'upstream",
-    "disable_ipv6": "Disattiva IPv6",
-    "disable_ipv6_desc": "Se questa funzionalità attiva, tutte le richieste DNS per gli indirizzi IPv6 (tipo AAAA) verranno eliminate.",
+    "disable_ipv6": "Disabilita IPv6",
+    "disable_ipv6_desc": "Se questa funzione è abilitata, tutte le query DNS per gli indirizzi IPv6 (tipo AAAA) verranno eliminate.",
    "fastest_addr": "Indirizzo IP più veloce",
    "fastest_addr_desc": "Interroga tutti i server DNS ed ottieni l'indirizzo IP più veloce tra tutte le risposte",
    "autofix_warning_text": "Se fai clic su \"Correggi\", AdGuardHome configurerà il tuo sistema per utilizzare il server DNS AdGuardHome.",
@@ -521,7 +505,7 @@
    "filtered_custom_rules": "Filtrato dalle regole filtro personalizzate",
    "choose_from_list": "Scegli dalla lista",
    "add_custom_list": "Aggiungi lista personalizzata",
-    "host_whitelisted": "L'host è stato aggiunto alla lista bianca",
+    "host_whitelisted": "L'host è presente nella whitelist",
    "check_ip": "Indirizzi IP: {{ip}}",
    "check_cname": "CNAME: {{cname}}",
    "check_reason": "Motivo: {{reason}}",
@@ -537,16 +521,15 @@
    "set_static_ip": "Imposta un indirizzo IP statico",
    "install_static_ok": "Buone notizie! L'indirizzo IP statico è già configurato",
    "install_static_error": "AdGuard Home non può configurarlo automaticamente per questa interfaccia di rete. Si prega di cercare un'istruzione su come farlo manualmente.",
-    "install_static_configure": "Abbiamo rilevato l'utilizzo di un indirizzo IP dinamico - <0> {{ip}} </0>. Desideri impostarlo come indirizzo statico?",
-    "confirm_static_ip": "AdGuard Home configurerà {{ip}} come indirizzo IP statico. Desideri procedere?",
+    "install_static_configure": "Abbiamo rilevato che viene utilizzato un indirizzo IP dinamico - <0> {{ip}} </0>. Vuoi usarlo come indirizzo statico?",
+    "confirm_static_ip": "AdGuard Home configurerà {{ip}} come indirizzo IP statico. Vuoi procedere?",
    "list_updated": "{{count}} lista aggiornata",
    "list_updated_plural": "{{count}} liste aggiornate",
-    "dnssec_enable": "Attiva DNSSEC",
-    "dnssec_enable_desc": "Spunta l'opzione DNSSEC nelle interrogazioni DNS in uscita e verifica il risultato (è richiesta l'attivazione del risolutore DNSSEC)",
+    "dnssec_enable": "Abilita DNSSEC",
+    "dnssec_enable_desc": "Imposta la spunta DNSSEC nelle interrogazioni DNS in uscita e verifica il risultato (è richiesta l'attivazione del risolutore DNSSEC)",
    "validated_with_dnssec": "Verificato con DNSSEC",
-    "all_queries": "Tutte le richieste",
    "show_blocked_responses": "Bloccato",
-    "show_whitelisted_responses": "Nella Lista Bianca",
+    "show_whitelisted_responses": "Nella whitelist",
    "show_processed_responses": "Processato",
    "blocked_safebrowsing": "Blocco Navigazione sicura",
    "blocked_adult_websites": "Siti per adulti bloccati",
@@ -564,21 +547,17 @@
    "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_min_override_desc": "Sovrascrivi valore TTL (minimo) ricevuto dall'upstream del server. Questo valore non può superare 3600 (1 ora)",
    "cache_ttl_max_override_desc": "Sovrascrivi valore TTL (massimo) ricevuto dall'upstream del server",
-    "ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
-    "filter_category_general": "Generali",
+    "min_exceeds_max_value": "Il valore minimo eccede quello massimo",
+    "value_not_larger_than": "Il valore non può essere maggiore di {{maximum}}",
+    "filter_category_general": "Generale",
    "filter_category_security": "Sicurezza",
    "filter_category_regional": "Regionale",
    "filter_category_other": "Altro",
-    "filter_category_general_desc": "Liste per blocco tracciamenti e annunci sulla maggioranza dei dispositivi",
+    "filter_category_general_desc": "Liste che bloccano tracciamenti e pubblicità sulla maggioranza dei dispositivi",
    "filter_category_security_desc": "Liste specializzate sul blocco di malware, phishing o domini scam",
-    "filter_category_regional_desc": "Liste focalizzate su annunci regionali e server traccianti",
+    "filter_category_regional_desc": "Liste focalizzare su pubblicità regionali e server traccianti",
    "filter_category_other_desc": "Altre liste di blocco",
-    "setup_config_to_enable_dhcp_server": "Configurazione dell'installazione per abilitare il server DHCP",
-    "original_response": "Responso originale",
-    "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.",
-    "experimental": "Sperimentale"
+    "click_to_view_queries": "Clicca per visualizzare query"
 }
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -11,8 +11,6 @@
    "save_config": "設定を保存する",
    "enabled_dhcp": "DHCPサーバを有効にしました",
    "disabled_dhcp": "DHCPサーバを無効にしました",
-    "unavailable_dhcp": "DHCPは利用できません",
-    "unavailable_dhcp_desc": "AdGuard Homeはお使いのOS上でDHCPサーバを実行できません。",
    "dhcp_title": "DHCPサーバ（実験的！）",
    "dhcp_description": "あなたのルータがDHCPの設定を提供していないのなら、AdGuardに内蔵されているDHCPサーバを利用できます。",
    "dhcp_enable": "DHCPサーバを有効にする",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP静的割り当て",
    "dhcp_leases_not_found": "DHCP割当はありません",
    "dhcp_config_saved": "DHCP設定の保存に成功しました",
-    "dhcp_ipv4_settings": "DHCP IPv4 設定",
-    "dhcp_ipv6_settings": "DHCP IPv6 設定",
    "form_error_required": "必須項目",
    "form_error_ip4_format": "IPv4フォーマットではありません",
    "form_error_ip6_format": "IPv6フォーマットではありません",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Client IDの形式が無効です",
    "form_error_positive": "0より大きい必要があります",
    "form_error_negative": "0以上である必要があります",
-    "range_end_error": "範囲開始よりも大きくなければなりません",
    "dhcp_form_gateway_input": "ゲートウェイIP",
    "dhcp_form_subnet_input": "サブネットマスク",
    "dhcp_form_range_title": "IPアドレスの範囲",
@@ -132,8 +127,7 @@
    "encryption_settings": "暗号化設定",
    "dhcp_settings": "DHCP設定",
    "upstream_dns": "上流DNSサーバ",
-    "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。上流DNSサーバの構成についての詳細は<a>こちら</a>をご確認ください。",
-    "upstream_dns_configured_in_file": "{{path}} にて設定されています",
+    "upstream_dns_hint": "このフィールドを未入力のままにすると、AdGuard Homeは上流として<a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a>を使用します。DNS over TLSサーバには、｢tls://」プレフィックスを使用してください。",
    "test_upstream_btn": "上流サーバをテストする",
    "upstreams": "上流",
    "apply_btn": "適用する",
@@ -154,7 +148,7 @@
    "request_table_header": "リクエスト",
    "edit_table_action": "編集する",
    "delete_table_action": "削除する",
-    "elapsed": "経過時間",
+    "elapsed": "経過",
    "filters_and_hosts_hint": "AdGuard Homeは、基本的な広告ブロックルールとhostsファイルの構文を理解します。",
    "no_blocklist_added": "ブロックリストには何も追加されていません",
    "no_whitelist_added": "許可リストには何も追加されていません",
@@ -187,7 +181,6 @@
    "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_sdns": "<1>DNSCrypt</1> または <2>DNS-over-HTTPS</2> リゾルバのために <0>DNS Stamps</0> を使えます",
    "example_upstream_tcp": "通常のDNS（TCPでの問い合わせ）",
    "all_lists_up_to_date_toast": "すべてのリストは既に最新です",
@@ -196,10 +189,6 @@
    "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": "ドメイン名",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "ページ",
    "rows_table_footer_text": "行",
    "updated_custom_filtering_toast": "カスタム・フィルタリングルールを更新しました",
-    "rule_removed_from_custom_filtering_toast": "ルールをカスタム・フィルタリングルールから除去しました {{rule}}",
-    "rule_added_to_custom_filtering_toast": "ルールをカスタム・フィルタリングルールに追加しました {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "ルールをカスタム・フィルタリングルールから除去しました",
+    "rule_added_to_custom_filtering_toast": "ルールをカスタム・フィルタリングルールに追加しました",
    "query_log_response_status": "ステータス: {{value}}",
    "query_log_filtered": "{{filter}}によるフィルタ",
    "query_log_confirm_clear": "クエリ・ログ全体を消去してもよろしいですか？",
@@ -241,7 +230,6 @@
    "blocking_mode": "ブロックモード",
    "default": "デフォルト",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Null IP",
    "custom_ip": "カスタムIP",
    "blocking_ipv4": "ブロック中のIPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "頻度制限",
    "edns_enable": "EDNSクライアント・サブネットを有効にする",
    "edns_cs_desc": "有効にすると、AdGuard HomeはクライアントのサブネットをDNSサーバへ送信します。",
-    "rate_limit_desc": "単一のクライアントに対して許可される1秒あたりのリクエスト数（「0」に設定すると無制限になります）",
+    "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_refused": "REFUSED: 「REFUSED」コードで応答します",
+    "blocking_mode_default": "デフォルト：Adblockスタイルのルールによってブロックされると、NXDOMAINで応答します。 /etc/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アドレスで応答します",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "HTTPSポートが設定されていると、AdGuard Home 管理インターフェースはHTTPS経由でアクセス可能になり、そして「/dns-query」の場所にDNS-over-HTTPSも提供されます。",
    "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形式の証明書をコピー／ペーストしてください。",
@@ -369,7 +354,7 @@
    "fix": "改善",
    "dns_providers": "こちらは、選択可能な<0>既知のDNSプロバイダの一覧</0>です。",
    "update_now": "今すぐ更新する",
-    "update_failed": "自動更新に失敗しました。手動で更新するには、<a>手順に従って</a>ください。",
+    "update_failed": "自動更新に失敗しました。手動で更新するには、<a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>手順に従って</a>ください。",
    "processing_update": "AdGuard Homeを更新しています。しばらくお待ちください",
    "clients_title": "クライアント",
    "clients_desc": "AdGuard Homeに接続されているデバイスを設定します",
@@ -559,14 +544,15 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "キャッシュサイズ",
    "cache_size_desc": "DNSキャッシュサイズ（バイト単位）",
-    "cache_ttl_min_override": "最小TTLの上書き（秒単位）",
-    "cache_ttl_max_override": "最大TTLの上書き（秒単位）",
+    "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_min_override_desc": "上流サーバから受信したTTL値（最小）を上書き。この値は3600（1時間）を超えることはできません。",
    "cache_ttl_max_override_desc": "上流サーバから受信したTTL値（最大）を上書き。",
-    "ttl_cache_validation": "最小キャッシュTTL値は最大値以下にする必要があります",
+    "min_exceeds_max_value": "最小値が最大値を超えています",
+    "value_not_larger_than": "値は{{maximum}}より大きくすることはできません",
    "filter_category_general": "一般",
    "filter_category_security": "セキュリティ",
    "filter_category_regional": "地域別",
@@ -577,7 +563,5 @@
    "filter_category_other_desc": "その他のブロックリストです。",
    "original_response": "当初の応答",
    "click_to_view_queries": "クエリを表示するにはクリックしてください",
-    "port_53_faq_link": "多くの場合、ポート53は \"DNSStubListener\" または \"systemd-resolved\" サービスによって利用されています。これを解決する方法については、<0>この手順</0>をお読みください。",
-    "adg_will_drop_dns_queries": "AdGuard Homeは、このクライアントからすべてのDNSクエリを落とします。",
-    "experimental": "実験用"
+    "port_53_faq_link": "多くの場合、ポート53は \"DNSStubListener\" または \"systemd-resolved\" サービスによって利用されています。これを解決する方法については、<0>この手順</0>をお読みください。"
 }
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -11,8 +11,6 @@
    "save_config": "구성 저장",
    "enabled_dhcp": "DHCP 서버 활성화됨",
    "disabled_dhcp": "DHCP 서버 비활성화됨",
-    "unavailable_dhcp": "DHCP가 사용 불가능합니다.",
-    "unavailable_dhcp_desc": "AdGuard Home은 이 OS에서 DHCP 서버를 구동할 수 없습니다.",
    "dhcp_title": "DHCP 서버 (시험!)",
    "dhcp_description": "라우터가 DHCP 설정을 제공하지 않으면 AdGuard의 자체 기본 제공 DHCP 서버를 사용할 수 있습니다.",
    "dhcp_enable": "DHCP 서버 활성화",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP 고정 임대",
    "dhcp_leases_not_found": "DHCP 임대를 찾을 수 없음",
    "dhcp_config_saved": "DHCP 서버 설정 저장됨",
-    "dhcp_ipv4_settings": "DHCP IPv4 설정",
-    "dhcp_ipv6_settings": "DHCP IPv6 설정",
    "form_error_required": "필수 필드",
    "form_error_ip4_format": "잘못된 IPv4 형식",
    "form_error_ip6_format": "잘못된 IPv6 형식",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "잘못된 클라이언트 ID 형식",
    "form_error_positive": "0보다 커야 합니다",
    "form_error_negative": "반드시 0 이상이여야 합니다",
-    "range_end_error": "입력 값은 범위의 시작 지점보다 큰 값 이여야 합니다.",
    "dhcp_form_gateway_input": "게이트웨이 IP",
    "dhcp_form_subnet_input": "서브넷 마스크",
    "dhcp_form_range_title": "IP 주소 범위",
@@ -132,8 +127,7 @@
    "encryption_settings": "암호화 설정",
    "dhcp_settings": "DHCP 설정",
    "upstream_dns": "업스트림 DNS 서버",
-    "upstream_dns_help": "서버 주소를 한 줄에 하나씩 입력해주십시오. 업스트림 DNS 서버 구성에 대해 <a>자세히 알아보십시오</a>.",
-    "upstream_dns_configured_in_file": "{{path}}에서 구성됨",
+    "upstream_dns_hint": "이 항목을 비워 두면 AdGuard Home에서 <a href='https://1.1.1.1/' target='_blank'> Cloudflare DNS </a>를 업스트림으로 사용합니다.",
    "test_upstream_btn": "업스트림 테스트",
    "upstreams": "업스트림",
    "apply_btn": "적용",
@@ -187,7 +181,6 @@
    "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_sdns": "<1>DNSCrypt</1>나 <2>DNS-over-HTTPS</2> 리졸버를 위해 <0>DNS 스탬프</0>를 사용할 수 있습니다",
    "example_upstream_tcp": "사용자 지정 DNS (TCP를 통한 접속)",
    "all_lists_up_to_date_toast": "모든 리스트가 이미 최신입니다",
@@ -196,10 +189,6 @@
    "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": "도메인명",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "페이지",
    "rows_table_footer_text": "행",
    "updated_custom_filtering_toast": "사용자 정의 필터링 규칙 업데이트",
-    "rule_removed_from_custom_filtering_toast": "사용자 정의 필터링 규칙에서 규칙 제거 {{rule}}",
-    "rule_added_to_custom_filtering_toast": "사용자 정의 필터링 규칙에 추가된 규칙 {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "사용자 정의 필터링 규칙에서 규칙 제거",
+    "rule_added_to_custom_filtering_toast": "사용자 정의 필터링 규칙에 추가된 규칙",
    "query_log_response_status": "상태: {{value}}",
    "query_log_filtered": "필터: {{filter}}",
    "query_log_confirm_clear": "정말로 모든 쿼리 로그를 비우시겠습니까?",
@@ -241,7 +230,6 @@
    "blocking_mode": "차단 모드",
    "default": "기본",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "빈 IP",
    "custom_ip": "사용자 지정 IP",
    "blocking_ipv4": "IPv4 차단",
@@ -256,8 +244,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_refused": "REFUSED: REFUSED 코드로 응답",
+    "blocking_mode_default": "기본: Adblock 스타일 규칙에 의해 차단되면 NXDOMAIN으로 응답합니다; /etc/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 주소로 응답합니다",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "HTTPS 포트가 구성되면 HTTPS를 통해 AdGuard Home 관리자 인터페이스에 액세스할 수 있으며, '/dns-query' 위치에 DNS-over-HTTPS도 제공합니다.",
    "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으로 인코딩된 인증서 여기에 복사/붙여넣기하세요.",
@@ -369,7 +354,7 @@
    "fix": "수정",
    "dns_providers": "여기에 선택가능한 DNS 목록 </0>이 있습니다.",
    "update_now": "지금 업데이트",
-    "update_failed": "자동 업데이트 실패 되었습니다. <a> 단계를 따라 수동으로 업데이트하세요</a>",
+    "update_failed": "자동 업데이트 실패 되었습니다. <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'> 단계를 따라 수동으로 업데이트하세요</a>",
    "processing_update": "잠시만 기다려주세요, AdGuard Home가 업데이트 중입니다.",
    "clients_title": "클라이언트",
    "clients_desc": "AdGuard Home에 연결할 기기들을 설정",
@@ -559,14 +544,15 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "캐시 크기",
    "cache_size_desc": "DNS 캐시 크기 (바이트)",
-    "cache_ttl_min_override": "최소 TTL (초) 무시",
-    "cache_ttl_max_override": "최대 TTL (초) 무시",
+    "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_min_override_desc": "업스트림 서버에서 수신한 TTL 값(최소)을 무시합니다. 이 값은 3600(1시간)보다 클 수 없습니다",
    "cache_ttl_max_override_desc": "업스트림 서버에서 수신한 TTL 값(최대)을 무시합니다",
-    "ttl_cache_validation": "최소 캐시 TTL 값은 최대 값보다 이하여야 합니다",
+    "min_exceeds_max_value": "최소값이 최대값을 초과합니다",
+    "value_not_larger_than": "값은 {{maximum}}보다 클 수 없습니다",
    "filter_category_general": "일반 목록",
    "filter_category_security": "보안 목록",
    "filter_category_regional": "지역 목록",
@@ -575,10 +561,6 @@
    "filter_category_security_desc": "멀웨어, 피싱 또는 사기 도메인을 차단하는 목록",
    "filter_category_regional_desc": "지역 광고 및 추적 서버에 중점을 둔 목록",
    "filter_category_other_desc": "기타 차단 목록",
-    "setup_config_to_enable_dhcp_server": "DHCP 서버를 활성화하기 위한 초기 설정",
    "original_response": "원래 응답",
-    "click_to_view_queries": "쿼리를 보려면 클릭합니다",
-    "port_53_faq_link": "53번 포트는 보통 \"DNSStubListener\"나 \"systemd-resolved\" 서비스가 이미 사용하고 있습니다. 이 문제에 대한 해결 방법을 <0>설명</0>에서 찾아보세요.",
-    "adg_will_drop_dns_queries": "AdGuard Home은 이 클라이언트에서 모든 DNS 쿼리를 삭제합니다.",
-    "experimental": "실험"
+    "click_to_view_queries": "쿼리를 보려면 클릭합니다"
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -11,8 +11,6 @@
    "save_config": "Configuratie opslaan",
    "enabled_dhcp": "DHCP server inschakelen",
    "disabled_dhcp": "DHCP server uitschakelen",
-    "unavailable_dhcp": "DHCP is niet beschikbaar",
-    "unavailable_dhcp_desc": "AdGuard Home kan geen DHCP-server draaien op uw OS",
    "dhcp_title": "DHCP server (experimenteel!)",
    "dhcp_description": "Indien je router geen DHCP instellingen heeft,kan je AdGuard's eigen ingebouwde DHCP server gebruiken.",
    "dhcp_enable": "DHCP server inschakelen",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP statische lease",
    "dhcp_leases_not_found": "Geen DHCP lease gevonden",
    "dhcp_config_saved": "DHCP server configuratie opgeslagen",
-    "dhcp_ipv4_settings": "DHCP IPv4 instellingen",
-    "dhcp_ipv6_settings": "DHCP IPv6 instellingen",
    "form_error_required": "Vereist veld",
    "form_error_ip4_format": "Ongeldig IPv4 formaat",
    "form_error_ip6_format": "Ongeldig IPv6 formaat",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Opmaak cliënt-ID is ongeldig",
    "form_error_positive": "Moet groter zijn dan 0",
    "form_error_negative": "Moet 0 of hoger dan 0 zijn",
-    "range_end_error": "Moet groter zijn dan het startbereik",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Bereik van IP adressen",
@@ -41,7 +36,7 @@
    "dhcp_form_range_end": "Laatste adres",
    "dhcp_form_lease_title": "DHCP lease tijd (in seconden)",
    "dhcp_form_lease_input": "Lease tijd totaal",
-    "dhcp_interface_select": "DHCP interface selecteren",
+    "dhcp_interface_select": "Selecteer DHCP interface",
    "dhcp_hardware_address": "Hardware adres",
    "dhcp_ip_addresses": "IP adressen",
    "ip": "IP",
@@ -132,8 +127,7 @@
    "encryption_settings": "Encryptie Instellingen",
    "dhcp_settings": "DHCP Instellingen",
    "upstream_dns": "Upstream DNS servers",
-    "upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
-    "upstream_dns_configured_in_file": "Geconfigureerd in {{path}}",
+    "upstream_dns_hint": "Indien je dit veld leeg laat, zal AdGuard Home <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> gebruiken als upstream.",
    "test_upstream_btn": "Test upstream",
    "upstreams": "Upstreams",
    "apply_btn": "Toepassen",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "standaard DNS (over UDP)",
    "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
    "example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
-    "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>",
    "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
    "example_upstream_tcp": "standaard DNS (over TCP)",
    "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
    "unblock": "Deblokkeren",
    "block": "Blokkeren",
-    "disallow_this_client": "Toepassing/systeem niet toelaten",
-    "allow_this_client": "Toepassing/systeem toelaten",
-    "block_for_this_client_only": "Alleen voor deze toepassing/dit systeem blokkeren",
-    "unblock_for_this_client_only": "Alleen voor deze toepassing/dit systeem deblokkeren",
    "time_table_header": "Tijd",
    "date": "Datum",
    "domain_name_table_header": "Domein naam",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Pagina",
    "rows_table_footer_text": "rijen",
    "updated_custom_filtering_toast": "Aangepaste filter regels zijn bijgewerkt",
-    "rule_removed_from_custom_filtering_toast": "Regel verwijderd uit de aangepaste filterregels: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regel toegevoegd aan de aangepaste filterregels: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regel verwijderd uit de aangepaste filterregels",
+    "rule_added_to_custom_filtering_toast": "Regel toegevoegd aan de aangepaste filterregels",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Gefilterd door {{filter}}",
    "query_log_confirm_clear": "Weet u zeker dat u het hele query logboek wilt legen?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Blocking modus",
    "default": "Standaard",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Nul IP",
    "custom_ip": "Aangepast IP",
    "blocking_ipv4": "Blokkeren IP4",
@@ -253,11 +241,10 @@
    "rate_limit": "Ratio limiet",
    "edns_enable": "Zet EDNS client subnet aan",
    "edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
-    "rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0 betekent onbeperkt)",
+    "rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: 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_refused": "REFUSED: Antwoorden met REFUSED code",
+    "blocking_mode_default": "Standaard: Reageer met NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
@@ -302,12 +289,12 @@
    "install_devices_windows_list_1": "Open het Configuratiescherm via het menu Start of Windows zoeken.",
    "install_devices_windows_list_2": "Ga naar de categorie Netwerk en Internet en vervolgens naar Netwerkcentrum.",
    "install_devices_windows_list_3": "Zoek aan de linkerkant van het scherm Adapter-instellingen wijzigen en klik erop.",
-    "install_devices_windows_list_4": "Selecteer jouw actieve verbinding, klik er met de rechtermuisknop op en kies Eigenschappen.",
+    "install_devices_windows_list_4": "Selecteer uw actieve verbinding, klik er met de rechtermuisknop op en kies Eigenschappen.",
    "install_devices_windows_list_5": "Zoek Internet Protocol versie 4 (TCP / IP) in de lijst, selecteer het en klik vervolgens opnieuw op Eigenschappen.",
    "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
    "install_devices_macos_list_1": "Klik op het Apple-pictogram en ga naar Systeemvoorkeuren.",
    "install_devices_macos_list_2": "Klik op Netwerk.",
-    "install_devices_macos_list_3": "Selecteer de eerste verbinding in jouw lijst en klik op Geavanceerd.",
+    "install_devices_macos_list_3": "Selecteer de eerste verbinding in uw lijst en klik op Geavanceerd.",
    "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
    "install_devices_android_list_1": "Tik op het startscherm van het Android-menu op Instellingen.",
    "install_devices_android_list_2": "Tik op wifi in het menu. Het scherm met alle beschikbare netwerken wordt getoond (het is niet mogelijk om een aangepaste DNS in te stellen voor een mobiele verbinding).",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Als de HTTPS-poort is geconfigureerd, is de AdGuard Home beheerders interface toegankelijk via HTTPS en biedt deze ook DNS-over-HTTPS op de locatie '/ dns-query'.",
    "encryption_dot": "DNS-over-TLS poort",
    "encryption_dot_desc": "Indien deze poort is geconfigureerd, zal AdGuard Home gebruik maken van een DNS-over-TLS server via deze poort.",
-    "encryption_doq": "DNS-via-QUIC poort",
-    "encryption_doq_desc": "Als deze poort is geconfigureerd, zal AdGuard Home een DNS-via-QUIC server gebruiken via deze poort. Dit is experimenteel en kan onbetrouwbaar zijn. Er zijn overigens nog niet veel systemen die dit nu al ondersteunen.",
    "encryption_certificates": "Certificaten",
    "encryption_certificates_desc": "Om encryptie te gebruiken, moet u een geldige SSL certificaat voor uw domein opgeven. U kunt een gratis certificaat krijgen op <0> {{link}} </0> of u kunt het kopen bij een van de vertrouwde certificaatautoriteiten.",
    "encryption_certificates_input": "Kopieër en plak je PEM-gecodeerde certificaten hier.",
@@ -369,7 +354,7 @@
    "fix": "Los op",
    "dns_providers": "hier is een <0>lijst of gekende DNS providers</0> waarvan je kan kiezen.",
    "update_now": "Update nu",
-    "update_failed": "Auto-update is mislukt. <a>Volg deze stappen</a> om manueel te updaten.",
+    "update_failed": "Auto-update is mislukt. Volg <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>de volgende stappen</a> om manueel te updaten.",
    "processing_update": "Even geduld, AdGuard Home wordt bijgewerkt",
    "clients_title": "Gebruikers",
    "clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
@@ -513,7 +498,7 @@
    "autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.",
    "tags_title": "Labels",
    "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
-    "form_select_tags": "Client tags selecteren",
+    "form_select_tags": "Kies client tags",
    "check_title": "Controleer de filtering",
    "check_desc": "Controleer of de hostnaam wordt gefilterd",
    "check": "Controleren",
@@ -564,9 +549,10 @@
    "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_min_override_desc": "Overschrijft TTL waarde (minimaal) ontvangen van de upstream server. Deze waarde mag niet hoger als 3600 (1 uur) zijn",
    "cache_ttl_max_override_desc": "Overschrijft TTL waarde (maximaal) ontvangen van de upstream server",
-    "ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
+    "min_exceeds_max_value": "Minimale waarde overschrijdt de maximale waarde",
+    "value_not_larger_than": "Waarde mag niet hoger zijn dan {{maximum}}",
    "filter_category_general": "Algemeen",
    "filter_category_security": "Beveiliging",
    "filter_category_regional": "Regionaal",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Lijsten gespecialiseerd in het blokkeren van malware, phising of scam domeinen",
    "filter_category_regional_desc": "Lijsten die focussen op regionale ads en tracking servers",
    "filter_category_other_desc": "Overige blokkeerlijsten",
-    "setup_config_to_enable_dhcp_server": "Configuratie instelling om DHCP-server in te schakelen",
    "original_response": "Oorspronkelijke reactie",
    "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.",
-    "experimental": "Experimenteel"
+    "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."
 }
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -11,8 +11,6 @@
    "save_config": "Lagre oppsettet",
    "enabled_dhcp": "DHCP-tjeneren ble skrudd på",
    "disabled_dhcp": "DHCP-tjeneren ble skrudd av",
-    "unavailable_dhcp": "DHCP er utilgjengelig",
-    "unavailable_dhcp_desc": "AdGuard Home kan ikke kjøre en DHCP-tjener på ditt OS",
    "dhcp_title": "DHCP-tjener (eksperimentell!)",
    "dhcp_description": "Dersom ruteren din ikke har DHCP-innstillinger, kan du bruke AdGuard Home sin egen innebygde DHCP-tjener.",
    "dhcp_enable": "Skru på DHCP-tjeneren",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "Statiske DHCP-leieavtaler",
    "dhcp_leases_not_found": "Ingen DHCP-leieavtaler ble funnet",
    "dhcp_config_saved": "Lagret DHCP-tjeneroppsettet",
-    "dhcp_ipv4_settings": "DHCP IPv4-innstillinger",
-    "dhcp_ipv6_settings": "DHCP IPv6-innstillinger",
    "form_error_required": "Påkrevd felt",
    "form_error_ip4_format": "Ugyldig IPv4-format",
    "form_error_ip6_format": "Ugyldig IPv6-format",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Ugyldig ID-klientformat",
    "form_error_positive": "Må være høyere enn 0",
    "form_error_negative": "Må være ≥0",
-    "range_end_error": "Må være høyere enn rekkeviddens start",
    "dhcp_form_gateway_input": "Gateway-IP",
    "dhcp_form_subnet_input": "Nettverksmaske",
    "dhcp_form_range_title": "Spennvidden til IP-adressene",
@@ -132,7 +127,7 @@
    "encryption_settings": "Krypteringsinnstillinger",
    "dhcp_settings": "DHCP-innstillinger",
    "upstream_dns": "Oppstrøms-DNS-tjenere",
-    "upstream_dns_configured_in_file": "Satt opp i {{path}}",
+    "upstream_dns_hint": "Hvis du lar dette feltet stå tomt, vil AdGuard Home will bruke <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> som en oppstrømstjener.",
    "test_upstream_btn": "Test oppstrømstilkoblinger",
    "upstreams": "Oppstrømstjenere",
    "apply_btn": "Benytt",
@@ -168,7 +163,6 @@
    "edit_blocklist": "Rediger blokkeringsliste",
    "edit_allowlist": "Rediger hviteliste",
    "choose_blocklist": "Velg blokkeringslister",
-    "choose_allowlist": "Velg hvitelister",
    "enter_valid_blocklist": "Skriv inn en gyldig nettadresse til blokkeringslisten.",
    "enter_valid_allowlist": "Skriv inn en gyldig nettadresse til hvitelisten.",
    "form_error_url_format": "Ugyldig URL-format",
@@ -186,7 +180,6 @@
    "example_upstream_regular": "vanlig DNS (over UDP)",
    "example_upstream_dot": "kryptert <0>DNS-over-TLS</0>",
    "example_upstream_doh": "kryptert <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "kryptert <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "du kan bruke <0>DNS-stempler</0> med <1>DNSCrypt</1> eller <2>DNS-over-HTTPS</2>-behandlere",
    "example_upstream_tcp": "vanlig DNS (over TCP)",
    "all_lists_up_to_date_toast": "Alle listene er allerede oppdatert",
@@ -195,10 +188,6 @@
    "dns_test_not_ok_toast": "Tjeneren «{{key}}» kunne ikke brukes, vennligst dobbeltsjekk at du har skrevet den riktig",
    "unblock": "Tillat",
    "block": "Blokker",
-    "disallow_this_client": "Ikke tillat denne klienten",
-    "allow_this_client": "Tillat denne klienten",
-    "block_for_this_client_only": "Blokker kun for denne klienten",
-    "unblock_for_this_client_only": "Opphev blokkering kun for denne enheten",
    "time_table_header": "Tidspunkt",
    "date": "Dato",
    "domain_name_table_header": "Domenenavn",
@@ -218,8 +207,8 @@
    "page_table_footer_text": "Side",
    "rows_table_footer_text": "rekker",
    "updated_custom_filtering_toast": "Oppdaterte de selvvalgte filtreringsreglene",
-    "rule_removed_from_custom_filtering_toast": "Oppføringen ble fjernet fra de selvvalgte filtreringsreglene: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Oppføringen ble lagt til i de selvvalgte filtreringsreglene: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Oppføringen ble fjernet fra de selvvalgte filtreringsreglene",
+    "rule_added_to_custom_filtering_toast": "Oppføringen ble lagt til i de selvvalgte filtreringsreglene",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrert av {{filter}}",
    "query_log_confirm_clear": "Er du sikker på at du vil slette hele forespørselsloggen?",
@@ -235,12 +224,9 @@
    "anonymize_client_ip": "Anonymiser klient-IP-en",
    "anonymize_client_ip_desc": "Ikke lagre den fulle IP-adressen til klienten i loggføringer eller statistikker",
    "dns_config": "DNS-tjeneroppsett",
-    "dns_cache_config": "DNS-mellomlageroppsett",
-    "dns_cache_config_desc": "Her kan du justere DNS-mellomlageret",
    "blocking_mode": "Blokkeringsmodus",
    "default": "Standardmodus",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Null-IP",
    "custom_ip": "Tilpasset IP",
    "blocking_ipv4": "IPv4-blokkering",
@@ -252,10 +238,10 @@
    "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_default": "Standardmodus: Svar med NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt valgt IP-adresse",
@@ -332,7 +318,6 @@
    "encryption_https_desc": "Dersom HTTPS-porten er satt opp, vil AdGuard Home sitt admin-grensesnitt være tilgjengelig gjennom HTTPS, og vil også sørge for DNS-over-HTTPS på «/dns-query»-plasseringen.",
    "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_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.",
@@ -366,7 +351,7 @@
    "fix": "Fiks",
    "dns_providers": "Her er en <0>liste over kjente DNS-leverandører</0> som du kan velge blant.",
    "update_now": "Oppdater nå",
-    "update_failed": "Auto-oppdatering mislyktes. Vennligst <a>følg trinnene</a> for manuelle oppdateringer.",
+    "update_failed": "Auto-oppdatering mislyktes. Vennligst <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>følg trinnene</a> for manuelle oppdateringer.",
    "processing_update": "Vennligst vent, AdGuard Home blir oppdatert",
    "clients_title": "Klienter",
    "clients_desc": "Konfigurer enheter som er koblet til AdGuard Home",
@@ -461,7 +446,6 @@
    "domain": "Domene",
    "answer": "Svar",
    "filter_added_successfully": "Filteret har blitt vellykket lagt til",
-    "filter_removed_successfully": "Listen ble vellykket fjernet",
    "filter_updated": "Listen ble vellykket oppdatert",
    "statistics_configuration": "Statistikk-oppsett",
    "statistics_retention": "Statistikkbeholding",
@@ -492,15 +476,10 @@
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Lær mer</0> om å lage dine egne filterlister for AdGuard Home.",
    "blocked_by_response": "Blokkert av responsens CNAME eller IP",
-    "blocked_by_cname_or_ip": "Blokkert av CNAME eller IP",
    "try_again": "Prøv på nytt",
    "domain_desc": "Skriv inn domenenavnet eller jokertegnet som du vil skal skrives om.",
    "example_rewrite_domain": "omskriv svarene til kun dette domenenavnet.",
    "example_rewrite_wildcard": "omskriv svarene til alle <0>example.org</0>-underdomener.",
-    "rewrite_ip_address": "IP-adresse: Bruk denne IP-en i en A- eller AAAA-respons",
-    "rewrite_domain_name": "Domenenavn: Legg til en CNAME-statutt",
-    "rewrite_A": "<0>A</0>: spesialverdi, behold <0>A</0>-statutter fra oppstrømstjeneren",
-    "rewrite_AAAA": "<0>AAAA</0>: spesialverdi, behold <0>AAAA</0>-statutter fra oppstrømstjeneren",
    "disable_ipv6": "Skru av IPv6",
    "disable_ipv6_desc": "Hvis dette er skrudd på, vil alle DNS-forespørslene til IPv6-adresser (AAAA-type) bli droppet.",
    "fastest_addr": "Raskeste IP-adresse",
@@ -541,7 +520,6 @@
    "dnssec_enable": "Skru på DNSSEC",
    "dnssec_enable_desc": "Fest på DNSSEC-flagg til utgående DNS-forespørsler og sjekk resultatet (En DNS-oppstrømstjener med DNSSEC-støtte er påkrevd)",
    "validated_with_dnssec": "Validert med DNSSEC",
-    "all_queries": "Alle forespørsler",
    "show_blocked_responses": "Blokkért",
    "show_whitelisted_responses": "Hvitelistet",
    "show_processed_responses": "Bearbeidet",
@@ -555,23 +533,11 @@
    "blocklist": "Blokkeringsliste",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Mellomlagerstørrelse",
-    "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",
    "filter_category_general": "Generelt",
    "filter_category_security": "Sikkerhet",
    "filter_category_regional": "Regional",
    "filter_category_other": "Andre",
-    "filter_category_general_desc": "Lister som blokkerer sporing og reklamer på de fleste enheter",
-    "filter_category_security_desc": "Lister som spesialiserer seg på å blokkere skadevare-, phishing- eller svindeldomener",
-    "filter_category_regional_desc": "Lister som fokuserer på regionale reklamer og sporingstjenere",
    "filter_category_other_desc": "Andre blokkeringslister",
-    "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",
-    "experimental": "Eksperimentell"
+    "click_to_view_queries": "Klikk for å vise forespørsler"
 }
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -11,8 +11,6 @@
    "save_config": "Zapisz konfigurację",
    "enabled_dhcp": "Serwer DHCP włączony",
    "disabled_dhcp": "Serwer DHCP wyłączony",
-    "unavailable_dhcp": "Serwer DHCP jest niedostępny",
-    "unavailable_dhcp_desc": "AdGuard Home nie może uruchomić serwera DHCP na Twoim systemie operacyjnym",
    "dhcp_title": "Serwer DHCP ",
    "dhcp_description": "Jeśli router nie zapewnia ustawień DHCP, możesz użyć wbudowanego serwera DHCP AdGuard.",
    "dhcp_enable": "Włącz serwer DHCP",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "Dzierżawy statyczne DHCP",
    "dhcp_leases_not_found": "Nie znaleziono dzierżaw DHCP",
    "dhcp_config_saved": "Konfiguracja DHCP pomyślnie zapisana",
-    "dhcp_ipv4_settings": "Ustawienia serwera DHCP IPv4",
-    "dhcp_ipv6_settings": "Ustawienia serwera DHCP IPv6",
    "form_error_required": "Pole jest wymagane",
    "form_error_ip4_format": "Nieprawidłowy format IPv4",
    "form_error_ip6_format": "Nieprawidłowy format IPv6",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Nieprawidłowy format identyfikatora klienta",
    "form_error_positive": "Musi być większa niż 0",
    "form_error_negative": "Musi być równy 0 lub większy",
-    "range_end_error": "Zakres musi być większy niż początkowy",
    "dhcp_form_gateway_input": "Adres IP bramy",
    "dhcp_form_subnet_input": "Maska podsieci",
    "dhcp_form_range_title": "Zakres adresów IP",
@@ -132,8 +127,7 @@
    "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}}",
+    "upstream_dns_hint": "Jeśli to pole pozostawisz puste, AdGuard Home wykorzysta usługę <a href='https://www.quad9.net/' target='_blank'>Quad9</a> jako główny serwer DNS.",
    "test_upstream_btn": "Test głównych serwerów DNS",
    "upstreams": "Główne serwery DNS",
    "apply_btn": "Zastosuj",
@@ -187,7 +181,6 @@
    "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",
@@ -196,10 +189,6 @@
    "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",
    "date": "Data",
    "domain_name_table_header": "Nazwa domeny",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Strona",
    "rows_table_footer_text": "wierszy",
    "updated_custom_filtering_toast": "Zaktualizowano niestandardowe reguły filtrowania",
-    "rule_removed_from_custom_filtering_toast": "Reguła usunięta z niestandardowych reguł filtrowania: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Reguła dodana do niestandardowych reguł filtrowania: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Reguła usunięta z niestandardowych reguł filtrowania",
+    "rule_added_to_custom_filtering_toast": "Reguła dodana do niestandardowych reguł filtrowania",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrowane przez {{filter}}",
    "query_log_confirm_clear": "Czy na pewno chcesz wyczyścić cały dziennik zapytań?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Tryb blokowania",
    "default": "Domyślny",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Null IP",
    "custom_ip": "Niestandardowy adres IP",
    "blocking_ipv4": "Blokowanie IPv4",
@@ -253,11 +241,10 @@
    "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ę)",
+    "rate_limit_desc": "Liczba żądań na sekundę, które może wykonać pojedynczy klient (0: nieograniczona)",
    "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_refused": "REFUSED: Odpowiedz kodem REFUSED",
+    "blocking_mode_default": "Domyślny: Odpowiedz kodem NXDOMAIN, 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_nxdomain": "NXDOMAIN: Odpowiedz kodem NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA)",
    "blocking_mode_custom_ip": "Niestandardowy adres IP: Odpowiedz ręcznie ustawionym adresem IP",
@@ -334,8 +321,6 @@
    "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.",
@@ -369,7 +354,7 @@
    "fix": "Napraw",
    "dns_providers": "Oto lista <0>znanych dostawców DNS</0> do wyboru.",
    "update_now": "Aktualizuj teraz",
-    "update_failed": "Automatyczna aktualizacja nie powiodła się. Proszę <a>wykonaj kroki</a> aby zaktualizować ręcznie.",
+    "update_failed": "Automatyczna aktualizacja nie powiodła się. Proszę <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>wykonaj kroki</a> aby zaktualizować ręcznie.",
    "processing_update": "Poczekaj, trwa aktualizacja AdGuard Home",
    "clients_title": "Klienci",
    "clients_desc": "Skonfiguruj urządzenia podłączone do AdGuard Home",
@@ -564,8 +549,10 @@
    "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_min_override_desc": "Nadpisz wartość TTL (minimalną) otrzymaną od serwera nadrzędnego",
+    "cache_ttl_min_override_desc": "Nadpisz wartość TTL (minimalną) otrzymaną od serwera nadrzędnego. Wartość nie może być większa niż 3600 (1 godzina)",
    "cache_ttl_max_override_desc": "Nadpisz wartość TTL (maksymalną) otrzymaną od serwera nadrzędnego",
+    "min_exceeds_max_value": "Minimalna wartość przekracza maksymalną wartość",
+    "value_not_larger_than": "Wartość nie może być większa niż {{maximum}}",
    "filter_category_general": "Ogólne",
    "filter_category_security": "Bezpieczeństwo",
    "filter_category_regional": "Regionalne",
@@ -574,10 +561,7 @@
    "filter_category_security_desc": "Listy, które specjalizują się w blokowaniu domen ze złośliwym oprogramowaniem, phishingiem lub oszustwami",
    "filter_category_regional_desc": "Listy, które koncentrują się na reklamach regionalnych i serwerach ze skryptami śledzącymi",
    "filter_category_other_desc": "Inne listy zablokowanych",
-    "setup_config_to_enable_dhcp_server": "Ustaw konfigurację serwera DHCP, aby go włączyć",
    "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.",
-    "experimental": "Funkcja eksperymentalna"
+    "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ć."
 }
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -11,8 +11,6 @@
    "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",
@@ -23,8 +21,6 @@
    "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",
@@ -33,7 +29,6 @@
    "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",
@@ -132,8 +127,7 @@
    "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}}",
+    "upstream_dns_hint": "Se você deixar este campo em branco, o AdGuard Home irá usar o <a href='https://www.quad9.net/' target='_blank'>Quad9</a> como upstream.",
    "test_upstream_btn": "Testar upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Aplicar",
@@ -187,7 +181,6 @@
    "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",
@@ -196,10 +189,6 @@
    "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",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Página",
    "rows_table_footer_text": "linhas",
    "updated_custom_filtering_toast": "Regras de filtragem personalizadas atualizadas",
-    "rule_removed_from_custom_filtering_toast": "Regra removida das regras de filtragem personalizadas: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regra adicionada às regras de filtragem personalizadas: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regra removida das regras de filtragem personalizadas",
+    "rule_added_to_custom_filtering_toast": "Regra adicionada às regras de filtragem personalizadas",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrado por {{filter}}",
    "query_log_confirm_clear": "Você tem certeza que deseja limpar o registro de consulta?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Modo de bloqueio",
    "default": "Padrão",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "IP nulo",
    "custom_ip": "IP personalizado",
    "blocking_ipv4": "Bloqueando IPv4",
@@ -256,8 +244,7 @@
    "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_refused": "REFUSED: responder com o código REFUSED",
+    "blocking_mode_default": "Por padrão: Responder com NXDOMAIN 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_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",
@@ -334,8 +321,6 @@
    "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.",
@@ -369,7 +354,7 @@
    "fix": "Corrigido",
    "dns_providers": "Aqui está uma <0>lista de provedores de DNS conhecidos</0> para escolher.",
    "update_now": "Atualizar agora",
-    "update_failed": "A atualização automática falhou. Por favor, <a>siga estes passos</a> para atualizar manualmente.",
+    "update_failed": "A atualização automática falhou. Por favor, <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>siga estes passos</a> para atualizar manualmente.",
    "processing_update": "Por favor, aguarde enquanto o AdGuard Home está sendo atualizado",
    "clients_title": "Clientes",
    "clients_desc": "Configure dispositivos conectados ao AdGuard",
@@ -495,7 +480,6 @@
    "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.",
@@ -544,7 +528,6 @@
    "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",
@@ -566,7 +549,8 @@
    "enter_cache_ttl_max_override": "Digite o TTL máximo",
    "cache_ttl_min_override_desc": "Substituição do valor TTL (mínimo) recebido do servidor servidor DNS primário. Esse valor não pode exceder 3600 (1 hora)",
    "cache_ttl_max_override_desc": "Substituição do valor TTL (máximo) recebido do servidor de DNS primário",
-    "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
+    "min_exceeds_max_value": "O valor mínimo excede o valor máximo",
+    "value_not_larger_than": "O valor não pode ser maior que {{maximum}}",
    "filter_category_general": "Geral",
    "filter_category_security": "Segurança",
    "filter_category_regional": "Regional",
@@ -575,10 +559,5 @@
    "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.",
-    "experimental": "Experimental"
+    "click_to_view_queries": "Clique para ver as consultas"
 }
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -108,6 +108,7 @@
    "encryption_settings": "Configurações de criptografia",
    "dhcp_settings": "Configurações de DHCP",
    "upstream_dns": "Servidores DNS upstream",
+    "upstream_dns_hint": "Se deixar este campo vazio, o AdGuard Home irá usar <a href='https://www.quad9.net/' target='_blank'>Quad9</a> como upstream.",
    "test_upstream_btn": "Testar upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Aplicar",
@@ -167,8 +168,8 @@
    "page_table_footer_text": "Página",
    "rows_table_footer_text": "linhas",
    "updated_custom_filtering_toast": "Regras de filtragem personalizadas actualizadas",
-    "rule_removed_from_custom_filtering_toast": "Regra removida das regras de filtragem personalizadas: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regra adicionada às regras de filtragem personalizadas: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regra removida das regras de filtragem personalizadas",
+    "rule_added_to_custom_filtering_toast": "Regra adicionada às regras de filtragem personalizadas",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrado por {{filter}}",
    "query_log_confirm_clear": "Tem a certeza de que deseja limpar todo o registo de consulta?",
@@ -191,6 +192,7 @@
    "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",
    "upstream_dns_client_desc": "Se mantiver esse campo vazio, o AdGuard Home usará os servidores configurados nas <0>Definições de DNS</0>.",
@@ -295,7 +297,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 atualização automática falhou. Por favor, <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>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",
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -11,8 +11,6 @@
    "save_config": "Salvare configurare",
    "enabled_dhcp": "Server DHCP activat",
    "disabled_dhcp": "Server DHCP dezactivat",
-    "unavailable_dhcp": "DHCP este indisponibil",
-    "unavailable_dhcp_desc": "AdGuard Home nu poate rula un server DHCP pe OS-ul dvs.",
    "dhcp_title": "Server DHCP (experimental!)",
    "dhcp_description": "Dacă routerul dvs. nu furnizează setări DHCP, puteți utiliza serverul DHCP încorporat AdGuard.",
    "dhcp_enable": "Activați serverul DHCP",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP statice închiriate",
    "dhcp_leases_not_found": "Nu s-au găsit DHCP închiriate",
    "dhcp_config_saved": "Configurare DHCP salvată cu succes",
-    "dhcp_ipv4_settings": "Setări DHCP IPv4",
-    "dhcp_ipv6_settings": "Setări DHCP IPv6",
    "form_error_required": "Câmp necesar",
    "form_error_ip4_format": "Format IPv4 invalid",
    "form_error_ip6_format": "Format IPv6 invalid",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Format ID de client invalid",
    "form_error_positive": "Trebuie să fie mai mare de 0",
    "form_error_negative": "Trebuie să fie egală cu 0 sau mai mare",
-    "range_end_error": "Trebuie să fie mai mare decât începutul intervalului",
    "dhcp_form_gateway_input": "IP Gateway",
    "dhcp_form_subnet_input": "Mască subnet",
    "dhcp_form_range_title": "Interval de adrese IP",
@@ -132,8 +127,7 @@
    "encryption_settings": "Setări de criptare",
    "dhcp_settings": "Setări DHCP",
    "upstream_dns": "Servere upstream DNS",
-    "upstream_dns_help": "Introduceți adresele serverelor una pe linie. <a>Aflați mai multe</a> despre configurarea serverelor DNS în amonte.",
-    "upstream_dns_configured_in_file": "Configurat în {{path}}",
+    "upstream_dns_hint": "Dacă mențineți acest câmp gol, AdGuard Home va folosi <a href='https://www.quad9.net/' target='_blank'>Quad9</a> ca upstream.",
    "test_upstream_btn": "Testați upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Aplică",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "DNS clasic (over UDP)",
    "example_upstream_dot": "<0>DNS-over-TLS</0> criptat",
    "example_upstream_doh": "<0>DNS-over-HTTPS</0> criptat",
-    "example_upstream_doq": "<0>DNS-over-QUIC</0> criptat",
    "example_upstream_sdns": "puteți utiliza <0>DNS Stamps</0> pentru rezolvere <1>DNSCrypt</1> sau <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "DNS clasic (over TCP)",
    "all_lists_up_to_date_toast": "Toate listele sunt deja la zi",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Serverul \"{{key}}\": nu a putut fi utilizat, verificați dacă l-ați scris corect",
    "unblock": "Deblocați",
    "block": "Blocați",
-    "disallow_this_client": "Nu permiteți acest client",
-    "allow_this_client": "Permiteți acest client",
-    "block_for_this_client_only": "Blocați numai pentru acest client",
-    "unblock_for_this_client_only": "Deblocați numai pentru acest client",
    "time_table_header": "Ora",
    "date": "Data",
    "domain_name_table_header": "Nume domeniu",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Pagina",
    "rows_table_footer_text": "linii",
    "updated_custom_filtering_toast": "Reguli personalizate de filtrare aduse la zi",
-    "rule_removed_from_custom_filtering_toast": "Regulă scoasă din regullei personalizate de filtrare: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regulă adăugată la regulile de filtrare personalizate: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regulă scoasă din regullei personalizate de filtrare",
+    "rule_added_to_custom_filtering_toast": "Regulă adăugată la regulile de filtrare personalizate",
    "query_log_response_status": "Statut: {{value}}",
    "query_log_filtered": "Filtrat de {{filter}}",
    "query_log_confirm_clear": "Sunteți sigur că doriți să ștergeți întregul jurnal de interogări?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Modul de blocare",
    "default": "Implicit",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUZAT",
    "null_ip": "IP nul",
    "custom_ip": "IP personalizat",
    "blocking_ipv4": "Blocarea IPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "Limita ratei",
    "edns_enable": "Activați clientul subnet EDNS",
    "edns_cs_desc": "Dacă este activat, AdGuard Home va trimite subnet-ul clienților către serverele DNS.",
-    "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)",
+    "rate_limit_desc": "Numărul de solicitări pe secundă pe care un singur client este permis să le facă (0: 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_refused": "REFUZAT: Răspunde cu codul REFUZAT",
+    "blocking_mode_default": "Implicit: Răspunde cu NXDOMAIN 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_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)",
    "blocking_mode_custom_ip": "IP personalizat: răspunde cu o adresă IP setată manual",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Dacă portul HTTPS este configurat, interfața administrator AdGuard Home va fi accesibilă prin HTTPS și va oferi de asemenea DNS-over-HTTPS în locația '/DNS-query'.",
    "encryption_dot": "Port DNS-over-TLS",
    "encryption_dot_desc": "Dacă acest port este configurat, AdGuard Home va rula un server DNS-over-TLS pe acest port.",
-    "encryption_doq": "Port DNS-over-QUIC",
-    "encryption_doq_desc": "Dacă acest port este configurat, AdGuard Home va rula un server DNS-over-QUIC pe acest port. Este experimental și este posibil să nu fie fiabil. De asemenea, nu există prea mulți clienți care să-l susțină în acest moment.",
    "encryption_certificates": "Certificate",
    "encryption_certificates_desc": "Pentru a utiliza criptarea, trebuie furnizate o serie de certificate SSL valabile pentru domeniul dvs.. Puteți obține un certificat gratuit pe <0>{{link}}</0> sau îl puteți cumpăra de la una din Autoritățile Certificate de încredere.",
    "encryption_certificates_input": "Copiați/lipiți certificatele dvs. PEM-codate aici.",
@@ -369,7 +354,7 @@
    "fix": "Fix",
    "dns_providers": "Iată o <0>listă de furnizori DNS cunoscuți</0> ce pot fi aleși.",
    "update_now": "Actualizați acum",
-    "update_failed": "Auto-actualizarea a eșuat. Vă rugăm să <a>urmați aceste etape</a> pentru a actualiza manual.",
+    "update_failed": "Auto-actualizarea a eșuat. Vă rugăm să <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>urmați aceste etape</a> pentru a actualiza manual.",
    "processing_update": "Vă rugăm să așteptați, AdGuard Home se actualizează...",
    "clients_title": "Clienți",
    "clients_desc": "Configură aparatele conectate la AdGuard Home",
@@ -559,14 +544,15 @@
    "milliseconds_abbreviation": "ms",
    "cache_size": "Mărime cache",
    "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",
+    "cache_ttl_min_override": "Suprascrieți TTL minim",
+    "cache_ttl_max_override": "Suprascrieți TTL maxim",
    "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",
-    "ttl_cache_validation": "Valoarea TTL cache minimă trebuie să fie mai mică sau egală cu valoarea maximă",
+    "enter_cache_ttl_min_override": "Introduceți TTL minim",
+    "enter_cache_ttl_max_override": "Introduceți TTL maxim",
+    "cache_ttl_min_override_desc": "Suprascrie valoarea TTL (minimă) primită de la serverul din amonte. valoare nu poate fi mai mare de 3600 (1 oră)",
+    "cache_ttl_max_override_desc": "Suprascrie valoarea TTL (maximă) primită de la serverul din amonte",
+    "min_exceeds_max_value": "Valoarea minimă depășește valoarea maximă",
+    "value_not_larger_than": "Valoarea nu poate fi mai mare decât {{maximum}}",
    "filter_category_general": "General",
    "filter_category_security": "Securitate",
    "filter_category_regional": "Regional",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Liste specializate în blocarea domeniilor malware, phishing sau înșelătorie",
    "filter_category_regional_desc": "Liste focalizate pe reclame regionale și servere de urmărire",
    "filter_category_other_desc": "Alte liste de blocări",
-    "setup_config_to_enable_dhcp_server": "Setați configurația pentru a activa serverul DHCP",
    "original_response": "Răspuns original",
    "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.",
-    "experimental": "Experimental"
+    "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."
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -11,8 +11,6 @@
    "save_config": "Сохранить конфигурацию",
    "enabled_dhcp": "DHCP-сервер включен",
    "disabled_dhcp": "DHCP-сервер отключен",
-    "unavailable_dhcp": "DHCP недоступен",
-    "unavailable_dhcp_desc": "AdGuard Home не может запустить DHCP-сервер на вашей ОС",
    "dhcp_title": "DHCP-сервер (экспериментальный!)",
    "dhcp_description": "Если ваш роутер не предоставляет настройки DHCP, вы можете использовать собственный встроенный DHCP-сервер AdGuard.",
    "dhcp_enable": "Включить DHCP-сервер",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "Статические аренды DHCP",
    "dhcp_leases_not_found": "Аренда DHCP не обнаружена",
    "dhcp_config_saved": "Конфигурация DHCP-сервера успешно сохранена",
-    "dhcp_ipv4_settings": "Настройки DHCP IPv4",
-    "dhcp_ipv6_settings": "Настройки DHCP IPv6",
    "form_error_required": "Обязательное поле",
    "form_error_ip4_format": "Неверный формат IPv4",
    "form_error_ip6_format": "Неверный формат IPv6",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Неверный формат ID клиента",
    "form_error_positive": "Должно быть больше 0",
    "form_error_negative": "Должно быть не меньше 0",
-    "range_end_error": "Должно превышать начало диапазона",
    "dhcp_form_gateway_input": "IP-адрес шлюза",
    "dhcp_form_subnet_input": "Маска подсети",
    "dhcp_form_range_title": "Диапазон IP-адресов",
@@ -132,8 +127,7 @@
    "encryption_settings": "Настройки шифрования",
    "dhcp_settings": "Настройки DHCP",
    "upstream_dns": "Upstream DNS-серверы",
-    "upstream_dns_help": "Введите адреса серверов по одному на строке. <a>Узнать больше</a> о настройке upstream DNS-серверов.",
-    "upstream_dns_configured_in_file": "Настроен в {{path}}",
+    "upstream_dns_hint": "Если вы оставите это поле пустым, то AdGuard Home использует <a href='https://www.quad9.net/' target='_blank'>Quad9</a> в качестве DNS сервера.",
    "test_upstream_btn": "Тест upstream серверов",
    "upstreams": "Upstreams",
    "apply_btn": "Применить",
@@ -187,7 +181,6 @@
    "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_sdns": "вы можете использовать <0>DNS Stamps</0> для <1>DNSCrypt</1> или <2>DNS-over-HTTPS</2> резолверов",
    "example_upstream_tcp": "обычный DNS (поверх TCP)",
    "all_lists_up_to_date_toast": "Все списки уже обновлены",
@@ -196,10 +189,6 @@
    "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": "Домен",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Страница",
    "rows_table_footer_text": "строк",
    "updated_custom_filtering_toast": "Внесены изменения в пользовательские правила",
-    "rule_removed_from_custom_filtering_toast": "Пользовательское правило удалено: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Пользовательское правило добавлено: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Правило удалено из авторского списка правил фильтрации",
+    "rule_added_to_custom_filtering_toast": "Пользовательское правило добавлено",
    "query_log_response_status": "Статус: {{value}}",
    "query_log_filtered": "Отфильтровано с помощью {{filter}}",
    "query_log_confirm_clear": "Вы уверены, что хотите очистить весь журнал запросов?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Режим блокировки",
    "default": "Стандартный",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Нулевой IP",
    "custom_ip": "Свой IP",
    "blocking_ipv4": "Блокировка IPv4",
@@ -256,8 +244,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_refused": "REFUSED: Отвечает с кодом REFUSED",
+    "blocking_mode_default": "Стандартный: Отвечает с NXDOMAIN, когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле /etc/hosts\n",
    "blocking_mode_nxdomain": "NXDOMAIN: Отвечает с кодом NXDOMAIN\n",
    "blocking_mode_null_ip": "Нулевой IP: Отвечает с нулевым IP-адресом (0.0.0.0 для A; :: для AAAA)",
    "blocking_mode_custom_ip": "Пользовательский IP: Отвечает с вручную настроенным IP-адресом",
@@ -334,8 +321,6 @@
    "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-кодировке.",
@@ -369,7 +354,7 @@
    "fix": "Исправить",
    "dns_providers": "<0>Список известных DNS-провайдеров</0> на выбор.",
    "update_now": "Обновить сейчас",
-    "update_failed": "Ошибка авто-обновления. Пожалуйста, <a>следуйте инструкции</a> для обновления вручную.",
+    "update_failed": "Ошибка авто-обновления. Пожалуйста, <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>следуйте инструкции</a> для обновления вручную.",
    "processing_update": "Пожалуйста, подождите, AdGuard Home обновляется",
    "clients_title": "Клиенты",
    "clients_desc": "Настройте устройства, использующие AdGuard Home",
@@ -559,14 +544,15 @@
    "milliseconds_abbreviation": "мс",
    "cache_size": "Размер кеша",
    "cache_size_desc": "Размера кеша DNS (в байтах)",
-    "cache_ttl_min_override": "Переопределить минимальный TTL (в секундах)",
-    "cache_ttl_max_override": "Переопределить максимальный TTL (в секундах)",
+    "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_min_override_desc": "Переопределить TTL-значение (минимальное), полученное с upstream-сервера. Это значение не может быть больше 3600 (1 часа)",
    "cache_ttl_max_override_desc": "Переопределить TTL-значение (максимальное), полученное с upstream-сервера",
-    "ttl_cache_validation": "Минимальное значение TTL кеша должно быть меньше или равно максимальному значению",
+    "min_exceeds_max_value": "Минимальное значение превышает максимальное значение",
+    "value_not_larger_than": "Значение не может быть больше {{maximum}}",
    "filter_category_general": "Общие",
    "filter_category_security": "Безопасность",
    "filter_category_regional": "Региональные",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Списки, которые специализируются на блокировке вредоносных программ, фишинговых или мошеннических доменов",
    "filter_category_regional_desc": "Списки, которые фокусируются на региональной рекламе и серверах отслеживания",
    "filter_category_other_desc": "Другие списки блокировки",
-    "setup_config_to_enable_dhcp_server": "Настроить конфигурацию для включения DHCP-сервера",
    "original_response": "Первоначальный ответ",
    "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
-    "port_53_faq_link": "Порт 53 часто занят службами \"DNSStubListener\" или \"systemd-resolved\". Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить.",
-    "adg_will_drop_dns_queries": "AdGuard Home AdGuard Home сбросит все DNS-запросы от этого клиента.",
-    "experimental": "Экспериментальный"
+    "port_53_faq_link": "Порт 53 часто занят службами \"DNSStubListener\" или \"systemd-resolved\". Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить."
 }
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -1,443 +0,0 @@
-{
-    "client_settings": "අනුග්‍රාහක සැකසුම්",
-    "check_dhcp_servers": "DHCP සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
-    "save_config": "වින්‍යාසය සුරකින්න",
-    "enabled_dhcp": "DHCP සේවාදායකය සබල කර ඇත",
-    "disabled_dhcp": "DHCP සේවාදායකය අබල කර ඇත",
-    "dhcp_title": "ග.ධා.වි.කෙ. සේවාදායකය (පර්යේෂණාත්මක!)",
-    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට AdGuardHome හි ඇති ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
-    "dhcp_enable": "DHCP සේවාදායකය සබල කරන්න",
-    "dhcp_disable": "DHCP සේවාදායකය අබල කරන්න",
-    "dhcp_config_saved": "DHCP වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "form_error_required": "අවශ්‍ය ක්ෂේත්‍රයකි",
-    "form_error_ip4_format": "වලංගු නොවන IPv4 ආකෘතියකි",
-    "form_error_ip6_format": "වලංගු නොවන IPv6 ආකෘතියකි",
-    "form_error_ip_format": "වලංගු නොවන අ.ජා. කෙ. (IP) ආකෘතියකි",
-    "form_error_mac_format": "වලංගු නොවන MAC ආකෘතියකි",
-    "form_error_client_id_format": "වලංගු නොවන අනුග්‍රාහක හැඳුනුම් ආකෘතියකි",
-    "form_error_positive": "0 ට වඩා වැඩි විය යුතුය",
-    "form_error_negative": "0 හෝ ඊට වැඩි විය යුතුය",
-    "dhcp_form_range_title": "අ.ජා. කෙ. (IP) ලිපින පරාසය",
-    "dhcp_form_range_start": "පරාසය ආරම්භය",
-    "dhcp_form_range_end": "පරාසය අවසානය",
-    "dhcp_interface_select": "ග.ධා.වි.කෙ. (DHCP) අතුරුමුහුණත තෝරන්න",
-    "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) වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "country": "රට",
-    "city": "නගරය",
-    "delete_confirm": "\"{{key}}\" මකා දැමීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "form_enter_hostname": "ධාරක නාමය ඇතුළත් කරන්න",
-    "error_details": "දෝෂ විස්තර",
-    "response_details": "ප්‍රතිචාරය‌ෙහි විස්තර",
-    "request_details": "ඉල්ලීමෙහි විස්තර",
-    "client_details": "අනුග්‍රාහකයේ විස්තර",
-    "details": "විස්තර",
-    "back": "ආපසු",
-    "dashboard": "උපකරණ පුවරුව",
-    "settings": "සැකසුම්",
-    "filters": "පෙරහන්",
-    "filter": "පෙරහන",
-    "query_log": "විමසුම් ලොගය",
-    "nothing_found": "කිසිවක් සොයාගත නොහැක",
-    "faq": "නිති අසන පැණ",
-    "version": "අනුවාදය",
-    "address": "ලිපිනය",
-    "protocol": "කෙටුම්පත",
-    "on": "සක්‍රියයි",
-    "off": "අක්‍රියයි",
-    "copyright": "ප්‍රකාශන හිමිකම",
-    "homepage": "මුල්  පිටුව",
-    "report_an_issue": "ගැටලුවක් වාර්තා කරන්න",
-    "privacy_policy": "රහස්‍යතා ප්‍රතිපත්තිය",
-    "enable_protection": "ආරක්ෂණය සබල කරන්න",
-    "enabled_protection": "ආරක්ෂණය සබල කර ඇත",
-    "disable_protection": "ආරක්ෂණය අබල කරන්න",
-    "disabled_protection": "ආරක්ෂණය අබල කර ඇත",
-    "refresh_statics": "සංඛ්‍යාලේඛන නැවුම් කරන්න",
-    "dns_query": "ව.නා.ප. (DNS) විමසුම්",
-    "blocked_by": "<0>පෙරහන් මගින් අවහිර කරන ලද</0>",
-    "stats_malware_phishing": "අවහිර කළ ද්වේශාංග/තතුබෑම්",
-    "stats_adult": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි",
-    "stats_query_domain": "ජනප්‍රිය විමසන ලද වසම්",
-    "for_last_24_hours": "පසුගිය පැය 24 සඳහා",
-    "for_last_days": "පසුගිය දින {{count}} සඳහා",
-    "for_last_days_plural": "පසුගිය දින {{count}} සඳහා",
-    "no_domains_found": "වසම් කිසිවක් සොයා ගත නොහැකි විය",
-    "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 ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි ගණන",
-    "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන ලද",
-    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා DNS ඉල්ලීම් ගණන",
-    "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
-    "average_processing_time_hint": "DNS ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
-    "block_domain_use_filters_and_hosts": "පෙරහන් සහ ධාරක ගොනු භාවිතා කරමින් වසම් අවහිර කරන්න",
-    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a href='#filters'>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
-    "use_adguard_browsing_sec": "AdGuard browsing security web service භාවිතා කරන්න",
-    "use_adguard_parental": "AdGuard parental control වෙබ් සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි AdGuard Home විසින් පරීක්ෂා කරනු ඇත. එය browsing security වෙබ් සේවාව මෙන් රහස්‍යතා හිතකාමී API භාවිතා කරයි.",
-    "enforce_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන්න",
-    "enforce_save_search_hint": "AdGuard Home හට පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කළ හැකිය: Google, Youtube, Bing, DuckDuckGo සහ Yandex.",
-    "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
-    "general_settings": "පොදු සැකසුම්",
-    "dns_settings": "DNS සැකසුම්",
-    "dns_blocklists": "DNS අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "dns_allowlists": "DNS අවසර දීමේ ලැයිස්තු",
-    "dns_allowlists_desc": "DNS අවසර දීමේ ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව අඩංගු වුවද එය න‌ොසලකා හැර අවසර දෙනු ලැබේ.",
-    "custom_filtering_rules": "අභිරුචි පෙරීමේ නීති",
-    "encryption_settings": "සංකේතාංකන සැකසුම්",
-    "dhcp_settings": "DHCP සැකසුම්",
-    "disabled_filtering_toast": "පෙරීම අබල කර ඇත",
-    "enabled_filtering_toast": "පෙරීම සබල කර ඇත",
-    "disabled_parental_toast": "Parental control අබල කර ඇත",
-    "enabled_parental_toast": "Parental control සබල කර ඇත",
-    "disabled_safe_search_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
-    "enabled_save_search_toast": "ආරක්ෂිත සෙවීම සබල කර ඇත",
-    "enabled_table_header": "සබල කර ඇත",
-    "name_table_header": "නම",
-    "list_url_table_header": "URL ලැයිස්තුව",
-    "rules_count_table_header": "නීති ගණන",
-    "last_time_updated_table_header": "අවසන් වරට යාවත්කාලීන කරන ලද",
-    "actions_table_header": "ක්‍රියාමාර්ග",
-    "request_table_header": "ඉල්ලීම",
-    "edit_table_action": "සංස්කරණය කරන්න",
-    "delete_table_action": "මකන්න",
-    "no_blocklist_added": "අවහිර කිරීමේ ලැයිස්තු එකතු කර නැත",
-    "no_whitelist_added": "අවසර දීමේ ලැයිස්තු එකතු කර නැත",
-    "add_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක් එකතු කරන්න",
-    "add_allowlist": "අවසර දීමේ ලැයිස්තුවක් එකතු කරන්න",
-    "cancel_btn": "අහෝසි කරන්න",
-    "enter_name_hint": "නම ඇතුළත් කරන්න",
-    "enter_url_or_path_hint": "ලැයිස්තුවක URL හෝ ස්ථීර මාර්ගයක් ඇතුළත් කරන්න",
-    "check_updates_btn": "යාවත්කාල පරීක්ෂා කරන්න",
-    "new_blocklist": "නව අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
-    "new_allowlist": "නව අවසර දීමේ ලැයිස්තුව",
-    "edit_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව සංස්කරණය කරන්න",
-    "edit_allowlist": "අවසර දීමේ ලැයිස්තුව සංස්කරණය කරන්න",
-    "enter_valid_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
-    "enter_valid_allowlist": "අවසර දීමේ ලැයිස්තුවට වලංගු URL ලිපිනයක් ඇතුළත් කරන්න.",
-    "form_error_url_format": "වලංගු නොවන URL ආකෘතියකි",
-    "form_error_url_or_path_format": "ලැයිස්තුවක වලංගු නොවන URL හෝ ස්ථීර මාර්ගයකි",
-    "custom_filter_rules": "අභිරුචි පෙරීමේ නීති",
-    "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_comment": "! මෙතැන අදහස් දැක්වීමක්",
-    "example_comment_meaning": "විස්තර කිිරීමක්",
-    "example_comment_hash": "# එසේම අදහස් දැක්වීමක්",
-    "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_tcp": "සාමාන්‍ය DNS (TCP හරහා)",
-    "all_lists_up_to_date_toast": "සියලුම ලැයිස්තු දැනටමත් යාවත්කාලීනයි",
-    "dns_test_ok_toast": "සඳහන් කළ DNS සේවාදායකයන් නිවැරදිව ක්‍රියා කරයි",
-    "dns_test_not_ok_toast": "සේවාදායකය \"{{key}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
-    "unblock": "අනවහිර කරන්න",
-    "block": "අවහිර කරන්න",
-    "time_table_header": "වේලාව",
-    "date": "දිනය",
-    "domain_name_table_header": "වසම් නාමය",
-    "domain_or_client": "වසම හෝ අනුග්‍රාහකය",
-    "type_table_header": "වර්ගය",
-    "response_table_header": "ප්‍රතිචාරය",
-    "response_code": "ප්‍රතිචාර කේතය",
-    "client_table_header": "අනුග්‍රාහකය",
-    "empty_response_status": "හිස්",
-    "show_all_filter_type": "සියල්ල පෙන්වන්න",
-    "refresh_btn": "නැවුම් කරන්න",
-    "previous_btn": "පෙර",
-    "next_btn": "ඊළඟ",
-    "loading_table_status": "පූරණය ‌වෙමින්...",
-    "page_table_footer_text": "පිටුව",
-    "rows_table_footer_text": "පේළි",
-    "updated_custom_filtering_toast": "අභිරුචි පෙරීමේ නීති යාවත්කාල කරන ලදි",
-    "rule_removed_from_custom_filtering_toast": "අභිරුචි පෙරීමේ නීති තුළින් නීතියක් ඉවත් කරන ලදි {{rule}}",
-    "rule_added_to_custom_filtering_toast": "අභිරුචි පෙරීමේ නීති තුළට මෙම නීතිය එකතු කරන ලදි {{rule}}",
-    "query_log_response_status": "තත්ත්වය: {{value}}",
-    "query_log_filtered": "{{filter}} මගින් පෙරහන් කරන ලදි",
-    "query_log_confirm_clear": "සම්පූර්ණ විමසුම් ලොගය ඉවත් කිරීමට අවශ්‍ය යැයි ඔබට විශ්වාසද?",
-    "query_log_clear": "විමසුම් ලොග ඉවත් කරන්න",
-    "query_log_retention": "විමසුම් ලොග රඳවා තබා ගැනීම",
-    "query_log_enable": "ලොගය සබල කරන්න",
-    "query_log_configuration": "ලොග වින්‍යාසය",
-    "query_log_disabled": "විමසුම් ලොගය අබල කර ඇති අතර එය <0>සැකසුම්</0> තුළ වින්‍යාසගත කළ හැකිය",
-    "query_log_strict_search": "ඉතා නිවැරදිව සෙවීම සඳහා ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
-    "query_log_retention_confirm": "විමසුම් ලොගය රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
-    "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා. කෙ. (IP) නිර්නාමික කරන්න",
-    "dns_config": "DNS සේවාදායක වින්‍යාසය",
-    "default": "සුපුරුදු",
-    "nxdomain": "නොපවතින වසම",
-    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ. (IP)",
-    "custom_ip": "අභිරුචි අ.ජා. කෙ. (IP)",
-    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_tls": "DNS-over-TLS",
-    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුළත් කරන්න",
-    "rate_limit": "අනුපාත සීමාව",
-    "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
-    "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
-    "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
-    "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> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
-    "source_label": "මූලාශ්‍රය",
-    "category_label": "ප්‍රවර්ගය",
-    "rule_label": "නීතිය",
-    "list_label": "ලැයිස්තුව",
-    "unknown_filter": "{{filterId}} නොදන්නා පෙරහනකි",
-    "known_tracker": "දන්නා ලුහුබැඳීමක්",
-    "install_welcome_title": "AdGuard Home වෙත සාදරයෙන් පිළිගනිමු!",
-    "install_welcome_desc": "AdGuard Home යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන DNS සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
-    "install_settings_title": "පරිපාලක වෙබ් අතුරු මුහුණත",
-    "install_settings_listen": "සවන් දෙන අතුරු මුහුණත",
-    "install_settings_port": "කවුළුව",
-    "form_error_port": "වලංගු කවුළුවක අගයක් ඇතුළත් කරන්න",
-    "install_settings_dns": "DNS සේවාදායකය",
-    "install_settings_all_interfaces": "සියලුම අතුරුමුහුණත්",
-    "install_auth_title": "සත්‍යාපනය",
-    "install_auth_desc": "ඔබගේ AdGuard Home පරිපාලක වෙබ් අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌ය‌ෙ‌න් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
-    "install_auth_username": "පරිශීලක නාමය",
-    "install_auth_password": "මුරපදය",
-    "install_auth_confirm": "මුරපදය තහවුරු කරන්න",
-    "install_auth_username_enter": "පරිශීලක නාමය ඇතුළත් කරන්න",
-    "install_auth_password_enter": "මුරපදය ඇතුළත් කරන්න",
-    "install_step": "පියවර",
-    "install_devices_title": "ඔබගේ උපාංග වින්‍යාසගත කරන්න",
-    "install_devices_desc": "AdGuard Home භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කිරීම අවශ්‍ය වේ.",
-    "install_submit_title": "සුභ පැතුම්!",
-    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ AdGuard Home භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
-    "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_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_macos_list_1": "ඇපල් අයිකනය මත ක්ලික් කර පද්ධති මනාපයන් වෙත යන්න.",
-    "install_devices_macos_list_2": "ජාලය මත ක්ලික් කරන්න.",
-    "install_devices_macos_list_3": "ඔබගේ ලැයිස්තුවේ පළමු සම්බන්ධතාවය තෝරා උසස් මත ක්ලික් කරන්න.",
-    "install_devices_macos_list_4": "DNS තීරුව තෝරා ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
-    "install_devices_android_list_1": "ඇන්ඩ්‍රොයිඩ් මෙනුවෙහි මුල් තිරයෙන්, සැකසීම් මත තට්ටු කරන්න.",
-    "install_devices_android_list_2": "මෙනුවේ Wi-Fi මත තට්ටු කරන්න. පවතින සියලුම ජාල ලැයිස්තුගත කර ඇති තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි DNS සැකසිය නොහැක).",
-    "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_ios_list_1": "මුල් තිරයේ සිට, සැකසුම් මත තට්ටු කරන්න.",
-    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි Wi-Fi තෝරන්න (ජංගම දුරකථන සඳහා DNS වින්‍යාසගත කිරීමට නොහැකිය).",
-    "install_devices_ios_list_3": "දැනට ක්‍රියාකාරී ජාලයයහෙි නම මත තට්ටු කරන්න.",
-    "install_devices_ios_list_4": "DNS ක්ෂේත්‍රය තුළ ඔබගේ AdGuard Home සේවාදායක ලිපින ඇතුළත් කරන්න.",
-    "get_started": "ආරම්භ කර ගන්න",
-    "next": "ඊළඟ",
-    "open_dashboard": "උපකරණ පුවරුව විවෘත කරන්න",
-    "install_saved": "සාර්ථකව සුරකින ලදි",
-    "encryption_title": "සංකේතාංකනය",
-    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා DNS සහ පරිපාලක වෙබ් අතුරු මුහුණත සහය දක්වයි",
-    "encryption_config_saved": "සංකේතාංකන වින්‍යාසය සුරකින ලදි",
-    "encryption_server": "සේවාදායක‌‌‌‌යේ නම",
-    "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුළත් කරන්න",
-    "encryption_redirect": "ස්වයංක්‍රීයව HTTPS වෙත හරවා යවන්න",
-    "encryption_redirect_desc": "සබල කර ඇත්නම්, AdGuard Home ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
-    "encryption_https": "HTTPS කවුළුව",
-    "encryption_https_desc": "HTTPS කවුළුව වින්‍යාසගත කර ඇත්නම්, AdGuard Home පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/ dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
-    "encryption_dot": "DNS-over-TLS කවුළුව",
-    "encryption_dot_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත.",
-    "encryption_certificates": "සහතික",
-    "encryption_certificates_input": "ඔබගේ PEM-කේතාංකනය කළ සහතික පිටපත් කර මෙහි අලවන්න.",
-    "encryption_status": "තත්ත්වය",
-    "encryption_expire": "කල් ඉකුත් වීම",
-    "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_key_valid": "මෙය වලංගු {{type}} පුද්ගලික යතුරකි",
-    "encryption_key_invalid": "මෙය වලංගු නොවන {{type}} පුද්ගලික යතුරකි",
-    "encryption_subject": "මාතෘකාව",
-    "encryption_issuer": "නිකුත් කරන්නා",
-    "encryption_hostnames": "ධාරක නාම",
-    "encryption_reset": "සංකේතාංකන සැකසුම් යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "topline_expiring_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත්වීමට ආසන්න වී ඇත. <0>සංකේතාංකන සැකසුම්</0> යාවත්කාල කරන්න.",
-    "topline_expired_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත් වී ඇත. <0>සංකේතාංකන සැකසුම්</0> යාවත්කාල කරන්න.",
-    "form_error_port_range": "80-65535 පරාසය‌ෙ‌හි කවුළුවක අගයක් ඇතුළත් කරන්න",
-    "form_error_port_unsafe": "මෙය අනාරක්ෂිත කවුළුවකි",
-    "form_error_equal": "සමාන නොවිය යුතුය",
-    "form_error_password": "මුරපදය නොගැලපුුුුුුණි",
-    "reset_settings": "සැකසුම් යළි පිහිටුවන්න",
-    "update_announcement": "AdGuard Home {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
-    "setup_guide": "පිහිටුවීමේ මාර්ගෝපදේශය",
-    "dns_addresses": "DNS ලිපින",
-    "dns_start": "DNS සේවාදායකය ආරම්භ වෙමින් පවතී",
-    "down": "පහත",
-    "fix": "නිරාකරණය කරන්න",
-    "dns_providers": "මෙහි තෝරා ගැනීමට <0>දන්නා DNS සපයන්නන්ගේ ලැයිස්තුවක්</0> ඇත.",
-    "update_now": "දැන් \tයාවත්කාල කරන්න",
-    "update_failed": "ස්වයංක්‍රීය යාවත්කාල කිරීම අසාර්ථක විය. අතින් යාවත්කාල කිරීමට කරුණාකර <a>පියවර අනුගමනය කරන්න</a>.",
-    "processing_update": "කරුණාකර රැඳී සිටින්න, AdGuard Home යාවත්කාලීන වෙමින් පවතී",
-    "clients_title": "අනුග්‍රාහකයන්",
-    "clients_desc": "AdGuard Home වෙත සම්බන්ධ කර ඇති උපාංග වින්‍යාසගත කරන්න",
-    "settings_global": "ගෝලීය",
-    "settings_custom": "අභිරුචි",
-    "table_client": "අනුග්‍රාහකය",
-    "table_name": "නම",
-    "save_btn": "සුරකින්න",
-    "client_add": "අනුග්‍රාහකයක් එකතු කරන්න",
-    "client_new": "නව අනුග්‍රාහකය",
-    "client_edit": "අනුග්‍රාහකය සංස්කරණය කරන්න",
-    "client_identifier": "හඳුන්වනය",
-    "ip_address": "අ.ජා. කෙ. (IP) ලිපිනය",
-    "client_identifier_desc": "අනුග්‍රාහකයන් අ.ජා. කෙ. (IP) ලිපිනයක් හෝ මා.ප්‍ර.පා. (MAC) ලිපිනයක් මගින් හඳුනාගත හැකිය. මා.ප්‍ර.පා. හඳුන්වනයක් ලෙස  භාවිතා කළ හැක්කේ AdGuard Home ද <0>DHCP සේවාදායකයක්</0> නම් පමණක් බව කරුණාවෙන් සලකන්න. ",
-    "form_enter_ip": "අ.ජා. කෙ. (IP) ඇතුළත් කරන්න",
-    "form_enter_mac": "MAC ඇතුළත් කරන්න",
-    "form_enter_id": "හඳුන්වනය ඇතුළත් කරන්න",
-    "form_add_id": "හඳුන්වනයක් එක් කරන්න",
-    "form_client_name": "අනුග්‍රාහකයේ නම ඇතුළත් කරන්න",
-    "name": "නම",
-    "client_global_settings": "ගෝලීය සැකසුම් භාවිතා කරන්න",
-    "client_deleted": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව ඉවත් කරන ලදි",
-    "client_added": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව එකතු කරන ලදි",
-    "client_updated": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව යාවත්කාල කරන ලදි",
-    "client_confirm_delete": "\"{{key}}\" අනුග්‍රාහකය ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "list_confirm_delete": "මෙම ලැයිස්තුව ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "auto_clients_desc": "AdGuard Home භාවිතා කරන අනුග්‍රාහකයන්‌ග‌ේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
-    "access_title": "ප්‍රවේශවීමට සැකසුම්",
-    "access_desc": "මෙහිදී ඔබට AdGuard Home DNS සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
-    "access_allowed_title": "අවසර ලත් අනුග්‍රාහකයන්",
-    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. (IP) ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
-    "access_disallowed_title": "අවසර නොලත් අනුග්‍රාහකයන්",
-    "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. (IP) ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, AdGuard Home විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
-    "access_blocked_title": "අවහිර කළ වසම්",
-    "access_settings_saved": "ප්‍රවේශ වීමේ සැකසුම් සාර්ථකව සුරකින ලදි",
-    "updates_checked": "යාවත්කාලීන කිරීම් සාර්ථකව පරික්ෂා කර ඇත",
-    "updates_version_equal": "AdGuard Home යාවත්කාලීනයි",
-    "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> කිරීමට අවශ්‍ය වේ.",
-    "rewrite_add": "DNS නැවත ලිවීමක් එකතු කරන්න",
-    "rewrite_confirm_delete": "\"{{key}}\" සඳහා DNS නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "dns_rewrites": "DNS නැවත ලිවීම්",
-    "form_domain": "වසම ඇතුළත් කරන්න",
-    "form_answer": "අ.ජා. කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුළත් කරන්න ",
-    "form_error_domain_format": "වලංගු නොවන වසම් ආකෘතියකි",
-    "form_error_answer_format": "වලංගු නොවන පිළිතුරු ආකෘතියකි",
-    "configure": "වින්‍යාසගත කරන්න",
-    "main_settings": "ප්‍රධාන සැකසුම්",
-    "block_services": "විශේෂිත සේවාවන් අවහිර කරන්න",
-    "blocked_services": "අවහිර කළ සේවාවන්",
-    "blocked_services_desc": "ජනප්‍රිය අඩවි සහ සේවාවන් ඉක්මනින් අවහිර කිරීමට ඉඩ දෙයි.",
-    "blocked_services_saved": "අවහිර කළ සේවාවන් සාර්ථකව සුරකින ලදි",
-    "blocked_services_global": "ගෝලීය අවහිර කළ සේවාවන් භාවිතා කරන්න",
-    "blocked_service": "අවහිර කළ සේවාව",
-    "block_all": "සියල්ල අවහිර කරන්න",
-    "unblock_all": "සියල්ල අනවහිර කරන්න",
-    "encryption_certificate_path": "සහතිකයේ මාර්ගය",
-    "encryption_private_key_path": "පුද්ගලික යතුරෙහි මාර්ගය",
-    "encryption_certificates_source_path": "සහතික ගොනු‌ව‌ෙහි මාර්ගය සකසන්න",
-    "encryption_certificates_source_content": "සහතිකවල අන්තර්ගත අලවන්න",
-    "encryption_key_source_path": "පුද්ගලික යතුරක ගොනුවක් සකසන්න",
-    "encryption_key_source_content": "පුද්ගලික යතු‌රෙහි අන්තර්ගත අලවන්න",
-    "stats_params": "සංඛ්‍යාලේඛන වින්‍යාසය",
-    "config_successfully_saved": "වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "interval_24_hour": "පැය 24",
-    "interval_days": "{{count}} දිනය",
-    "interval_days_plural": "දින {{count}}",
-    "domain": "වසම",
-    "answer": "පිළිතුර",
-    "filter_added_successfully": "පෙරහන සාර්ථකව එකතු කරන ලදි",
-    "filter_updated": "ලැයිස්තුව සාර්ථකව යාවත්කාලීන කර ඇත",
-    "statistics_configuration": "සංඛ්‍යාලේඛන වින්‍යාසය",
-    "statistics_retention": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම",
-    "statistics_retention_desc": "ඔබ කාල පරතරය අඩු කළහොත් සමහර දත්ත නැති වනු ඇත",
-    "statistics_clear": " සංඛ්‍යාලේඛන ඉවත් කරන්න",
-    "statistics_clear_confirm": "සංඛ්‍යාලේඛන ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "statistics_retention_confirm": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
-    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව ඉවත් කරන ලදි",
-    "interval_hours": "පැය {{count}}",
-    "interval_hours_plural": "පැය {{count}}",
-    "filters_configuration": "පෙරහන් වින්‍යාසය",
-    "filters_enable": "පෙරහන් සබල කරන්න",
-    "filters_interval": "පෙරහන් යාවත්කාල කාල පරතරය",
-    "disabled": "අබල කර ඇත",
-    "username_label": "පරිශීලක නාමය",
-    "username_placeholder": "පරිශීලක නාමය ඇතුළත් කරන්න",
-    "password_label": "මුරපදය",
-    "password_placeholder": "මුරපදය ඇතුළත් කරන්න",
-    "sign_in": "පුරන්න",
-    "sign_out": "වරන්න",
-    "forgot_password": "මුරපදය අමතක වුණා ද?",
-    "forgot_password_desc": "ඔබගේ පරිශීලක ගිණුම සඳහා නව මුරපදයක් සෑදීමට කරුණාකර <0>මෙම පියවර</0> අනුගමනය කරන්න.",
-    "location": "ස්ථානය",
-    "orgname": "සංවිධානයේ නම",
-    "netname": "ජාල‌යේ  නම",
-    "network": "ජාලය",
-    "descr": "විස්තරය",
-    "whois": "Whois",
-    "blocked_by_response": "ප්‍රතිචාරය අන්වර්ථ නාමයක් (CNAME) හෝ අ.ජා. කෙ. (IP) මගින් අවහිර කර ඇත",
-    "try_again": "නැවත උත්සහා කරන්න",
-    "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
-    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියන්න.",
-    "disable_ipv6": "IPv6 අබල කරන්න",
-    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම DNS විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
-    "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" මත ක්ලික් කළහොත්, AdGuard Home ඔබගේ පද්ධතිය AdGuard Home DNS සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
-    "tags_title": "හැඳුනුම් සංකේත",
-    "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>වැඩිදුර ඉගෙන ගන්න</0>",
-    "form_select_tags": "අනුග්‍රාහක හැඳුනුම් සංකේත",
-    "check_title": "පෙරීම පරීක්ෂා කරන්න",
-    "check": "පරීක්ෂා කරන්න",
-    "form_enter_host": "ධාරක නාමයක් ඇතුළත් කරන්න",
-    "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
-    "check_ip": "අ.ජා. කෙ. (IP) ලිපින: {{ip}}",
-    "check_cname": "CNAME: {{cname}}",
-    "check_reason": "හේතුව: {{reason}}",
-    "check_rule": "නීතිය: {{rule}}",
-    "check_service": "සේවාවෙහි නම: {{service}}",
-    "check_not_found": "ඔබගේ පෙරහන් ලැයිස්තු තුළ සොයා ගත නොහැක",
-    "client_confirm_block": "{{ip}} අනුග්‍රාහකය අවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "client_confirm_unblock": "{{ip}} අනුග්‍රාහකය අනවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කරන ලදි",
-    "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කරන ලදි",
-    "static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය",
-    "static_ip_desc": "AdGuard Home යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
-    "set_static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනයක් සකසන්න",
-    "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
-    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා AdGuard Home හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
-    "install_static_configure": "ගතික අ.ජා. කෙ. (IP) ලිපිනයක් භාවිතා කරන බව අපි අනාවරණය කර ‌ග‌ෙන ඇත්තෙමු - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
-    "confirm_static_ip": "AdGuard Home ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
-    "list_updated": "{{count}} ලැයිස්තුව යාවත්කාලීන කරන ලදි",
-    "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාලීන කරන ලදි",
-    "dnssec_enable": "DNSSEC සබල කරන්න",
-    "validated_with_dnssec": "DNSSEC සමඟ තහවුරු කර ඇත",
-    "show_blocked_responses": "අවහිර කර ඇත",
-    "blocked_safebrowsing": "ආරක්ෂිත සෙවීම මගින් අවහිර කරන ලද",
-    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වෙබ් අඩවි",
-    "blocked_threats": "අවහිර කළ තර්ජන",
-    "allowed": "අවසර ලත්",
-    "filtered": "පෙරහන් කරන ලද",
-    "rewritten": "නැවත ලියන ලද",
-    "safe_search": "ආරක්ෂිත සෙවීම",
-    "blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
-    "milliseconds_abbreviation": "මිලි තත්."
-}
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -11,8 +11,6 @@
    "save_config": "Uložiť konfiguráciu",
    "enabled_dhcp": "DHCP server zapnutý",
    "disabled_dhcp": "DHCP server vypnutý",
-    "unavailable_dhcp": "DHCP nie je dostupné",
-    "unavailable_dhcp_desc": "AdGuard Home nemôže vo vašom OS prevádzkovať DHCP server",
    "dhcp_title": "DHCP server (experimentálne!)",
    "dhcp_description": "Ak Váš smerovač neposkytuje možnosť nastaviť DHCP, môžete použiť vlastný zabudovaný DHCP server AdGuard.",
    "dhcp_enable": "Zapnúť DHCP server",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP statické prenájmy",
    "dhcp_leases_not_found": "Neboli nájdené žiadne DHCP prenájmy",
    "dhcp_config_saved": "Konfigurácia DHCP servera uložená",
-    "dhcp_ipv4_settings": "Nastavenia DHCP IPv4",
-    "dhcp_ipv6_settings": "Nastavenia DHCP IPv6",
    "form_error_required": "Povinná položka",
    "form_error_ip4_format": "Nesprávny formát IPv4",
    "form_error_ip6_format": "Nesprávny formát IPv6",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Neplatný formát client ID",
    "form_error_positive": "Musí byť väčšie ako 0",
    "form_error_negative": "Musí byť číslo 0 alebo viac",
-    "range_end_error": "Musí byť väčšie ako začiatok rozsahu",
    "dhcp_form_gateway_input": "IP brána",
    "dhcp_form_subnet_input": "Maska podsiete",
    "dhcp_form_range_title": "Rozsah IP adries",
@@ -132,8 +127,7 @@
    "encryption_settings": "Nastavenia šifrovania",
    "dhcp_settings": "Nastavenia DHCP",
    "upstream_dns": "Upstream DNS servery",
-    "upstream_dns_help": "Zadajte adresy serverov jednu na riadok. <a>Získajte viac informácií</a> o konfigurácii DNS serverov na strane servera.",
-    "upstream_dns_configured_in_file": "Konfigurované v {{path}}",
+    "upstream_dns_hint": "Ak toto pole ponecháte prázdne, AdGuard Home použije <a href='https://www.quad9.net/' target='_blank'>Quad9</a> ako upstream.",
    "test_upstream_btn": "Test upstreamov",
    "upstreams": "Upstreams",
    "apply_btn": "Použiť",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "radová DNS (cez UDP)",
    "example_upstream_dot": "šifrované <0>DNS-over-TLS</0>",
    "example_upstream_doh": "šifrované <0>DNS-over-HTTPS</0>",
-    "example_upstream_doq": "šifrované <0>DNS-over-QUIC</0>",
    "example_upstream_sdns": "môžete použiť <0>DNS pečiatky</0> pre <1>DNSCrypt</1> alebo <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "radová DNS (cez TCP)",
    "all_lists_up_to_date_toast": "Všetky zoznamy sú už aktuálne",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Server \"{{key}}\": nemohol byť použitý, skontrolujte, či ste ho správne napísali",
    "unblock": "Odblokovať",
    "block": "Blokovať",
-    "disallow_this_client": "Zablokovať tohto klienta",
-    "allow_this_client": "Povoliť tohto klienta",
-    "block_for_this_client_only": "Blokovať len pre tohto klienta",
-    "unblock_for_this_client_only": "Odblokovať len pre tohto klienta",
    "time_table_header": "Čas",
    "date": "Dátum",
    "domain_name_table_header": "Meno domény",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Stránka",
    "rows_table_footer_text": "riadky",
    "updated_custom_filtering_toast": "Aktualizované vlastné filtračné pravidlá",
-    "rule_removed_from_custom_filtering_toast": "Pravidlo odstránené z vlastných filtračných pravidiel: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Pravidlo pridané do vlastných filtračných pravidiel: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Pravidlo odstránené z vlastných filtračných pravidiel",
+    "rule_added_to_custom_filtering_toast": "Pravidlo pridané do vlastných filtračných pravidiel",
    "query_log_response_status": "Stav: {{value}}",
    "query_log_filtered": "Vyfiltrované pomocou {{filter}}",
    "query_log_confirm_clear": "Naozaj chcete vymazať celý denník dopytov?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Spôsob blokovania",
    "default": "Predvolené",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Nulová IP adresa",
    "custom_ip": "Vlastná IP adresa",
    "blocking_ipv4": "Blokovanie IPv4",
@@ -253,10 +241,10 @@
    "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ť (0: 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_refused": "REFUSED: Odpovedať kódom REFUSED",
+    "blocking_mode_default": "Predvolená hodnota: Odpovedať pomocou NXDOMAIN, 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_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)",
    "blocking_mode_custom_ip": "Vlastná IP adresa: Odpovedzte s manuálne nastavenou IP adresou",
@@ -333,8 +321,6 @@
    "encryption_https_desc": "Ak je nakonfigurovaný HTTPS port, AdGuard Home administrátorské rozhranie bude prístupné cez HTTPS a bude tiež poskytovať DNS-cez-HTTPS na '/dns-query'.",
    "encryption_dot": "Port DNS-cez-TLS",
    "encryption_dot_desc": "Ak je tento port nakonfigurovaný, AdGuard Home bude na tomto porte spúšťať DNS-cez-TLS server.",
-    "encryption_doq": "Port DNS-cez-QUIC",
-    "encryption_doq_desc": "Ak je tento port nakonfigurovaný, AdGuard Home na tomto porte spustí server DNS-over-QUIC. Je to experimentálne a nemusí to byť spoľahlivé. Momentálne tiež nie je príliš veľa klientov, ktorí by ju podporovali.",
    "encryption_certificates": "Certifikáty",
    "encryption_certificates_desc": "Ak chcete používať šifrovanie, musíte pre svoju doménu poskytnúť platný reťazec certifikátov SSL. Certifikát môžete získať bezplatne na adrese <0>{{link}}</0> alebo si ho môžete kúpiť od jedného z dôveryhodných certifikačných orgánov.",
    "encryption_certificates_input": "Skopírujte alebo prilepte sem certifikáty vo formáte PEM.",
@@ -368,7 +354,7 @@
    "fix": "Opraviť",
    "dns_providers": "Tu je <0>zoznam známych poskytovateľov DNS</0>, z ktorého si vyberiete.",
    "update_now": "Aktualizovať teraz",
-    "update_failed": "Automatická aktualizácia zlyhala. Prosím <a>sledujte postup</a> pre manuálnu aktualizáciu.",
+    "update_failed": "Automatická aktualizácia zlyhala. Prosím <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>sledujte postup</a> pre manuálnu aktualizáciu.",
    "processing_update": "Čakajte prosím, AdGuard Home sa aktualizuje",
    "clients_title": "Klienti",
    "clients_desc": "Konfigurácia zariadení pripojených k AdGuard Home",
@@ -563,8 +549,10 @@
    "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_min_override_desc": "Prepíše hodnotu TTL (minimálnu) prijatú z upstream servera. Táto hodnota nemôže byť väčšia ako 3600 (1 hodina)",
    "cache_ttl_max_override_desc": "Prepíše hodnotu TTL (maximálnu) prijatú z upstream servera",
-    "ttl_cache_validation": "Minimálna hodnota TTL cache musí byť menšia alebo rovná maximálnej hodnote",
+    "min_exceeds_max_value": "Minimálna hodnota je väčšia ako maximálna",
+    "value_not_larger_than": "Hodnota nemôže byť väčšia ako {{maximum}}",
    "filter_category_general": "Všeobecné",
    "filter_category_security": "Bezpečnosť",
    "filter_category_regional": "Regionálne",
@@ -573,10 +561,7 @@
    "filter_category_security_desc": "Zoznamy, ktoré sa špecializujú na blokovanie domén škodlivého softvéru alebo podvodov",
    "filter_category_regional_desc": "Zoznamy zamerané na regionálne reklamy a sledovacie servery",
    "filter_category_other_desc": "Iné blokovacie zoznamy",
-    "setup_config_to_enable_dhcp_server": "K zapnutiu DHCP servera je potrebné nastaviť konfiguráciu",
    "original_response": "Pôvodná odozva",
    "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.",
-    "experimental": "Experimentálne"
+    "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ť."
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -11,8 +11,6 @@
    "save_config": "Shrani konfiguracijo",
    "enabled_dhcp": "Strežnik DHCP je omogočen",
    "disabled_dhcp": "Strežnik DHCP je onemogočen",
-    "unavailable_dhcp": "DHCP ni na voljo",
-    "unavailable_dhcp_desc": "AdGuard Home ne more zagnati strežnika DHCP v vašem operacijskem sistemu",
    "dhcp_title": "Strežnik DHCP (poskusno!)",
    "dhcp_description": "Če vaš usmerjevalnik ne nudi nastavitev DHCP, lahko uporabite AdGuardov vgrajen DHCP strežnik.",
    "dhcp_enable": "Omogoči strežnik DHCP",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP statični najemi",
    "dhcp_leases_not_found": "Ni najdenih najemov DHCP",
    "dhcp_config_saved": "Shranjena konfiguracija DHCP strežnika",
-    "dhcp_ipv4_settings": "Nastavitve DHCP IPv4",
-    "dhcp_ipv6_settings": "Nastavitve DHCP IPv6",
    "form_error_required": "Zahtevano polje",
    "form_error_ip4_format": "Neveljaven format IPv4",
    "form_error_ip6_format": "Neveljaven format IPv6",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Neveljaven format ID odjemalca",
    "form_error_positive": "Mora biti večja od 0",
    "form_error_negative": "Mora biti enako ali več kot 0",
-    "range_end_error": "Mora biti večji od začtka razpona",
    "dhcp_form_gateway_input": "IP prehoda",
    "dhcp_form_subnet_input": "Maska podomrežja",
    "dhcp_form_range_title": "Razpon naslovov IP",
@@ -132,8 +127,7 @@
    "encryption_settings": "Nastavitve šifriranja",
    "dhcp_settings": "Nastavitve DHCP",
    "upstream_dns": "Zagonski DNS strežniki",
-    "upstream_dns_help": "Vnesite naslove strežnikov, enega na vrstico. <a>Več o tem</a> o konfiguriranju zgornjih strežnikov DNS.",
-    "upstream_dns_configured_in_file": "Nastavljen v {{path}}",
+    "upstream_dns_hint": "Če pustite to polje prazno, bo AdGuard Home uporabil <a href='https://www.quad9.net/' target='_blank'>Quad9</a> kot tok navzgor.",
    "test_upstream_btn": "Preizkusi upstreame",
    "upstreams": "Tokovi navzgor",
    "apply_btn": "Uporabi",
@@ -187,7 +181,6 @@
    "example_upstream_regular": "redni DNS (nad UDP)",
    "example_upstream_dot": "šifriran <0>DNS-prek-TLS</0>",
    "example_upstream_doh": "šifriran <0>DNS-prek-HTTPS</0>",
-    "example_upstream_doq": "šifriran <0>DNS-prek-QUIC</0>",
    "example_upstream_sdns": "lahko uporabite <0>DNS Žige</0> za reševalce <1>DNSCrypt</1> ali <2>DNS-prek-HTTPS</2>",
    "example_upstream_tcp": "redni DNS (nad TCP)",
    "all_lists_up_to_date_toast": "Vsi seznami so že posodobljeni",
@@ -196,10 +189,6 @@
    "dns_test_not_ok_toast": "Ni mogoče uporabiti: strežnika \"{{key}}\". Preverite, ali ste ga pravilno napisali",
    "unblock": "Omogoči",
    "block": "Onemogoči",
-    "disallow_this_client": "Onemogoči tega odjemalca",
-    "allow_this_client": "Dovoli tega odjemalca",
-    "block_for_this_client_only": "Onemogoči samo za tega odjemalca",
-    "unblock_for_this_client_only": "Omogoči samo za tega odjemalca",
    "time_table_header": "Čas",
    "date": "Datum",
    "domain_name_table_header": "Ime domene",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "Stran",
    "rows_table_footer_text": "vrstic",
    "updated_custom_filtering_toast": "Posodobljena pravila filtriranja po meri",
-    "rule_removed_from_custom_filtering_toast": "Pravilo je odstranjeno iz pravil filtriranja po meri: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Pravilo je dodano pravilom filtriranja po meri: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Pravilo je odstranjeno iz pravil filtriranja po meri",
+    "rule_added_to_custom_filtering_toast": "Pravilo je dodano pravilom filtriranja po meri",
    "query_log_response_status": "Stanje: {{value}}",
    "query_log_filtered": "Filtriran z {{filter}}",
    "query_log_confirm_clear": "Ali ste prepričani, da želite počistiti celoten dnevnik poizvedb?",
@@ -241,7 +230,6 @@
    "blocking_mode": "Način zaviranja",
    "default": "Privzeto",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Prazen IP",
    "custom_ip": "IP po meri",
    "blocking_ipv4": "Onemogočanje IPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "Omejitev hitrosti",
    "edns_enable": "Omogoči podmrežje odjemalcev EDNS",
    "edns_cs_desc": "Če je omogočeno, bo AdGuard Home pošiljal podmrežja odjemalca na strežnike DNS.",
-    "rate_limit_desc": "Število zahtev na sekundo, ki jih sme narediti posamezen odjemalec (nastavitev na 0 pomeni neomejeno)",
+    "rate_limit_desc": "Število zahtev na sekundo, ki jih lahko pošlje posamezni odjemalec (0: 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_refused": "REFUSED: Odziv s kodo REFUSED",
+    "blocking_mode_default": "Privzeto: odziv z NXDOMAIN, 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_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)",
    "blocking_mode_custom_ip": "IP po meri: Odziv z ročno nastavljenim naslovom IP",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "Če so vrata HTTPS konfigurirana, bo skrbniški vmesnik AdGuard Home dostopen prek protokola HTTPS, prav tako pa bo zagotovil DNS-prek-HTTPS na mestu '/dns-query'.",
    "encryption_dot": "Vrata DNS-prek-TLS",
    "encryption_dot_desc": "Če so ta vrata konfigurirana, bo AdGuard Home na teh vratih zagnal DNS-prek-TLS strežnika.",
-    "encryption_doq": "DNS-prek-vrat QUIC",
-    "encryption_doq_desc": "Če so nastavljena ta vrata bo AdGuard Home na teh vratih zagnal strežnik DNS-prek-QUIC. To je eksperimentalno in morda ni zanesljivo. Prav tako trenutno ni preveč odjemalcev, ki to podpirajo.",
    "encryption_certificates": "Digitalna potrdila",
    "encryption_certificates_desc": "Za uporabo šifriranja morate za svojo domeno zagotoviti veljavno verigo potrdil SSL. Brezplačno digitalno potrdilo lahko dobite na <0>{{link}}</0> ali pa ga kupite pri enem od   zaupanja vrednih overiteljev.\n\n",
    "encryption_certificates_input": "Tukaj kopirajte/prilepite PEM šifrirana digitalna potrdila.",
@@ -369,7 +354,7 @@
    "fix": "Popravi",
    "dns_providers": "Tukaj je  <0>seznam znanih ponudnikov DNS</0>, med katerimi lahko izbirate.",
    "update_now": "Posodobi zdaj",
-    "update_failed": "Samodejna posodobitev ni uspela. Prosimo <a>sledite korakom</a>, da ročno posodobite.",
+    "update_failed": "Samodejna posodobitev ni uspela. Prosimo <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>sledite korakom</a> ra zočno posodobitev.",
    "processing_update": "Prosimo, počakajte. AdGuard Home se posodablja!",
    "clients_title": "Odjemalci",
    "clients_desc": "Konfigurirajte naprave, ki so povezane z AdGuard Home",
@@ -405,7 +390,7 @@
    "access_allowed_desc": "Seznam naslovov CIDR ali IP. Če je konfiguriran, bo AdGuard Home sprejel zahteve samo od teh teh IP naslovov.",
    "access_disallowed_title": "Zavrnjeni odjemalci",
    "access_disallowed_desc": "Seznam naslovov CIDR ali IP. Če je konfiguriran, bo AdGuard Home spustil zahteve iz teh IP naslovov.",
-    "access_blocked_title": "Prepovedane domene",
+    "access_blocked_title": "Nedovoljene domene",
    "access_blocked_desc": "Tega ne zamenjujte s filtri. AdGuard Home bo v spustil poizvedbe DNS s temi domenami v vprašanju poizvedbe. Tu lahko določite natančna imena domen, nadomestne znake in pravila urlfilter, npr. 'primer.org', '*.primer.org' or '||primer.org^'.",
    "access_settings_saved": "Nastavitve dostopa so uspešno shranjene",
    "updates_checked": "Posodobitve so uspešno preverjene",
@@ -564,9 +549,10 @@
    "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_min_override_desc": "Vrednost preglasovanja TTL (najmanjša), prejeta od zgornjega strežnika. Ta vrednost ne sme presegati 3600 (1 ura)",
    "cache_ttl_max_override_desc": "Vrednost preglasovanja TTL (največja), prejeta od zgornjega strežnika",
-    "ttl_cache_validation": "Najmanjša vrednost predpomnilnika TTL mora biti manjša ali enaka največji vrednosti",
+    "min_exceeds_max_value": "Najmanjša vrednost presega največjo vrednost",
+    "value_not_larger_than": "Vrednost ne sme biti večja od {{maximum}}",
    "filter_category_general": "Splošno",
    "filter_category_security": "Varnost",
    "filter_category_regional": "Področno",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "Seznami, ki so specializirani za onemogočanje domen zlonamernih programov, lažnega predstavljanja ali prevar",
    "filter_category_regional_desc": "Seznami, ki so osredotočeni na področne oglase in strežnike za sledenje",
    "filter_category_other_desc": "Drugi seznami za zaviranje",
-    "setup_config_to_enable_dhcp_server": "Nastavitve za omogočanje strežnika DHCP",
    "original_response": "Izviren odgovor",
    "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.",
-    "experimental": "Eksperimentalno"
+    "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."
 }
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -11,8 +11,6 @@
    "save_config": "Sačuvaj konfiguraciju",
    "enabled_dhcp": "DHCP server uključen",
    "disabled_dhcp": "DHCP server isključen",
-    "unavailable_dhcp": "DHCP nije dostupan",
-    "unavailable_dhcp_desc": "AdGuard Home Ne može da pokrene DHCP na vašem OS",
    "dhcp_title": "DHCP server (eksperimentalno!)",
    "dhcp_description": "Ako vaš ruter nema DHCP postavke, možete koristiti AdGuard' ugrađen DHCP server.",
    "dhcp_enable": "Uključi DHCP server",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP statička pozajmljivanja",
    "dhcp_leases_not_found": "DHCP pozajmljivanja nisu pronađena",
    "dhcp_config_saved": "Sačuvaj DHCP konfiguraciju servera",
-    "dhcp_ipv4_settings": "DHCP IPv4 postavke",
-    "dhcp_ipv6_settings": "DHCP IPv6 postavke",
    "form_error_required": "Obavezno polje",
    "form_error_ip4_format": "Nevažeći IPv4 format",
    "form_error_ip6_format": "Nevažeći IPv6 format",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "Nevažeći format klijenta",
    "form_error_positive": "Mora biti veće od 0",
    "form_error_negative": "Mora biti 0 ili veće",
-    "range_end_error": "Mora biti veće od početnog opsega",
    "dhcp_form_gateway_input": "IP mrežnog prolaza",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Opseg IP adresa",
@@ -132,6 +127,7 @@
    "encryption_settings": "Postavke šifrovanja",
    "dhcp_settings": "DHCP postavke",
    "upstream_dns": "Upstream DNS serveri",
+    "upstream_dns_hint": "Ako ovo polje ostavite prazno, AdGuard Home će koristiti <a href='https://www.quad9.net/' target='_blank'>Quad9</a> kao upstream.",
    "test_upstream_btn": "Testiraj upstreams",
    "upstreams": "Upstreams",
    "apply_btn": "Primeni",
@@ -212,8 +208,8 @@
    "page_table_footer_text": "Stranica",
    "rows_table_footer_text": "redovi",
    "updated_custom_filtering_toast": "Ažurirana prilagođena pravila filtriranja",
-    "rule_removed_from_custom_filtering_toast": "Pravilo uklonjeno iz prilagođenih pravila filtriranja: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Pravilo dodato u prilagođena pravila filtriranja: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Pravilo uklonjeno iz prilagođenih pravila filtriranja",
+    "rule_added_to_custom_filtering_toast": "Pravilo dodato u prilagođena pravila filtriranja",
    "query_log_response_status": "Stanje: {{value}}",
    "query_log_filtered": "Filtrirano od {{filter}}",
    "query_log_confirm_clear": "Jeste li sigurni da želite da očistite ceo dnevnik unosa?",
@@ -245,9 +241,10 @@
    "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_default": "Podrazumevano: Odgovara sa NXDOMAIN 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_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",
@@ -357,7 +354,7 @@
    "fix": "Popravi",
    "dns_providers": "Ovo je a <0>lista poznatih DNS dobavljača</0> sa koje možete da izaberete.",
    "update_now": "Ažuriraj sada",
-    "update_failed": "Automatsko ažuriranje nije uspelo. Molimo vas <a>pratite korake</a> za ručno ažuriranje.",
+    "update_failed": "Automatsko ažuriranje nije uspelo. Molimo vas <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>pratite korake</a> za ručno ažuriranje.",
    "processing_update": "Molimo sačekajte. AdGuard Home se ažurira",
    "clients_title": "Klijenti",
    "clients_desc": "Konfigurišite uređaje koji su povezani na AdGuard Home",
@@ -552,7 +549,10 @@
    "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",
+    "min_exceeds_max_value": "Najmanja vrednost je dosegla najveću vrednost",
+    "value_not_larger_than": "Vrednost ne može biti veća od {{maximum}}",
    "filter_category_general": "Opšte",
    "filter_category_security": "Bezbednost",
    "filter_category_regional": "Region",
@@ -561,7 +561,6 @@
    "filter_category_security_desc": "Lista specijalizovana za blokiranje štetnog softvera, štetnih i fišing domena",
    "filter_category_regional_desc": "Lista koja se usredsređuje na regionalne reklame i servere praćenja",
    "filter_category_other_desc": "Ostale liste blokiranja",
-    "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."
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -103,6 +103,7 @@
    "encryption_settings": "Krypteringsinställningar",
    "dhcp_settings": "DHCP-inställningar",
    "upstream_dns": "Upstream DNS-servrar",
+    "upstream_dns_hint": "Om du låter fältet vara tomt kommer AdGuard Home att använda <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> för uppström.",
    "test_upstream_btn": "Testa uppströmmar",
    "apply_btn": "Tillämpa",
    "disabled_filtering_toast": "Filtrering bortkopplad",
@@ -161,8 +162,8 @@
    "page_table_footer_text": "Sida",
    "rows_table_footer_text": "rader",
    "updated_custom_filtering_toast": "Uppdaterade de egna filterreglerna",
-    "rule_removed_from_custom_filtering_toast": "Regel borttagen från de egna filterreglerna: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Regel tillagd till de egna filterreglerna: {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "Regel borttagen från de egna filterreglerna",
+    "rule_added_to_custom_filtering_toast": "Regel tillagd till de egna filterreglerna",
    "query_log_response_status": "Status: {{value}}",
    "query_log_filtered": "Filtrerat av {{filter}}",
    "query_log_confirm_clear": "Är du säker på att du vill rensa hela förfrågningsloggen?",
@@ -273,7 +274,7 @@
    "fix": "Fixa",
    "dns_providers": "Här är en <0>lista över kända DNS-leverantörer</0> att välja från.",
    "update_now": "Uppdatera nu",
-    "update_failed": "Automatisk uppdatering misslyckad. Var god <a>följ stegen</a> för att uppdatera manuellt.",
+    "update_failed": "Automatisk uppdatering misslyckad. Var god <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>följ stegen</a> för att uppdatera manuellt.",
    "processing_update": "Vänta, AdGuard Home uppdateras",
    "clients_title": "Klienter",
    "clients_desc": "Konfigurera enheter uppkopplade mot AdGuard Home",
--- a/client/src/__locales/th.json
+++ b/client/src/__locales/th.json
@@ -108,6 +108,7 @@
    "encryption_settings": "การตั้งค่าการเข้ารหัส",
    "dhcp_settings": "การตั้งค่า DHCP",
    "upstream_dns": "เซิร์ฟเวอร์ DNS ต้นทาง",
+    "upstream_dns_hint": "The current approved translation is not correct, please review my translation:\n\"หากคุณเว้นช่องนี้ว่างไว้ AdGuard Home จะใช้ <a href='https://www.quad9.net/' target='_blank'>Quad9</a> เป็นต้นทาง\"",
    "test_upstream_btn": "ทดสอบต้นทาง",
    "upstreams": "ต้นทาง",
    "apply_btn": "นำไปใช้",
@@ -166,8 +167,8 @@
    "page_table_footer_text": "หน้า",
    "rows_table_footer_text": "ตาราง",
    "updated_custom_filtering_toast": "อัปเดตกฎการกรองที่กำหนดเอง",
-    "rule_removed_from_custom_filtering_toast": "ลบกฎออกจากกฎการกรองที่กำหนดเองแล้ว {{rule}}",
-    "rule_added_to_custom_filtering_toast": "เพิ่มกฎในกฎการกรองที่กำหนดเองแล้ว {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "ลบกฎออกจากกฎการกรองที่กำหนดเองแล้ว",
+    "rule_added_to_custom_filtering_toast": "เพิ่มกฎในกฎการกรองที่กำหนดเองแล้ว",
    "query_log_response_status": "สถานะ: {{value}}",
    "query_log_filtered": "กรองโดย {{filter}}",
    "query_log_confirm_clear": "คุณแน่ใจหรือไม่ว่าต้องการลบบันทึกการใช้งานทั้งหมด?",
@@ -191,9 +192,10 @@
    "rate_limit": "จำกัดอัตรา",
    "edns_enable": "เปิดใช้งานซับเน็ตไคลเอ็นต์ EDNS",
    "edns_cs_desc": "หากเปิดใช้งาน AdGuard Home จะส่งซับเน็ตของไคลเอนต์ไปยังเซิร์ฟเวอร์ DNS",
+    "rate_limit_desc": "จำนวนการร้องขอต่อวินาทีที่อนุญาตให้ไคลเอนต์เดียวทำ (0: ไม่จำกัดจำนวน)",
    "blocking_ipv4_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอที่ถูกปิดกั้น",
    "blocking_ipv6_desc": "ที่อยู่ IP ที่จะส่งคืนสำหรับคำขอ AAAA ที่ถูกปิดกั้น",
-    "blocking_mode_default": "เริ่มต้น: ตอบสนองด้วย REFUSED เมื่อถูกปิดกั้นโดยกฎสไตล์ปิดกั้นโฆษณา; ตอบกลับด้วยที่อยู่ IP ที่ระบุในกฎเมื่อถูกปิดกั้นโดยกฎ /etc/hosts-hosts",
+    "blocking_mode_default": "เริ่มต้น: ตอบสนองด้วย NXDOMAIN เมื่อถูกปิดกั้นโดยกฎสไตล์ปิดกั้นโฆษณา; ตอบกลับด้วยที่อยู่ 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 ที่ตั้งค่าด้วยตนเอง",
@@ -299,7 +301,7 @@
    "fix": "ซ่อม",
    "dns_providers": "นี่คือรายการ <0>ของผู้ให้บริการ DNS ที่เป็นที่รู้จัก</0> ให้เลือก",
    "update_now": "อัปเดตตอนนี้",
-    "update_failed": "อัปเดทล้มเหลว กรุณา <a> ทำตามขั้นตอน </a> เพื่ออัพเดทด้วยตนเอง",
+    "update_failed": "อัปเดทล้มเหลว กรุณา <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'> ทำตามขั้นตอน </a> เพื่ออัพเดทด้วยตนเอง",
    "processing_update": "รอซักครู่ AdGuard Home กำลังอัปเดท",
    "clients_title": "เครื่องลูกข่าย",
    "clients_desc": "ตั้งค่าอุปกรณ์เพื่อเชื่อมต่อ AdGuard Home",
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -9,20 +9,16 @@
    "save_config": "Ayarları kaydet",
    "enabled_dhcp": "DHCP sunucusu etkinleştirildi",
    "disabled_dhcp": "DHCP sunucusu devre dışı bırakıldı",
-    "unavailable_dhcp": "DHCP kullanılamıyor",
-    "unavailable_dhcp_desc": "AdGuard Home, işletim sisteminizde DHCP sunucusu çalıştıramıyor",
    "dhcp_title": "DHCP sunucusu (deneysel!)",
    "dhcp_description": "Eğer router'ınız DHCP ayarlarını sunmuyorsa AdGuard'ın dahili DHCP sunucusunu kullanabilirsiniz.",
    "dhcp_enable": "DHCP sunucusunu etkinleştir",
    "dhcp_disable": "DHCP sunucusunu devre dışı bırak",
-    "dhcp_not_found": "Yerleşik DHCP sunucusunu etkinleştirmek güvenlidir - Ağ üzerinde herhangi bir aktif DHCP sunucusu bulamadık. Ancak, otomatik testimiz şu anda %100 garanti vermediği için el ile tekrar kontrol etmenizi öneririz.",
+    "dhcp_not_found": "Ağ üzerinde aktif bir DHCP sunucusu bulunamadı. Dahili DHCP sunucusunu etkinleştirebilirsiniz.",
    "dhcp_found": "Ağ üzerinde bazı aktif DHCP sunucuları bulundu. Yerleşik DHCP sunucusunu aktif etmek sağlıklı olmayacaktır.",
    "dhcp_leases": "DHCP kiralamaları",
    "dhcp_static_leases": "Sabit DHCP kiralamaları",
    "dhcp_leases_not_found": "DHCP kiralaması bulunamadı",
    "dhcp_config_saved": "DHCP sunucusu ayarı kaydedildi",
-    "dhcp_ipv4_settings": "DHCP IPv4 Ayarları",
-    "dhcp_ipv6_settings": "DHCP IPv6 Ayarları",
    "form_error_required": "Gerekli alan",
    "form_error_ip4_format": "Geçersiz IPv4 formatı",
    "form_error_ip6_format": "Geçersiz IPv6 formatı",
@@ -31,7 +27,6 @@
    "form_error_client_id_format": "Geçersiz müşteri kimliği formatı",
    "form_error_positive": "0'dan büyük olmalı",
    "form_error_negative": "0 veya daha büyük olmalıdır",
-    "range_end_error": "Başlangıç aralığından daha büyük olmalı",
    "dhcp_form_gateway_input": "Ağ Geçidi IP'si",
    "dhcp_form_subnet_input": "Alt Ağ Maskesi",
    "dhcp_form_range_title": "IP adres aralığı",
@@ -56,7 +51,6 @@
    "dhcp_add_static_lease": "Sabit kiralama ekle",
    "dhcp_reset": "DHCP yapılandırmasını sıfırlamak istediğinizden emin misiniz?",
    "country": "Ülke",
-    "city": "Şehir",
    "delete_confirm": "\"{{key}}\" silmek istediğinizden emin misiniz?",
    "form_enter_hostname": "Cihaz ismi girin",
    "error_details": "Hata detayları",
@@ -68,24 +62,22 @@
    "filters": "Filtreler",
    "filter": "Filtre",
    "query_log": "Sorgu Günlüğü",
-    "nothing_found": "Hiçbir şey bulunamadı",
    "faq": "SSS",
    "version": "Sürüm",
    "address": "Adres",
-    "protocol": "Protokol",
    "on": "AÇIK",
    "off": "KAPALI",
    "copyright": "Tüm hakları saklıdır",
    "homepage": "Anasayfa",
    "report_an_issue": "Bir sorun bildir",
-    "privacy_policy": "Gizlilik politikası",
+    "privacy_policy": "Gizlilik sözleşmesi",
    "enable_protection": "Korumayı etkinleştir",
    "enabled_protection": "Koruma etkileştirildi",
    "disable_protection": "Korumayı durdur",
-    "disabled_protection": "Koruma devre dışı",
+    "disabled_protection": "Koruma durduruldu",
    "refresh_statics": "İstatistikleri yenile",
    "dns_query": "DNS Sorguları",
-    "blocked_by": "<0>Filtreler tarafından engellendi</0>",
+    "blocked_by": "Filtreler tarafından engellendi",
    "stats_malware_phishing": "Zararlı yazılım/kimlik hırsızlığı engellendi",
    "stats_adult": "Yetişkin içerikli site engellendi",
    "stats_query_domain": "En fazla sorgulanan alan adları",
@@ -101,11 +93,11 @@
    "number_of_dns_query_days": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
    "number_of_dns_query_days_plural": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
    "number_of_dns_query_24_hours": "Son 24 saat içinde işlenen DNS sorgularının sayısı",
-    "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve ana bilgisayar engelleme listeleri tarafından engellenen DNS isteklerinin sayısı",
+    "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve hosts listeleri tarafından engellenmiş DNS isteklerinin sayısı",
    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard gezinti koruması modülü tarafından engellenmiş DNS isteklerinin sayısı",
    "number_of_dns_query_blocked_24_hours_adult": "Engellenmiş yetişkin içerikli web sitelerinin sayısı",
-    "enforced_save_search": "Zorunlu kılınmış güvenli arama",
-    "number_of_dns_query_to_safe_search": "Güvenli Aramanın zorunlu kıldığı arama motorlarına gönderilen DNS isteklerinin sayısı",
+    "enforced_save_search": "Etkin güvenli arama",
+    "number_of_dns_query_to_safe_search": "Güvenli Arama etkinleştirildiğinde arama motorlarına gönderilen DNS isteklerinin sayısı",
    "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",
@@ -115,19 +107,19 @@
    "use_adguard_parental": "AdGuard ebeveyn kontrolü web hizmetini kullan",
    "use_adguard_parental_hint": "AdGuard Home, alan adının yetişkin içerik bulundurup bulundurmadığını kontrol edecek. Gezinti güvenliği web hizmeti ile kullandığımız aynı gizlilik dostu API'yi kullanıyoruz.",
    "enforce_safe_search": "Güvenli aramayı zorunlu kıl",
-    "enforce_save_search_hint": "AdGuard Home şu arama motorlarında güvenli aramayı zorunlu kılabilir: Google, Youtube, Bing, DuckDuckGo, Yandex ve Pixabay.",
+    "enforce_save_search_hint": "AdGuard Home şu arama motorlarında güvenli aramayı zorunlu kılabilir: Google, Youtube, Bing, DuckDuckGo ve Yandex.",
    "no_servers_specified": "Sunucu adresi girilmedi",
    "general_settings": "Genel ayarlar",
    "dns_settings": "DNS ayarları",
-    "dns_blocklists": "DNS engelleme listeleri",
+    "dns_blocklists": "DNS blok listeleri",
    "dns_allowlists": "DNS izin listeleri",
-    "dns_blocklists_desc": "AdGuard Home, engelleme listeleriyle eşleşen alanları engeller.",
+    "dns_blocklists_desc": "AdGuard Home, blok listelerle eşleşen alanları engeller.",
    "dns_allowlists_desc": "DNS izin listelerindeki alanlara, engelleme listelerinden birinde olsalar bile izin verilir.",
    "custom_filtering_rules": "Özel filtreleme kuralları",
    "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_hint": "Eğer bu alanı boş bırakırsanız AdGuard Home üst sunucu olarak  <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> adresini kullanacaktır.",
    "test_upstream_btn": "Üst sunucuyu test et",
    "upstreams": "Upstreams",
    "apply_btn": "Uygula",
@@ -150,8 +142,8 @@
    "delete_table_action": "Sil",
    "elapsed": "Geçen zaman",
    "filters_and_hosts_hint": "AdGuard Home temel reklam engelleme kurallarını ve hosts dosyalarının söz dizim kurallarını anlamaktadır.",
-    "no_blocklist_added": "Hiçbir engelleme listesi eklenmedi",
-    "no_whitelist_added": "İzin verilen listesi eklenmedi",
+    "no_blocklist_added": "Hiçbir blok listesi eklenmedi",
+    "no_whitelist_added": "Hiçbir izin listesi eklenmedi",
    "add_blocklist": "Engelleme listesi ekle",
    "add_allowlist": "İzin listesi ekle",
    "cancel_btn": "İptal",
@@ -159,16 +151,14 @@
    "enter_url_or_path_hint": "Bir URL ya da listenin tam yolunu girin",
    "check_updates_btn": "Güncellemeleri denetle",
    "new_blocklist": "Yeni engelleme listesi",
-    "new_allowlist": "Yeni izin verilen listesi",
+    "new_allowlist": "Yeni izin listesi",
    "edit_blocklist": "Engelleme listesini düzenle",
-    "edit_allowlist": "İzin verilen listesini düzenle",
-    "choose_blocklist": "Engelleme listelerini seçin",
-    "choose_allowlist": "İzin verilen listelerini seç",
+    "edit_allowlist": "İzin listesini düzenle",
    "enter_valid_blocklist": "Engelleme listesine geçerli bir URL girin.",
-    "enter_valid_allowlist": "İzin verilen listesine geçerli bir URL girin.",
+    "enter_valid_allowlist": "İzin listesine geçerli bir URL girin.",
    "form_error_url_format": "Geçersiz url biçim",
    "form_error_url_or_path_format": "Geçersiz URL ya da listenin tam yolu",
-    "custom_filter_rules": "Özel filtreleme kuralları",
+    "custom_filter_rules": "İsteğe bağlı filtreleme kuralları",
    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklama engelleme kuralı veya hosts dosyası söz dizimi kullanabilirsiniz.",
    "examples_title": "Örnekler",
    "example_meaning_filter_block": "example.org alan adına ve tüm alt alan adlarına olan erişimi engeller",
@@ -189,10 +179,6 @@
    "dns_test_not_ok_toast": "Sunucu \"{{key}}\": kullanılamıyor, lütfen doğru yazdığınızdan emin olun",
    "unblock": "Engeli kaldır",
    "block": "Engelle",
-    "disallow_this_client": "Bu istemciye izin verme",
-    "allow_this_client": "Bu istemciye izin ver",
-    "block_for_this_client_only": "Yalnızca bu istemci için engelle",
-    "unblock_for_this_client_only": "Yalnızca bu müşteri için engellemeyi kaldır",
    "time_table_header": "Saat",
    "date": "Tarih",
    "domain_name_table_header": "Alan adı",
@@ -210,9 +196,9 @@
    "loading_table_status": "Yükleniyor...",
    "page_table_footer_text": "Sayfa",
    "rows_table_footer_text": "satır",
-    "updated_custom_filtering_toast": "Özel filtreleme kuralları güncellendi",
-    "rule_removed_from_custom_filtering_toast": "Özel filtreleme kurallarından kural kaldırıldı: {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Özel filtreleme kurallarına kural eklendi: {{rule}}",
+    "updated_custom_filtering_toast": "İsteğe bağlı filtreleme kuralları güncellendi",
+    "rule_removed_from_custom_filtering_toast": "Kural isteğe bağlı filtreleme kurallarından kaldırıldı",
+    "rule_added_to_custom_filtering_toast": "Kural isteğe bağlı filtreleme kurallarına eklendi",
    "query_log_response_status": "Durum: {{value}}",
    "query_log_filtered": "{{filter}} tarafından filtrelendi",
    "query_log_confirm_clear": "Tüm sorgu günlüğünü temizlemek istediğinizden emin misiniz?",
@@ -225,14 +211,11 @@
    "query_log_strict_search": "Katı arama için çift tırnak işareti kullanın",
    "query_log_retention_confirm": "Sorgu günlüğü saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
    "anonymize_client_ip": "İstemci IP'sini anonimize et",
-    "anonymize_client_ip_desc": "İstemcinin tam IP adresini günlüklere ve istatistiklere kaydetmeyin",
+    "anonymize_client_ip_desc": "Tam IP adresini günlüğe ve istatistiklere kaydetme",
    "dns_config": "DNS sunucusu yapılandırması",
-    "dns_cache_config": "DNS önbelleği yapılandırması",
-    "dns_cache_config_desc": "Burada DNS önbelleğini yapılandırabilirsiniz",
    "blocking_mode": "Engelleme modu",
    "default": "Varsayılan",
    "nxdomain": "NXDOMAIN",
-    "refused": "REFUSED",
    "null_ip": "Boş IP",
    "custom_ip": "Özel IP",
    "blocking_ipv4": "IPv4 engelleme",
@@ -242,22 +225,20 @@
    "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.",
+    "rate_limit_desc": "Tek bir istemcinin saniye başına yapmasına izin verilen istek sayısı (0: sınırsız)",
    "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_refused": "REFUSED: REFUSED kod ile yanıt verin",
+    "blocking_mode_default": "Varsayılan: Adblock tarzı kural tarafından engellendiğinde NXDOMAIN ile yanıt verin; / etc / hosts-style kuralı tarafından engellendiğinde kuralda belirtilen IP adresiyle yanıt ver",
    "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)",
-    "blocking_mode_custom_ip": "Özel IP: El ile ayarlanmış bir IP adresi ile yanıt verin",
+    "blocking_mode_null_ip": "Boş IP: Sıfır IP adresiyle yanıtlayın (A için 0.0.0.0; :: AAAA için)",
+    "blocking_mode_custom_ip": "Özel IP: Manuel olarak ayarlanmış bir IP adresiyle yanıt verin",
    "upstream_dns_client_desc": "Bu alanı boş tutarsanız, AdGuard Home, <0>DNS ayarlarında</0> yapılandırılmış sunucuları kullanır.",
-    "tracker_source": "İzleyici kaynağı",
    "source_label": "Kaynak",
-    "found_in_known_domain_db": "Bilinen alan adları veritabanı içinde bulundu.",
+    "found_in_known_domain_db": "Bilinen alan adları veri tabanı içinde bulundu",
    "category_label": "Kategori",
    "rule_label": "Kural",
    "list_label": "Liste",
    "unknown_filter": "Bilinmeyen filtre {{filterId}}",
-    "known_tracker": "Bilinen izleyici",
    "install_welcome_title": "AdGuard Home'a hoş geldiniz!",
    "install_welcome_desc": "AdGuard Home, ağ genelinde reklam ve izleyicileri engelleyen bir DNS sunucusudur. Tüm ağınızı ve tüm cihazlarınızı kontrol etmenize yarayan bir araçtır, istemci tarafında bir program kullanmanıza gerek duymaz.",
    "install_settings_title": "Yönetici Web Arayüzü",
@@ -299,7 +280,7 @@
    "install_devices_macos_list_4": "DNS sekmesine tıklayın ve AdGuard Home sunucunuzun adreslerini girin.",
    "install_devices_android_list_1": "Android cihazınızda Ayarlar simgesine dokunun.",
    "install_devices_android_list_2": "Wi-Fi menüsüne dokunun. Mevcut tüm ağlar listelenecektir (mobil bağlantı için isteğe bağlı DNS sunucusu ayarlanamaz).",
-    "install_devices_android_list_3": "Bağlı olduğunuz ağa uzun basın ve Ağı Değiştir'e dokunun.",
+    "install_devices_android_list_3": "Bağlandığınız ağa basılı tutup \"Ağı Değiştir\"e dokunun.",
    "install_devices_android_list_4": "Bazı cihazlarda diğer ayarları görmek için Gelişmiş kutucuğuna dokunmanız gerekebilir. Android cihazınızın DNS ayarlarını değiştirmek için IP ayarlarını DHCP yerine Statik olarak değiştirmeniz gerekebilir.",
    "install_devices_android_list_5": "DNS 1 ve DNS 2 değerlerini AdGuard Home sunucusunun ip adresleri ile değiştirin.",
    "install_devices_ios_list_1": "Ana ekrandaki Ayarlar simgesine dokunun.",
@@ -355,7 +336,7 @@
    "fix": "Düzelt",
    "dns_providers": "Aralarından seçim yapabileceğiniz bilinen <0>DNS sağlayıcıların listesi</0>.",
    "update_now": "Şimdi güncelleyin",
-    "update_failed": "Otomatik güncelleme başarısız oldu. Lütfen elle güncellemek için <a>talimatları uygulayın</a>.",
+    "update_failed": "Otomatik güncelleme başarısız oldu. Lütfen elle güncellemek için   <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>talimatları uygulayın.</a>",
    "processing_update": "Lütfen bekleyin. AdGuard Home güncelleniyor",
    "clients_title": "İstemciler",
    "clients_desc": "AdGuard Home'a bağlı cihazları yapılandırın",
@@ -449,7 +430,6 @@
    "domain": "Alan adı",
    "answer": "Cevap",
    "filter_added_successfully": "Filtre başarıyla eklendi",
-    "filter_removed_successfully": "Filtre başarıyla kaldırıldı",
    "filter_updated": "Filtre başarıyla güncellendi",
    "statistics_configuration": "İstatistik yapılandırması",
    "statistics_retention": "İstatistikleri depolama",
@@ -468,7 +448,7 @@
    "username_placeholder": "Kullanıcı adını girin",
    "password_label": "Parola",
    "password_placeholder": "Parolayı girin",
-    "sign_in": "Giriş yap",
+    "sign_in": "Oturum aç",
    "sign_out": "Oturumu kapat",
    "forgot_password": "Parolanızı mı unuttunuz?",
    "forgot_password_desc": "Kullanıcı hesabınız için yeni bir parola oluşturmak için lütfen <0>bu adımları</0> takip edin.",
@@ -479,12 +459,10 @@
    "whois": "Whois",
    "filtering_rules_learn_more": "Ana makinelere dair kendi kara listelerinizi oluşturmakla alakalı <0>daha fazla bilgi edinin</0>.",
    "blocked_by_response": "Cevap olarak CNAME veya IP tarafından engellendi",
-    "blocked_by_cname_or_ip": "CNAME veya IP tarafından engellendi",
    "try_again": "Tekrar deneyin",
    "domain_desc": "Yeniden yazılmasını istediğiniz alan adını veya joker karakteri girin.",
    "example_rewrite_domain": "cevapları yalnızca bu alan adı için yeniden yaz.",
    "example_rewrite_wildcard": "tüm <0>example.org</0> alt alanları için cevapları yeniden yaz.",
-    "rewrite_domain_name": "Alan adı: bir CNAME kaydı ekleyin",
    "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",
@@ -500,8 +478,6 @@
    "check": "Kontrol",
    "form_enter_host": "Bir ana bilgisayar adı girin",
    "filtered_custom_rules": "Özel filtreleme kurallarına göre filtrelendi",
-    "choose_from_list": "Listeden seç",
-    "add_custom_list": "Özel bir liste ekle",
    "host_whitelisted": "Ana makine beyaz listeye alındı",
    "check_ip": "IP adresleri: {{ip}}",
    "check_cname": "CNAME: {{cname}}",
@@ -524,37 +500,11 @@
    "list_updated_plural": "{{count}} liste güncellendi",
    "dnssec_enable": "DNSSEC'i etkinleştir",
    "dnssec_enable_desc": "DNSSEC'i giden DNS sorguları için etkinleştir ve sonucu kontrol et (DNSSEC-etkin sorgulama gerekli)",
-    "all_queries": "Tüm sorgular",
    "show_blocked_responses": "Engellendi",
-    "show_whitelisted_responses": "Beyaz listeye eklendi",
-    "show_processed_responses": "İşlendi",
-    "blocked_safebrowsing": "Güvenli gezinti tarafından engellendi",
+    "show_whitelisted_responses": "Beyazlisteye eklendi",
    "blocked_adult_websites": "Yetişkin içerikli site engellendi",
    "blocked_threats": "Engellenen Tehditler",
    "allowed": "İzin verildi",
-    "filtered": "Filtrelenmiş",
-    "safe_search": "Güvenli arama",
-    "blocklist": "Engelleme listesi",
-    "milliseconds_abbreviation": "ms",
-    "cache_size": "Önbellek boyutu",
-    "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_min_override_desc": "Üst sunucudan alınan (minimum) TTL değerini değiştirin",
-    "cache_ttl_max_override_desc": "Üst sunucudan alınan (maksimum) TTL değerini değiştirin",
-    "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_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ı",
-    "click_to_view_queries": "Sorguları görmek için tıklayın",
-    "port_53_faq_link": "Port 53 genellikle \"DNSStubListener\" veya \"sistemd-resolved\" hizmetler tarafından kullanılır. Lütfen problemin nasıl çözüleceğine ilişkin <0>bu talimatı</0> okuyun.",
-    "adg_will_drop_dns_queries": "AdGuard Home, bu istemciden gelen tüm DNS sorgularını iptal eder.",
-    "experimental": "Deneysel"
+    "blocklist": "Engellenen listesi",
+    "port_53_faq_link": "Port 53 genellikle \"DNSStubListener\" veya \"sistemd-resolved\" hizmetler tarafından kullanılır. Lütfen problemin nasıl çözüleceğine ilişkin <0>bu talimatı</0> okuyun."
 }
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -3,16 +3,12 @@
    "example_upstream_reserved": "bạn có thể chỉ định DNS ngược tuyến <0>cho một tên miền cụ thể(hoặc nhiều)</0>",
    "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
    "parallel_requests": "Yêu cầu song song",
-    "load_balancing": "Cân bằng tải",
-    "load_balancing_desc": "Chỉ truy xuất một máy chủ trong cùng thời điểm. AdGuard Home sẽ sử dụng thuật toán trọng số ngẫu nhiên để chọn một máy chủ nhanh nhất và sử dụng máy chủ đó thường xuyên hơn.",
    "bootstrap_dns": "Máy chủ DNS Bootstrap",
    "bootstrap_dns_desc": "Máy chủ DNS Bootstrap được sử dụng để phân giải địa chỉ IP của bộ phân giải DoH/DoT mà bạn chỉ định là ngược tuyến.",
    "check_dhcp_servers": "Kiểm tra máy chủ DHCP",
    "save_config": "Lưu thiết lập",
    "enabled_dhcp": "Máy chủ DHCP đã kích hoạt",
    "disabled_dhcp": "Máy chủ DHCP đã tắt",
-    "unavailable_dhcp": "DHCP không khả dụng",
-    "unavailable_dhcp_desc": "AdGuard Home không thể chạy máy chủ DHCP trên hệ điều hành của bạn",
    "dhcp_title": "Máy chủ DHCP (thử nghiệm!)",
    "dhcp_description": "Nếu bộ định tuyến không trợ cài đặt DHCP, bạn có thể dùng máy chủ DHCP dựng sẵn của AdGuard",
    "dhcp_enable": "Bật máy chủ DHCP",
@@ -23,8 +19,6 @@
    "dhcp_static_leases": "Thuê DHCP tĩnh",
    "dhcp_leases_not_found": "Không tìm thấy DHCP cho thuê",
    "dhcp_config_saved": "Đã lưu cấu hình máy chủ DHCP",
-    "dhcp_ipv4_settings": "Cài đặt DHCP IPv4",
-    "dhcp_ipv6_settings": "Cài đặt DHCP IPv6",
    "form_error_required": "Trường bắt buộc",
    "form_error_ip4_format": "Định dạng IPv4 không hợp lệ",
    "form_error_ip6_format": "Định dạng IPv6 không hợp lệ",
@@ -33,7 +27,6 @@
    "form_error_client_id_format": "Định dạng client ID không hợp lệ",
    "form_error_positive": "Phải lớn hơn 0",
    "form_error_negative": "Phải lớn hơn hoặc bằng 0",
-    "range_end_error": "Phải lớn hơn khoảng bắt đầu",
    "dhcp_form_gateway_input": "Cổng IP",
    "dhcp_form_subnet_input": "Mặt nạ mạng con",
    "dhcp_form_range_title": "Phạm vi của địa chỉ IP",
@@ -58,26 +51,18 @@
    "dhcp_add_static_lease": "Thêm thuê tĩnh",
    "dhcp_reset": "Bạn có chắc chắn muốn đặt lại thiết lập DHCP?",
    "country": "Quốc gia",
-    "city": "Thành phố",
    "delete_confirm": "Bạn có chắc chắn muốn xóa \"{{key}}\" không?",
    "form_enter_hostname": "Nhập tên máy chủ",
    "error_details": "Chi tiết lỗi",
-    "response_details": "Chi tiết về phản hồi",
-    "request_details": "Chi tiết về yêu cầu",
-    "client_details": "Thông tin máy khách",
    "details": "Chi tiết",
    "back": "Quay lại",
    "dashboard": "Tổng quan",
    "settings": "Cài đặt",
    "filters": "Bộ lọc",
-    "filter": "Bộ lọc",
    "query_log": "Lịch sử truy vấn",
-    "compact": "Thu gọn",
-    "nothing_found": "Không tìm thấy",
    "faq": "Hỏi đáp",
    "version": "phiên bản",
    "address": "địa chỉ",
-    "protocol": "Giao thức",
    "on": "Đang bật",
    "off": "Đang tắt",
    "copyright": "Bản quyền",
@@ -100,8 +85,8 @@
    "no_domains_found": "Không có tên miền nào",
    "requests_count": "Số lần yêu cầu",
    "top_blocked_domains": "Tên miền chặn nhiều",
-    "top_clients": "Người dùng hàng đầu",
-    "no_clients_found": "Không có người dùng",
+    "top_clients": "Client dùng nhiều",
+    "no_clients_found": "Không có client nào",
    "general_statistics": "Thống kê chung",
    "number_of_dns_query_days": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
    "number_of_dns_query_days_plural": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
@@ -109,7 +94,7 @@
    "number_of_dns_query_blocked_24_hours": "Số yêu cầu DNS bị chặn bởi bộ lọc quảng cáo và danh sách chặn host",
    "number_of_dns_query_blocked_24_hours_by_sec": "Số yêu cầu DNS bị chặn bởi chế độ bảo vệ duyệt web AdGuard",
    "number_of_dns_query_blocked_24_hours_adult": "Số website người lớn đã chặn",
-    "enforced_save_search": "Bắt buộc tìm kiếm an toàn",
+    "enforced_save_search": "Tìm kiếm an toàn",
    "number_of_dns_query_to_safe_search": "Số yêu cầu DNS tới công cụ tìm kiếm đã chuyển thành tìm kiếm an toàn",
    "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",
@@ -124,16 +109,11 @@
    "no_servers_specified": "Không có máy chủ nào được liệt kê",
    "general_settings": "Cài đặt chung",
    "dns_settings": "Cài đặt DNS",
-    "dns_blocklists": "Danh sách chặn",
-    "dns_allowlists": "Danh sách cho phép",
-    "dns_blocklists_desc": "AdGuard Home sẽ chặn tên miền nằm trong danh sách bị chặn.",
-    "dns_allowlists_desc": "Tên miền nằm trong danh sách cho phép sẽ không bị chặn cho dù nó có nằm trong bất kì danh sách bị chặn nào.",
-    "custom_filtering_rules": "Bộ lọc tùy chỉnh",
    "encryption_settings": "Cài đặt mã hóa",
    "dhcp_settings": "Cài đặt DHCP",
    "upstream_dns": "Máy chủ DNS tìm kiếm",
+    "upstream_dns_hint": "Nếu bạn để trống mục này, AdGuard Home sẽ sử dụng <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> để tìm kiếm. Sử dụng tiền tố tls:// cho các máy chủ DNS dựa trên TLS.",
    "test_upstream_btn": "Kiểm tra",
-    "upstreams": "Nguồn",
    "apply_btn": "Áp dụng",
    "disabled_filtering_toast": "Đã tắt chặn quảng cáo",
    "enabled_filtering_toast": "Đã bật chặn quảng cáo",
@@ -145,33 +125,16 @@
    "enabled_save_search_toast": "Đã bật tìm kiếm an toàn",
    "enabled_table_header": "Kích hoạt",
    "name_table_header": "Tên",
-    "list_url_table_header": "URL bộ lọc",
+    "list_url_table_header": "Danh sách liên kết",
    "rules_count_table_header": "Số quy tắc",
-    "last_time_updated_table_header": "Cập nhật lần cuối",
+    "last_time_updated_table_header": "Cập nhật cuối",
    "actions_table_header": "Thao tác",
-    "request_table_header": "Yêu cầu",
    "edit_table_action": "Chỉnh sửa",
    "delete_table_action": "Xoá",
-    "elapsed": "Đã tốn",
    "filters_and_hosts_hint": "AdGuard home hiểu các quy tắc chặn quảng cáo đơn giản và cú pháp file hosts",
-    "no_blocklist_added": "Chưa có danh sách chặn được thêm vào",
-    "no_whitelist_added": "Chưa có danh sách cho phép được thêm vào",
-    "add_blocklist": "Thêm danh sách",
-    "add_allowlist": "Thêm danh sách",
    "cancel_btn": "Huỷ",
    "enter_name_hint": "Nhập tên",
-    "enter_url_or_path_hint": "Nhập địa chỉ hoặc đường dẫn tới danh sách",
    "check_updates_btn": "Kiểm tra cập nhật",
-    "new_blocklist": "Danh sách chặn mới",
-    "new_allowlist": "Danh sách cho phép mới",
-    "edit_blocklist": "Chỉnh sửa danh sách chặn",
-    "edit_allowlist": "Chỉnh sửa danh sách cho phép",
-    "choose_blocklist": "Chọn danh sách chặn",
-    "choose_allowlist": "Chọn danh sách cho phép",
-    "enter_valid_blocklist": "Điền địa chỉ URL của danh sách chặn.",
-    "enter_valid_allowlist": "Điề địa chỉ URL của danh sách cho phép.",
-    "form_error_url_format": "ĐỊnh dạng URL không hợp lệ",
-    "form_error_url_or_path_format": "Định dạng URL hoặc đường dẫn tới danh sách không hợp lệ",
    "custom_filter_rules": "Quy tắc lọc tuỳ chỉnh",
    "custom_filter_rules_hint": "Nhập mỗi quy tắc 1 dòng. Có thể sử dụng quy tắc chặn quảng cáo hoặc cú pháp file host",
    "examples_title": "Ví dụ",
@@ -187,38 +150,34 @@
    "example_upstream_doh": "được mã hoá <0>DNS-over-HTTPS</0>",
    "example_upstream_sdns": "bạn có thể sử dụng <0>DNS Stamps</0> for <1>DNSCrypt</1> hoặc <2>DNS-over-HTTPS</2> ",
    "example_upstream_tcp": "DNS thông thường(dùng TCP)",
-    "all_lists_up_to_date_toast": "Tất cả danh sách đã ở phiên bản mới nhất",
    "updated_upstream_dns_toast": "Đã cập nhật máy chủ DNS tìm kiếm",
    "dns_test_ok_toast": "Máy chủ DNS có thể sử dụng",
    "dns_test_not_ok_toast": "Máy chủ \"\"': không thể sử dụng, vui lòng kiểm tra lại",
    "unblock": "Bỏ chặn",
    "block": "Chặn",
    "time_table_header": "Thời gian",
-    "date": "Ngày",
    "domain_name_table_header": "Tên miền",
    "domain_or_client": "Tên miền hoặc khách hàng",
    "type_table_header": "Loại",
    "response_table_header": "Phản hồi",
-    "response_code": "Mã phản hồi",
-    "client_table_header": "Người dùng",
-    "empty_response_status": "Trống",
+    "client_table_header": "Người dùng cuối",
+    "empty_response_status": "Rỗng",
    "show_all_filter_type": "Hiện tất cả",
    "show_filtered_type": "Chỉ hiện đã lọc",
    "no_logs_found": "Không có lịch sử truy vấn",
    "refresh_btn": "Làm mới",
-    "previous_btn": "Trước",
+    "previous_btn": "Trang trước",
    "next_btn": "Trang sau",
    "loading_table_status": "Đang tải...",
    "page_table_footer_text": "Trang",
    "rows_table_footer_text": "hàng",
-    "updated_custom_filtering_toast": "Đã cập nhật bộ lọc tùy chỉnh",
-    "rule_removed_from_custom_filtering_toast": "Quy tắc đã được xoá khỏi quy tắc lọc tuỳ chỉnh {{rule}}",
-    "rule_added_to_custom_filtering_toast": "Quy tắc đã được thêm vào quy tắc lọc tuỳ chỉnh: {{rule}}",
+    "updated_custom_filtering_toast": "Đã cập nhật quy tắc lọc tuỳ chỉnh",
+    "rule_removed_from_custom_filtering_toast": "Quy tắc đã được xoá khỏi quy tắc lọc tuỳ chỉnh",
+    "rule_added_to_custom_filtering_toast": "Quy tắc đã được thêm vào quy tắc lọc tuỳ chỉnh",
    "query_log_response_status": "Trạng thái: {{value}}",
    "query_log_filtered": "Được lọc bởi {{filter}}",
    "query_log_confirm_clear": "Bạn có chắc chắn muốn xóa toàn bộ nhật ký truy vấn không?",
    "query_log_cleared": "Nhật ký truy vấn đã được xóa thành công",
-    "query_log_updated": "Cập nhật thành công nhật kí truy xuất",
    "query_log_clear": "Xóa nhật ký truy vấn",
    "query_log_retention": "Lưu giữ nhật ký truy vấn",
    "query_log_enable": "Bật nhật ký",
@@ -229,36 +188,24 @@
    "anonymize_client_ip": "Ẩn danh IP khách",
    "anonymize_client_ip_desc": "Không lưu địa chỉ IP đầy đủ của khách hàng trong nhật ký và thống kê",
    "dns_config": "Thiết lập máy chủ DNS",
-    "dns_cache_config": "Cấu hình cache DNS",
-    "dns_cache_config_desc": "Bạn có thể cấu hình cache cho DNS tại đây",
    "blocking_mode": "Chế độ chặn",
-    "default": "Mặc định",
    "nxdomain": "NXDOMAIN",
    "null_ip": "Địa chỉ IP rỗng",
    "custom_ip": "IP tuỳ chỉnh",
    "blocking_ipv4": "Chặn IPv4",
    "blocking_ipv6": "Chặn IPv6",
-    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_tls": "DNS-over-TLS",
-    "plain_dns": "DNS thuần",
    "form_enter_rate_limit": "Nhập giới hạn yêu cầu",
    "rate_limit": "Giới hạn yêu cầu",
-    "edns_enable": "Bật mạng con EDNS Client",
    "edns_cs_desc": "Nếu được bật, AdGuard Home sẽ gửi các mạng con của khách hàng đến các máy chủ DNS.",
+    "rate_limit_desc": "Số lượng yêu cầu mỗi giây mà một khách hàng được phép thực hiện (0: không giới hạn)",
    "blocking_ipv4_desc": "Địa chỉ IP được trả lại cho một yêu cầu A bị chặn",
-    "blocking_ipv6_desc": "Địa chỉ IP được trả lại cho một yêu cầu AAA bị chặn",
-    "blocking_mode_nxdomain": "NXDOMAIN: Phản hổi với mã NXDOMAIN",
-    "blocking_mode_null_ip": "Null IP: Trả lời bằng không địa chỉ IP (0.0.0.0 cho A; :: cho AAAA)",
-    "blocking_mode_custom_ip": "IP tùy chỉnh: Phản hồi với địa chỉ IP đã được tiết lập",
-    "upstream_dns_client_desc": "Nếu để trống trường này, AdGuardHome sẽ sử dụng nhũng máy chủ được cấu hình ở <0>Cấu hình DNS</0>.",
-    "tracker_source": "Nguồn theo dõi",
+    "blocking_mode_default": "Mặc định: Trả lời với NXDOMAIN khi bị chặn bởi quy tắc kiểu Adblock; phản hồi với địa chỉ IP được chỉ định trong quy tắc khi bị chặn bởi quy tắc / etc / hosts-style",
    "source_label": "Nguồn",
    "found_in_known_domain_db": "Tìm thấy trong cơ sở dữ liệu tên miền",
    "category_label": "Thể loại",
    "rule_label": "Quy tắc",
    "list_label": "Danh sách",
    "unknown_filter": "Bộ lọc không rõ {{filterId}}",
-    "known_tracker": "Theo dõi đã biết",
    "install_welcome_title": "Chào mừng bạn đến với AdGuard Home!",
    "install_welcome_desc": "AdGuard Home là một máy chủ DNS chặn quảng cáo và theo dõi trên toàn mạng. Mục đích của nó là cho phép bạn kiểm soát toàn bộ mạng và tất cả các thiết bị của mình và không yêu cầu sử dụng chương trình phía máy khách.",
    "install_settings_title": "Giao Diện Web Quản Trị",
@@ -287,7 +234,6 @@
    "install_devices_router_list_1": "Mở các tùy chọn cho bộ định tuyến của bạn. Thông thường, bạn có thể truy cập nó từ trình duyệt của mình thông qua một URL (như http://192.168.0.1/ hoặc http://192.168.1.1/). Bạn có thể được yêu cầu nhập mật khẩu. Nếu bạn không nhớ nó, bạn có thể thường xuyên đặt lại mật khẩu bằng cách nhấn một nút trên chính bộ định tuyến. Một số bộ định tuyến yêu cầu một ứng dụng cụ thể, trong trường hợp đó nên được cài đặt trên máy tính/điện thoại của bạn.",
    "install_devices_router_list_2": "Tìm cài đặt DHCP/DNS. Tìm các chữ cái DNS bên cạnh một trường cho phép hai hoặc ba bộ số, mỗi bộ được chia thành bốn nhóm từ một đến ba chữ số.",
    "install_devices_router_list_3": "Nhập địa chỉ máy chủ AdGuard Home của bạn ở đó.",
-    "install_devices_router_list_4": "Bạn không thể đặt máy chủ DNS tùy chỉnh trên một số loại bộ định tuyến. Trong trường hợp này, có thể hữu ích nếu bạn thiết lập AdGuard Home làm <0> máy chủ DHCP </0>. Nếu không, bạn nên tìm kiếm hướng dẫn về cách tùy chỉnh máy chủ DNS cho kiểu bộ định tuyến cụ thể của mình.",
    "install_devices_windows_list_1": "Mở Control Panel thông qua Trình đơn Bắt đầu hoặc Tìm kiếm Windows.",
    "install_devices_windows_list_2": "Chuyển đến danh mục Mạng và Internet, sau đó đến Trung tâm Mạng và Chia sẻ.",
    "install_devices_windows_list_3": "Ở bên trái màn hình, tìm Thay đổi cài đặt bộ điều hợp và nhấp vào nó.",
@@ -309,8 +255,8 @@
    "install_devices_ios_list_4": "Trong trường DNS nhập địa chỉ máy chủ AdGuard Home của bạn.",
    "get_started": "Bắt Đầu",
    "next": "Tiếp",
-    "open_dashboard": "Mở bảng điều khiển",
-    "install_saved": "Lưu thành công",
+    "open_dashboard": "Mở Bảng Điều Khiển",
+    "install_saved": "Đã lưu thành công",
    "encryption_title": "Mã hóa",
    "encryption_desc": "Hỗ trợ mã hóa (HTTPS/TLS) cho cả giao diện web quản trị viên và DNS",
    "encryption_config_saved": "Đã lưu cấu hình mã hóa",
@@ -323,7 +269,7 @@
    "encryption_https_desc": "Nếu cổng HTTPS được định cấu hình, giao diện quản trị viên AdGuard Home sẽ có thể truy cập thông qua HTTPS và nó cũng sẽ cung cấp DNS-over-HTTPS trên vị trí '/dns-query'.",
    "encryption_dot": "Cổng DNS-over-TLS",
    "encryption_dot_desc": "Nếu cổng này được định cấu hình, AdGuard Home sẽ chạy máy chủ DNS-over-TLS trên cổng này.",
-    "encryption_certificates": "Chứng chỉ",
+    "encryption_certificates": "Giấy chứng nhận",
    "encryption_certificates_desc": "Để sử dụng mã hóa, bạn cần cung cấp chuỗi chứng chỉ SSL hợp lệ cho miền của mình. Bạn có thể nhận chứng chỉ miễn phí trên <0>{{link}}</0> hoặc bạn có thể mua chứng chỉ từ một trong các Cơ Quan Chứng Nhận tin cậy.",
    "encryption_certificates_input": "Sao chép/dán chứng chỉ được mã hóa PEM của bạn tại đây.",
    "encryption_status": "Trạng thái",
@@ -332,8 +278,8 @@
    "encryption_key_input": "Sao chép/dán khóa riêng được mã hóa PEM cho chứng chỉ của bạn tại đây.",
    "encryption_enable": "Kích Hoạt Mã Hóa (HTTPS, DNS-over-HTTPS và DNS-over-TLS)",
    "encryption_enable_desc": "Nếu mã hóa được bật, giao diện quản trị viên AdGuard Home sẽ hoạt động trên HTTPS và máy chủ DNS sẽ lắng nghe các yêu cầu qua DNS-over-HTTPS và DNS-over-TLS.",
-    "encryption_chain_valid": "Chứng chỉ hợp lệ",
-    "encryption_chain_invalid": "Chứng chỉ không hợp lệ",
+    "encryption_chain_valid": "Chuỗi chứng chỉ hợp lệ",
+    "encryption_chain_invalid": "Chuỗi chứng chỉ không hợp lệ",
    "encryption_key_valid": "Đây là khóa riêng {{type}} hợp lệ",
    "encryption_key_invalid": "Đây là khóa riêng {{type}} không hợp lệ",
    "encryption_subject": "Chủ đề",
@@ -356,7 +302,7 @@
    "fix": "Sửa",
    "dns_providers": "Dưới đây là một <0>danh sách của các nhà cung cấp DNS đã biết</0> để lựa chọn.",
    "update_now": "Cập nhật ngay",
-    "update_failed": "Tự động cập nhật thất bại. Vui lòng <a>làm theo các bước</a> để cập nhật thủ công.",
+    "update_failed": "Tự động cập nhật thất bại. Vui lòng <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>làm theo các bước</a> để cập nhật thủ công.",
    "processing_update": "Xin vui lòng chờ, AdGuard Home đang được cập nhật",
    "clients_title": "Máy khách",
    "clients_desc": "Định cấu hình thiết bị được kết nối với AdGuard Home",
@@ -376,14 +322,12 @@
    "form_enter_id": "Nhập định danh",
    "form_add_id": "Thêm định danh",
    "form_client_name": "Nhập tên máy khách",
-    "name": "Tên",
    "client_global_settings": "Sử dụng cài đặt toàn cầu",
    "client_deleted": "Máy khách \"{{key}}\" đã xóa thành công",
    "client_added": "Máy khách \"{{key}}\" đã thêm thành công",
    "client_updated": "Máy khách \"{{key}}\" đã cập nhật thành công",
    "clients_not_found": "Không tìm thấy máy khách",
    "client_confirm_delete": "Bạn có chắc chắn muốn xóa máy khách \"{{key}}\" không?",
-    "list_confirm_delete": "Bạn có muốn xóa bộ lọc này?",
    "auto_clients_title": "Máy khách (thời gian chạy)",
    "auto_clients_desc": "Dữ liệu trên các máy khách sử dụng AdGuard Home, nhưng không được lưu trong cấu hình",
    "access_title": "Cài đặt truy cập",
@@ -421,7 +365,6 @@
    "rewrite_confirm_delete": "Bạn có chắc chắn muốn xóa DNS viết lại cho \"{{key}}\" không?",
    "rewrite_desc": "Cho phép dễ dàng định cấu hình tùy chỉnh DNS phản hồi cho một tên miền cụ thể.",
    "rewrite_applied": "Đã áp dụng quy tắc Viết lại",
-    "rewrite_hosts_applied": "Viết lại bởi quy tắc tệp máy chủ",
    "dns_rewrites": "DNS viết lại",
    "form_domain": "Nhập tên miền",
    "form_answer": "Nhập địa chỉ IP hoặc tên miền",
@@ -450,9 +393,7 @@
    "interval_days_plural": "{{count}} ngày",
    "domain": "Tên miền",
    "answer": "Trả lời",
-    "filter_added_successfully": "Thêm bộ lọc thành công",
-    "filter_removed_successfully": "Xóa bộ lọc thành công",
-    "filter_updated": "Cập nhật bộ lọc thành công",
+    "filter_added_successfully": "Bộ lọc đã được thêm thành công",
    "statistics_configuration": "Cấu hình thống kê",
    "statistics_retention": "Duy trì thống kê",
    "statistics_retention_desc": "Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
@@ -477,89 +418,31 @@
    "location": "Vị trí",
    "orgname": "Tên tổ chức",
    "netname": "Tên mạng",
-    "network": "Mạng",
    "descr": "Mô tả",
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Tìm hiểu thêm</0> về việc tạo danh sách chặn máy chủ của riêng bạn.",
    "blocked_by_response": "Chặn bởi CNAME hoặc địa IP ở phản hồi",
-    "blocked_by_cname_or_ip": "Đã bị chặn bởi CNAME hoặc IP",
    "try_again": "Hãy thử lại",
-    "domain_desc": "Nhập tên miền hoặc ký tự đại diện mà bạn muốn được viết lại.",
-    "example_rewrite_domain": "chỉ viết lại phản hồi cho tên miền này.",
-    "example_rewrite_wildcard": "viết lại câu trả lời cho tất cả các tên miền phụ <0> example.org </0>.",
-    "rewrite_ip_address": "Địa chỉ IP: sử dụng IP này trong phản hồi A hoặc AAAA",
-    "rewrite_domain_name": "Tên miền: thêm bản ghi CNAME",
-    "rewrite_A": "<0>A</0>: giá trị đặc biệt, giữ bản ghi <0>A</0> từ nguồn",
-    "rewrite_AAAA": "<0>A</0>: giá trị đặc biệt, giữ bản ghi <0>A</0> từ nguồn",
-    "disable_ipv6": "Tắt IPv6",
-    "disable_ipv6_desc": "Nếu tính năng này được bật, tất cả các truy vấn DNS cho địa chỉ IPv6 (loại AAAA) sẽ bị loại bỏ.",
-    "fastest_addr": "Địa chỉ IP nhanh nhất",
    "fastest_addr_desc": "Truy vấn tất cả các máy chủ DNS và trả về địa chỉ IP nhanh nhất trong số tất cả các phản hồi",
    "autofix_warning_text": "Nếu bạn nhấp vào \"Khắc phục\", AdGuard Home sẽ định cấu hình hệ thống của bạn để sử dụng máy chủ DNS của AdGuard Home.",
-    "autofix_warning_list": "Nó sẽ thực hiện các tác vụ sau: <0> Hủy kích hoạt hệ thống DNSStubListener </0> <0> Đặt địa chỉ máy chủ DNS thành 127.0.0.1 </0> <0> Thay thế mục tiêu liên kết tượng trưng của /etc/resolv.conf bằng / run / systemd /resolve/resolv.conf </0> <0> Dừng DNSStubListener (tải lại dịch vụ do hệ thống phân giải) </0>",
    "autofix_warning_result": "Do đó, tất cả các yêu cầu DNS từ hệ thống của bạn sẽ được AdGuard Home xử lý theo mặc định.",
    "tags_title": "Thẻ",
    "tags_desc": "Bạn có thể chọn các thẻ tương ứng với khách hàng. Thẻ có thể được bao gồm trong các quy tắc lọc và cho phép bạn áp dụng chúng chính xác hơn. <0>Tìm hiểu thêm</0>",
    "form_select_tags": "Chọn thẻ khách hàng",
    "check_title": "Kiểm tra bộ lọc",
-    "check_desc": "Kiểm tra xem tên miền có tồn tại trong các bộ lọc không",
+    "check_desc": "Kiểm tra xem tên máy chủ có được lọc không",
    "check": "Kiểm tra",
-    "form_enter_host": "Nhập tên máy chủ",
-    "filtered_custom_rules": "Được lọc bởi các quy tắc lọc tùy chỉnh",
-    "choose_from_list": "Chọn từ danh sách",
-    "add_custom_list": "Thêm bộ lọc tùy chọn",
-    "host_whitelisted": "Trang đã được thêm vào danh sách được cho phép",
    "check_ip": "Địa chỉ IP: {{ip}}",
-    "check_cname": "CNAME: {{cname}}",
-    "check_reason": "Lý do: {{reason}}",
    "check_rule": "Quy tắc: {{rule}}",
-    "check_service": "Tên dịch vụ: {{service}}",
    "check_not_found": "Không tìm thấy trong danh sách bộ lọc của bạn",
-    "client_confirm_block": "Bạn có muốn chặn người dùng {{ip}}?",
-    "client_confirm_unblock": "Bạn có muốn bỏ chặn người dùng {{ip}}?",
-    "client_blocked": "Đã chặn người dùng {{ip}}",
-    "client_unblocked": "Đã bỏ chặn người dùng {{ip}}",
    "static_ip": "Địa chỉ IP tĩnh",
-    "static_ip_desc": "AdGuard Home là một máy chủ nên nó cần một địa chỉ IP tĩnh để hoạt động bình thường. Nếu không, tại một số thời điểm, bộ định tuyến của bạn có thể gán một địa chỉ IP khác cho thiết bị này.",
-    "set_static_ip": "Thiết lập địa chỉ IP tĩnh",
-    "install_static_ok": "Địa chỉ IP tĩnh đã được thiết lập",
-    "install_static_error": "AdGuard Home không thể cấu hình tự động cho giao diện mạng này. Vui lòng tìm hướng dẫn về cách thực hiện việc này theo cách thủ công.",
-    "install_static_configure": "Chúng tôi đã phát hiện thấy rằng một địa chỉ IP động được sử dụng - <0> {{ip}} </0>. Bạn có muốn sử dụng nó làm địa chỉ tĩnh của mình không?",
-    "confirm_static_ip": "AdGuard Home sẽ lấy {{ip}} làm địa chỉ IP tĩnh. Bạn có muốn tiếp tục?",
-    "list_updated": "Đã cập nhật {{count}} bộ lọc",
-    "list_updated_plural": "Đã cập nhật {{count}} bộ lọc",
    "dnssec_enable": "Bật DNSSEC",
    "dnssec_enable_desc": "Cắm mốc DNSSEC trong các truy vấn DNS sắp tới và kiểm tra kết quả (buộc phải có trình sửa lỗi hỗ trợ DNSSEC)",
-    "validated_with_dnssec": "Xác thực bỏi DNSSEC",
-    "all_queries": "Tất cả truy vấn",
    "show_blocked_responses": "Bị chặn",
    "show_whitelisted_responses": "Đã thêm vào danh sách cho phép",
    "show_processed_responses": "Đã xử lý",
-    "blocked_safebrowsing": "Chặn bởi Safebrowsing",
    "blocked_adult_websites": "Website người lớn đã chặn",
    "blocked_threats": "Mối nguy hiểm đã chặn",
    "allowed": "Được phép",
-    "filtered": "Đã lọc",
-    "rewritten": "Đã viết lại",
-    "safe_search": "Tìm kiếm an toàn",
-    "blocklist": "Danh sách chặn",
-    "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",
-    "filter_category_other": "Khác",
-    "filter_category_general_desc": "Bộ lọc chặn quảng cáo và theo dõi cho hầu hết các thiết bị",
-    "filter_category_security_desc": "Bộ lọc chuyên biệt chặn tên miền chứa mã độc và lừa đảo",
-    "filter_category_regional_desc": "Bộ lọc tập trung vào từng khu vực",
-    "filter_category_other_desc": "Bộ lọc chặn khác",
-    "setup_config_to_enable_dhcp_server": "Thiết lập cấu hình để bật máy chủ DHCP",
-    "original_response": "Phản hồi gốc",
-    "click_to_view_queries": "Nhấp để xem truy xuất",
-    "port_53_faq_link": "Cổng 53 thường được sử dụng \"DNSStubListener\" hoặc \"systemd-resolved\". Vui lòng đọc <0>hướng dẫn</0> để giải quyết vấn đề này."
+    "safe_search": "Tìm kiếm an toàn"
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -11,8 +11,6 @@
    "save_config": "保存配置",
    "enabled_dhcp": "DHCP 服务器已启用",
    "disabled_dhcp": "DHCP 服务器已禁用",
-    "unavailable_dhcp": "DHCP 无法使用",
-    "unavailable_dhcp_desc": "AdGuard Home 无法在您的操作系统上运行 DHCP 服务器",
    "dhcp_title": "DHCP 服务器（实验性）",
    "dhcp_description": "如果你的路由器没有提供 DHCP （动态主机配置协议）设置，你可以使用 AdGuard 内置的 DHCP 服务器。",
    "dhcp_enable": "启用 DHCP 服务器",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "DHCP 静态租约",
    "dhcp_leases_not_found": "未找到 DHCP 租约",
    "dhcp_config_saved": "已保存 DHCP 服务器配置",
-    "dhcp_ipv4_settings": "DHCP IPv4设置",
-    "dhcp_ipv6_settings": "DHCP IPv6设置",
    "form_error_required": "必填字段",
    "form_error_ip4_format": "无效的 IPv4 格式",
    "form_error_ip6_format": "无效的 IPv6 格式",
@@ -33,7 +29,6 @@
    "form_error_client_id_format": "无效的客户端 ID 格式",
    "form_error_positive": "必须大于 0",
    "form_error_negative": "必须大于等于 0",
-    "range_end_error": "必须大于范围起始值",
    "dhcp_form_gateway_input": "网关 IP",
    "dhcp_form_subnet_input": "子网掩码",
    "dhcp_form_range_title": "IP 地址范围",
@@ -132,8 +127,7 @@
    "encryption_settings": "加密设置",
    "dhcp_settings": "DHCP 设置",
    "upstream_dns": "上游 DNS 服务器",
-    "upstream_dns_help": "每行输入一个服务器地址。<a>了解更多</a>关于配置上游DNS服务器的内容",
-    "upstream_dns_configured_in_file": "配置路径{{path}}",
+    "upstream_dns_hint": "如果此处留空，AdGuard Home 将会使用 <a href='https://www.quad9.net/' target='_blank'>Quad9</a> 作为上游。",
    "test_upstream_btn": "测试上游 DNS",
    "upstreams": "上游服务器",
    "apply_btn": "应用",
@@ -187,7 +181,6 @@
    "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_sdns": "你可以使用 <1>DNSCrypt</1> 的 <0>DNS Stamps</0> 或者 <2>DNS-over-HTTPS</2> 解析器",
    "example_upstream_tcp": "常规 DNS（基于 TCP ）",
    "all_lists_up_to_date_toast": "所有列表都是最新的",
@@ -196,10 +189,6 @@
    "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": "域名",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "页",
    "rows_table_footer_text": "行",
    "updated_custom_filtering_toast": "自定义过滤规则已更新",
-    "rule_removed_from_custom_filtering_toast": "规则已从自定义过滤规则列表中移除 {{rule}}",
-    "rule_added_to_custom_filtering_toast": "规则已添加到自定义过滤规则列表中 {{rule}}",
+    "rule_removed_from_custom_filtering_toast": "规则已从自定义过滤规则列表中移除",
+    "rule_added_to_custom_filtering_toast": "规则已添加到自定义过滤规则列表中",
    "query_log_response_status": "状态： {{value}}",
    "query_log_filtered": "被 {{filter}} 过滤",
    "query_log_confirm_clear": "你确定想要清除全部查询日志吗？",
@@ -241,7 +230,6 @@
    "blocking_mode": "拦截模式",
    "default": "默认",
    "nxdomain": "无效域名",
-    "refused": "REFUSED",
    "null_ip": "无效 IP",
    "custom_ip": "自定义 IP",
    "blocking_ipv4": "拦截 IPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "速度限制",
    "edns_enable": "使用客户端的子网地址（EDNS)",
    "edns_cs_desc": "启用后AdGuard Home将会向DNS服务器发送客户端的子网地址进行查询",
-    "rate_limit_desc": "每个客户端每秒钟查询次数的限制 (设置为 0 意味着不限制)",
+    "rate_limit_desc": "每个客户端每秒钟查询次数的限制 (0：不限制)",
    "blocking_ipv4_desc": "拦截 A 记录请求返回的 IP 地址",
    "blocking_ipv6_desc": "拦截 AAAA 记录请求返回的 IP 地址",
-    "blocking_mode_default": "默认：被Adblock规则拦截时以REFUSED码响应；被/etc/hosts规则拦截时返回规则中指定IP",
-    "blocking_mode_refused": "REFUSED：以 REFUSED 码响应请求",
+    "blocking_mode_default": "默认：被Adblock规则拦截时以NXDOMAIN码响应；被/etc/hosts规则拦截时返回规则中指定IP",
    "blocking_mode_nxdomain": "NXDOMAIN：以NXDOMAIN码响应",
    "blocking_mode_null_ip": "空IP：以零IP地址响应(A记录 0.0.0.0；AAAA记录 ::)",
    "blocking_mode_custom_ip": "自定IP：以手动设置的IP地址响应",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "如果配置了 HTTPS 端口，AdGuard Home 管理界面将可以通过 HTTPS 访问，它还将在在 '/dns-query' 位置提供 DNS-over-HTTPS 。",
    "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 格式编码的证书复制粘贴到此处。",
@@ -369,7 +354,7 @@
    "fix": "修复",
    "dns_providers": "此为可从中选择的<0>已知 DNS 提供商列表</0>。",
    "update_now": "立即更新",
-    "update_failed": "自动更新失败。请<a>跟随这些步骤</a>以手动更新。",
+    "update_failed": "自动更新失败。请<a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>跟随这些步骤</a>以手动更新。",
    "processing_update": "正在更新 AdGuard Home，请稍侯",
    "clients_title": "客户端",
    "clients_desc": "配置已连接到 AdGuard Home 的设备",
@@ -564,9 +549,10 @@
    "enter_cache_size": "输入缓存大小",
    "enter_cache_ttl_min_override": "输入最小TTL值",
    "enter_cache_ttl_max_override": "输入最大TTL值",
-    "cache_ttl_min_override_desc": "覆盖从上游服务器接收到的 TTL 值 (最小值)",
+    "cache_ttl_min_override_desc": "覆盖从上游服务器接收到的TTL值 (最小)。这个值不能超过3600秒(1小时)",
    "cache_ttl_max_override_desc": "覆盖从上游服务器接收到的TTL值(最大)",
-    "ttl_cache_validation": "最小缓存TTL值必须小于或等于最大值",
+    "min_exceeds_max_value": "最小值超过最大值",
+    "value_not_larger_than": "值不能大于{{maximum}}",
    "filter_category_general": "常规",
    "filter_category_security": "安全",
    "filter_category_regional": "区域",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "专用于拦截恶意软件、钓鱼或欺诈域名的列表",
    "filter_category_regional_desc": "专注于区域广告和跟踪服务器的列表",
    "filter_category_other_desc": "其他阻止列表",
-    "setup_config_to_enable_dhcp_server": "设置配置以启用DHCP服务器",
    "original_response": "原始响应",
    "click_to_view_queries": "点击查看查询",
-    "port_53_faq_link": "53端口常被DNSStubListener或systemdn解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>",
-    "adg_will_drop_dns_queries": "AdGuard Home 会终止所有来自此客户端的DNS查询。",
-    "experimental": "实验性的"
+    "port_53_faq_link": "53端口常被DNSStubListener或systemdn解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>"
 }
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -1,574 +0,0 @@
-{
-    "client_settings": "用戶端設定",
-    "example_upstream_reserved": "您可以<0>指定網域</0>使用特定 DNS 查詢",
-    "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來來加速解析結果",
-    "parallel_requests": "平行處理",
-    "load_balancing": "負載平衝",
-    "load_balancing_desc": "一次只查詢一個伺服器。AdGuard Home 會使用加權隨機取樣來選擇使用的查詢結果，以確保速度最快的伺服器能被充分運用。",
-    "bootstrap_dns": "引導（Boostrap） DNS 伺服器",
-    "bootstrap_dns_desc": "引導（Bootstrap）DNS 伺服器用來解析 DoH/DoT 的域名 IP。",
-    "check_dhcp_servers": "檢查 DHCP 伺服器",
-    "save_config": "儲存設定",
-    "enabled_dhcp": "DHCP 伺服器已啟動",
-    "disabled_dhcp": "DHCP 伺服器已關閉",
-    "unavailable_dhcp": "DHCP 無法使用",
-    "unavailable_dhcp_desc": "AdGuard Home 無法在您的作業系統上運行 DHCP 伺服器",
-    "dhcp_title": "DHCP 伺服器（實驗性功能！）",
-    "dhcp_description": "如果你的路由器沒有提供 DHCP 設定，您可以使用 AdGuard 內建的 DHCP 伺服器。",
-    "dhcp_enable": "開啟 DHCP 伺服器",
-    "dhcp_disable": "關閉 DHCP 伺服器",
-    "dhcp_not_found": "您可以安全地啟用內建 DHCP 伺服器 - 在目前網路中沒有找到任何有效的 DHCP 伺服器。但我們依舊建議您手動再次檢查，因為目前我們的自動檢測並不能確定 100% 準確",
-    "dhcp_found": "在目前網段中有正在運作的 DHCP 伺服器，開啟內建 DHCP 伺服器是不安全的。",
-    "dhcp_leases": "DHCP 租用",
-    "dhcp_static_leases": "DHCP 靜態租用",
-    "dhcp_leases_not_found": "找不到 DHCP 租約",
-    "dhcp_config_saved": "DHCP 設定已儲存",
-    "dhcp_ipv4_settings": "DHCP IPv4 設定",
-    "dhcp_ipv6_settings": "DHCP IPv6 設定",
-    "form_error_required": "必要欄位",
-    "form_error_ip4_format": "無效的 IPv4 格式",
-    "form_error_ip6_format": "無效的 IPv6 格式",
-    "form_error_ip_format": "無效的 IP 格式",
-    "form_error_mac_format": "無效的 「MAC 位址」格式",
-    "form_error_client_id_format": "無效的「客戶端 ID」格式",
-    "form_error_positive": "數值必須大於 0",
-    "form_error_negative": "數值必須大於等於 0",
-    "range_end_error": "必須大於起始值",
-    "dhcp_form_gateway_input": "閘道 IP 位址",
-    "dhcp_form_subnet_input": "子網路遮罩",
-    "dhcp_form_range_title": "IP 位址範圍",
-    "dhcp_form_range_start": "範圍開始",
-    "dhcp_form_range_end": "範圍結束",
-    "dhcp_form_lease_title": "DHCP 租用時間（以秒為單位）",
-    "dhcp_form_lease_input": "租用時間長度",
-    "dhcp_interface_select": "選擇 DHCP 使用的網路介面",
-    "dhcp_hardware_address": "硬體位址",
-    "dhcp_ip_addresses": "IP 位址",
-    "ip": "IP",
-    "dhcp_table_hostname": "主機名稱",
-    "dhcp_table_expires": "到期",
-    "dhcp_warning": "如果無論如何您都想要啟動 AdGuard 內建 DHCP 伺服器，請先確保同一網路下沒有正在運作的 DHCP 伺服器，否則很有可能會破壞其他已連線至網際網路的裝置。",
-    "dhcp_error": "無法偵測到同一網路下使否有其他 DHCP 伺服器。",
-    "dhcp_static_ip_error": "使用 DHCP 伺服器必須先指定靜態 IP 位置給 AdGuard。無法偵測到有效的靜態 IP 設定，請先手動設定。",
-    "dhcp_dynamic_ip_found": "您的網路介面  <0>{{interfaceName}}</0> 正在使用動態 IP，要使用 DHCP 伺服器必須指定靜態 IP 給 AdGuard。\n目前您的 IP 位址  <0>{{ipAddress}}</0>，啟用 DHCP 後此 IP 將自動設定為靜態 IP 位址。",
-    "dhcp_lease_added": "靜態租用 \"{{key}}\" 已新增成功",
-    "dhcp_lease_deleted": "靜態租用 \"{{key}}\" 已刪除成功",
-    "dhcp_new_static_lease": "新增靜態租用",
-    "dhcp_static_leases_not_found": "找不到 DHCP 靜態租用",
-    "dhcp_add_static_lease": "新增靜態租用",
-    "dhcp_reset": "您確定要重設 DHCP 設定嗎？",
-    "country": "國家",
-    "city": "城市",
-    "delete_confirm": "您確定要刪除「{{key}}」嗎？",
-    "form_enter_hostname": "請輸入主機名稱",
-    "error_details": "錯誤詳細資料",
-    "response_details": "回應詳細資料",
-    "request_details": "請求詳細資料",
-    "client_details": "用戶端詳細資料",
-    "details": "詳細資料",
-    "back": "返回",
-    "dashboard": "儀表板",
-    "settings": "設定",
-    "filters": "過濾器",
-    "filter": "過濾器",
-    "query_log": "查詢記錄",
-    "compact": "精簡",
-    "nothing_found": "沒有結果",
-    "faq": "常見問題",
-    "version": "版本",
-    "address": "位址",
-    "protocol": "協定",
-    "on": "運作中",
-    "off": "未運作",
-    "copyright": "版權",
-    "homepage": "首頁",
-    "report_an_issue": "回報問題",
-    "privacy_policy": "隱私政策",
-    "enable_protection": "開啟保護",
-    "enabled_protection": "已開啟保護",
-    "disable_protection": "停用防護",
-    "disabled_protection": "已停用防護",
-    "refresh_statics": "重新整理統計資料",
-    "dns_query": "DNS 查詢",
-    "blocked_by": "<0>被過濾器封鎖</0>",
-    "stats_malware_phishing": "已封鎖惡意軟體/網路釣魚",
-    "stats_adult": "已封鎖成人網站",
-    "stats_query_domain": "熱門查詢網域排行",
-    "for_last_24_hours": "過去 24 小時",
-    "for_last_days": "最近 {{count}} 天內",
-    "for_last_days_plural": "最近 {{count}} 天內",
-    "no_domains_found": "找不到網域",
-    "requests_count": "查詢次數",
-    "top_blocked_domains": "熱門封鎖網域排行",
-    "top_clients": "熱門用戶端排行",
-    "no_clients_found": "找不到用戶端",
-    "general_statistics": "一般統計資料",
-    "number_of_dns_query_days": "過去 {{count}} 天內 DNS 查詢總數",
-    "number_of_dns_query_days_plural": "過去 {{count}} 天內 DNS 查詢總數",
-    "number_of_dns_query_24_hours": "過去 24小時內 DNS 查詢總數",
-    "number_of_dns_query_blocked_24_hours": "已被廣告過濾器與主機黑名單封鎖 DNS 查詢總數",
-    "number_of_dns_query_blocked_24_hours_by_sec": "已被 AdGuard 瀏覽安全模組封鎖的 DNS 查詢總數",
-    "number_of_dns_query_blocked_24_hours_adult": "已封鎖成人網站總數",
-    "enforced_save_search": "強制使用安全搜尋",
-    "number_of_dns_query_to_safe_search": "已強制使用安全搜尋總數",
-    "average_processing_time": "平均的處理時間",
-    "average_processing_time_hint": "處理 DNS 請求的平均時間(毫秒)",
-    "block_domain_use_filters_and_hosts": "使用過濾器與 hosts 檔案阻擋網域查詢",
-    "filters_block_toggle_hint": "您可在<a href='#filters'>過濾器</a>設定中設定封鎖規則。",
-    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
-    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查查詢網域是否在瀏覽安全服務黑名單內。它使用尊重個人隱私的 API 來進行檢查：會先透過 SHA256 將網域編碼後取簡短前置字串傳送到伺服器核對。",
-    "use_adguard_parental": "使用 AdGuard 家長監護功能",
-    "use_adguard_parental_hint": "AdGuard Home 將檢查查詢網域是否含有成人內容。它使用與 AdGuard 瀏覽安全一樣的尊重個人隱私的 API 來進行檢查。",
-    "enforce_safe_search": "強制使用安全搜尋",
-    "enforce_save_search_hint": "AdGuard Home 可在下列搜尋引擎使用強制安全搜尋：Google、YouTube、Bing、DuckDuckGo 和 Yandex。",
-    "no_servers_specified": "沒有指定的伺服器",
-    "general_settings": "一般設定",
-    "dns_settings": "DNS 設定",
-    "dns_blocklists": "DNS 黑名單",
-    "dns_allowlists": "DNS 白名單",
-    "dns_blocklists_desc": "AdGuard Home 會對符合規則的查詢進行封鎖。",
-    "dns_allowlists_desc": "在白名單內的網域無論如何都會被允許，即使他在其他黑名單內也一樣。",
-    "custom_filtering_rules": "自訂過濾規則",
-    "encryption_settings": "加密設定",
-    "dhcp_settings": "DHCP 設定",
-    "upstream_dns": "上游 DNS 伺服器",
-    "test_upstream_btn": "測試上游 DNS",
-    "upstreams": "上游",
-    "apply_btn": "套用",
-    "disabled_filtering_toast": "已停用過濾",
-    "enabled_filtering_toast": "已啟用過濾",
-    "disabled_safe_browsing_toast": "已停用安全瀏覽",
-    "enabled_safe_browsing_toast": "已啟用安全瀏覽",
-    "disabled_parental_toast": "已停用家長監護",
-    "enabled_parental_toast": "已啟用家長監護",
-    "disabled_safe_search_toast": "已停用安全搜尋",
-    "enabled_save_search_toast": "已啟用安全搜尋",
-    "enabled_table_header": "啟用",
-    "name_table_header": "名稱",
-    "list_url_table_header": "清單 URL 網址",
-    "rules_count_table_header": "規則總數",
-    "last_time_updated_table_header": "上次更新時間",
-    "actions_table_header": "動作",
-    "request_table_header": "請求",
-    "edit_table_action": "編輯",
-    "delete_table_action": "刪除",
-    "elapsed": "已耗用",
-    "filters_and_hosts_hint": "AdGuard Home 接受「adblock」以及「host檔案」語法。",
-    "no_blocklist_added": "沒有新增的黑名單",
-    "no_whitelist_added": "沒有新增的白名單",
-    "add_blocklist": "新增黑名單",
-    "add_allowlist": "新增白名單",
-    "cancel_btn": "取消",
-    "enter_name_hint": "輸入名稱",
-    "enter_url_or_path_hint": "請在列表中輸入 URL 網址或絕對路徑",
-    "check_updates_btn": "檢查更新",
-    "new_blocklist": "新增黑名單",
-    "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": "一行一條規則。您可以使用「adblock」語法或「hosts檔案」的語法。",
-    "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_comment": "! Here goes a comment",
-    "example_comment_meaning": "註解",
-    "example_comment_hash": "# Also a comment",
-    "example_regex_meaning": "使用正規表示式（Regular Expression）來阻止對應的網域查詢",
-    "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_sdns": "您可以使透過 <0>DNS Stamps</0> 來解析  <1>DNSCrypt</1> 或 <2>DNS-over-HTTPS</2>",
-    "example_upstream_tcp": "一般 DNS（透過 TCP）",
-    "all_lists_up_to_date_toast": "所有清單已經是最新的",
-    "updated_upstream_dns_toast": "已更新上游 DNS 伺服器",
-    "dns_test_ok_toast": "設定中的 DNS 上游運作正常",
-    "dns_test_not_ok_toast": "設定中的 \"{{key}}\" DNS 出現錯誤，請檢察拼字",
-    "unblock": "解除封鎖",
-    "block": "封鎖",
-    "time_table_header": "時間",
-    "date": "日期",
-    "domain_name_table_header": "域名",
-    "domain_or_client": "網域或用戶端",
-    "type_table_header": "類型",
-    "response_table_header": "回應",
-    "response_code": "回應代碼",
-    "client_table_header": "用戶端",
-    "empty_response_status": "空白",
-    "show_all_filter_type": "顯示全部",
-    "show_filtered_type": "僅顯示已過濾",
-    "no_logs_found": "找不到記錄",
-    "refresh_btn": "重新整理",
-    "previous_btn": "上一頁",
-    "next_btn": "下一頁",
-    "loading_table_status": "正在載入...",
-    "page_table_footer_text": "頁",
-    "rows_table_footer_text": "列",
-    "updated_custom_filtering_toast": "自訂過濾規則已更新",
-    "rule_removed_from_custom_filtering_toast": "已從自訂過濾規則中移除：{{rule}}",
-    "rule_added_to_custom_filtering_toast": "已新增至自訂規則中：{{rule}}",
-    "query_log_response_status": "狀態：{{value}}",
-    "query_log_filtered": "被 {{filter}} 過濾",
-    "query_log_confirm_clear": "您確定要清除整個查詢記錄嗎？",
-    "query_log_cleared": "已清除查詢記錄",
-    "query_log_updated": "已成功更新查詢記錄",
-    "query_log_clear": "清除查詢記錄",
-    "query_log_retention": "查詢記錄保留時間",
-    "query_log_enable": "開啟記錄",
-    "query_log_configuration": "記錄檔設定",
-    "query_log_disabled": "查詢記錄未開啟，可以在<0>設定</0>中開啟",
-    "query_log_strict_search": "使用雙引號來強調搜尋結果",
-    "query_log_retention_confirm": "您確定要更改記錄檔保存期限嗎？如果您縮短期限部分資料可能將會遺失",
-    "anonymize_client_ip": "將用戶端 IP 匿名化",
-    "anonymize_client_ip_desc": "不要將用戶端完整 IP 位址儲存在記錄檔與統計資料",
-    "dns_config": "DNS 伺服器設定",
-    "dns_cache_config": "DNS 快取設定",
-    "dns_cache_config_desc": "在這裡您可以設定 DNS 快取",
-    "blocking_mode": "封鎖模式",
-    "default": "預設",
-    "nxdomain": "NXDOMAIN",
-    "null_ip": "Null IP",
-    "custom_ip": "自訂 IP 位址",
-    "blocking_ipv4": "封鎖 IPv4",
-    "blocking_ipv6": "封鎖 IPv6",
-    "dns_over_https": "DNS-over-HTTPS",
-    "dns_over_tls": "DNS-over-TLS",
-    "plain_dns": "一般未加密 DNS",
-    "form_enter_rate_limit": "輸入速率限制",
-    "rate_limit": "速率限制",
-    "edns_enable": "編輯 EDNS 用戶端子網路",
-    "edns_cs_desc": "開啟後 AdGuard Home 將會傳送用戶端的子網路給 DNS 伺服器。",
-    "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 位址",
-    "upstream_dns_client_desc": "如果您將此欄位留白，AdGuard Home 將使用 <0>DNS 設定</0> 內的設定的 DNS 伺服器。",
-    "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 伺服器。用來控制您自己的整個網路以及裝置，而且並不需要在裝置安裝程式。",
-    "install_settings_title": "管理介面",
-    "install_settings_listen": "監聽介面",
-    "install_settings_port": "連接埠",
-    "install_settings_interface_link": "您可以從以下 IP 位址來訪問 AdGuard Home 管理介面：",
-    "form_error_port": "輸入有效的連接埠",
-    "install_settings_dns": "DNS 伺服器",
-    "install_settings_dns_desc": "您需要將您的裝置或路由器設定以下的 IP 位址為 DNS 伺服器：",
-    "install_settings_all_interfaces": "所有介面",
-    "install_auth_title": "驗證",
-    "install_auth_desc": "強烈建議為 AdGuard Home 管理介面設定驗證密碼，即使管理介面僅能從本地區域網路連接，不過設定密碼保護仍然很重要。",
-    "install_auth_username": "使用者名稱",
-    "install_auth_password": "密碼",
-    "install_auth_confirm": "確認密碼",
-    "install_auth_username_enter": "輸入用戶名",
-    "install_auth_password_enter": "輸入密碼",
-    "install_step": "步驟",
-    "install_devices_title": "配置您的裝置",
-    "install_devices_desc": "要開始使用 AdGuard Home，您需要設定好裝置才能使用。",
-    "install_submit_title": "恭喜！",
-    "install_submit_desc": "安裝步驟已完成，現在已經可以開始使用 AdGuard Home",
-    "install_devices_router": "路由器",
-    "install_devices_router_desc": "使用此設定後，所有連接家中路由器的裝置都會自動套用，無須在每台裝置上個別設定。",
-    "install_devices_address": "AdGuard Home DNS 伺服器正在監聽以下位址",
-    "install_devices_router_list_1": "開啟您的路由器設定。通常可透過瀏覽器開啟（http://192.168.0.1/ 或 http://192.168.1.1）。接著您可能會被要求驗證登入，如果忘記密碼可以按壓路由器的 REST 重設按鈕來重設。部分路由器可能需要安裝特定應用程式，在這種情況下應該已經安裝在您的電腦或手機上。",
-    "install_devices_router_list_2": "找到 DHCP/DNS 設定。允許兩到三組數字的欄位旁邊尋找 DNS 字串，每組數字分為四組，每組一到三位數。",
-    "install_devices_router_list_3": "請在那邊輸入您的 AdGuard Home 伺服器位址。",
-    "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_6": "點擊「使用下列的 DNS 伺服器位址」，接著輸入您的 AdGuard Home 伺服器位址。",
-    "install_devices_macos_list_1": "點擊左上角的 Apple Icon，接著點擊「系統偏好設定」。",
-    "install_devices_macos_list_2": "點擊「網路」。",
-    "install_devices_macos_list_3": "選擇清單中第一個連線接著點選「進階設定」。",
-    "install_devices_macos_list_4": "選擇 DNS 分頁，接著輸入您的 AdGuard Home 伺服器位址。",
-    "install_devices_android_list_1": "在 Android 主選單中點選設定。",
-    "install_devices_android_list_2": "在 Wi-Fi 選單中會列出所有可用的網路（在行動網路時無法使用自訂 DNS）。",
-    "install_devices_android_list_3": "長按您正在使用的網路，接著點選修改網路。",
-    "install_devices_android_list_4": "在某些裝置上您需要勾選進階方塊才能接著設定。要設定自訂 DNS 必須先將 IP 設定從 DHCP 改為靜態 IP。",
-    "install_devices_android_list_5": "將 DNS 1 和 DNS 2 更改成您的 AdGuard Home 伺服器位址。",
-    "install_devices_ios_list_1": "從主畫面中，點選設定。",
-    "install_devices_ios_list_2": "在左側選擇 Wi-Fi（在行動網路時無法使用自訂 DNS）。",
-    "install_devices_ios_list_3": "點選連線中的網路",
-    "install_devices_ios_list_4": "在 DNS 欄位中輸入您的 AdGuard Home 伺服器位址。",
-    "get_started": "開始設定",
-    "next": "下一步",
-    "open_dashboard": "開啟儀表板",
-    "install_saved": "成功儲存",
-    "encryption_title": "加密",
-    "encryption_desc": "加密（HTTPS/TLS）提供給 DNS 和「管理介面網頁介面」兩者",
-    "encryption_config_saved": "加密設定已儲存",
-    "encryption_server": "伺服器名稱",
-    "encryption_server_enter": "輸入您的網域名稱",
-    "encryption_server_desc": "要使用 HTTPS，您必須輸入與您 SSL 憑證相符的伺服器名稱。",
-    "encryption_redirect": "自重新導向到 HTTPS",
-    "encryption_redirect_desc": "如果啟用，AdGuard Home 將會自動導向 HTTP 到 HTTPS。",
-    "encryption_https": "HTTPS 連接埠",
-    "encryption_https_desc": "如果已設定 HTTPS，AdGuard Home 網頁管理介面將會使用 HTTPS 來存取，且「/dns-query」也提供 DNS-over-HTTPS 查詢。",
-    "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>取得免費的 SSL 憑證或從受信任的 SSL 憑證簽發機構購買。",
-    "encryption_certificates_input": "在這裡複製/貼上您的 PEM 憑證。",
-    "encryption_status": "狀態",
-    "encryption_expire": "到期",
-    "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_chain_valid": "憑證鏈結有效",
-    "encryption_chain_invalid": "憑證連結無效",
-    "encryption_key_valid": "{{type}} 私密金鑰有效",
-    "encryption_key_invalid": "{{type}} 私密金鑰無效",
-    "encryption_subject": "主體",
-    "encryption_issuer": "簽發者",
-    "encryption_hostnames": "主機名稱",
-    "encryption_reset": "您確定要重設加密設定嗎？",
-    "topline_expiring_certificate": "您的 SSL 憑證即將到期。請前往<0>加密設定</0>更新。",
-    "topline_expired_certificate": "您的 SSL 憑證已到期。請前往<0>加密設定</0>更新。",
-    "form_error_port_range": "輸入範圍 80-65535 中的值",
-    "form_error_port_unsafe": "這個連接埠不安全",
-    "form_error_equal": "不可相同",
-    "form_error_password": "密碼不相符",
-    "reset_settings": "重設設定",
-    "update_announcement": "有新版的 AdGuard Home {{version}} 可供更新！詳細資訊請<0>點擊這裡</0>。",
-    "setup_guide": "安裝導覽",
-    "dns_addresses": "DNS 位址",
-    "dns_start": "DNS 伺服器正在啟動",
-    "dns_status_error": "檢查 DNS 伺服器狀態錯誤",
-    "down": "離線",
-    "fix": "修正",
-    "dns_providers": "下列是可以使用的<0>軟體清單</0>。",
-    "update_now": "立即更新",
-    "update_failed": "自動更新發生錯誤。請嘗試依照<a>以下步驟</a> 來手動更新。",
-    "processing_update": "請稍候，AdGuard Home 正在更新",
-    "clients_title": "用戶端",
-    "clients_desc": "對已連接到 AdGuard Home 的裝置進行設定",
-    "settings_global": "全域",
-    "settings_custom": "自訂",
-    "table_client": "用戶端",
-    "table_name": "名稱",
-    "save_btn": "儲存",
-    "client_add": "新增用戶端",
-    "client_new": "設定新用戶端",
-    "client_edit": "編輯用戶端",
-    "client_identifier": "識別碼",
-    "ip_address": "IP 位址",
-    "client_identifier_desc": "可通過 IP 地址、CIDR、MAC 地址來辨識使用者裝置。注意：必須使用 AdGuard Home 內建 <0>DHCP 伺服器</0> 才能偵測 MAC 地址。",
-    "form_enter_ip": "輸入 IP",
-    "form_enter_mac": "輸入 MAC 地址",
-    "form_enter_id": "輸入識別碼",
-    "form_add_id": "新增識別碼",
-    "form_client_name": "輸入用戶端名稱",
-    "name": "名稱",
-    "client_global_settings": "Use global settings",
-    "client_deleted": "已刪除「{{key}}」",
-    "client_added": "已新增「{{key}}」",
-    "client_updated": "已更新「{{key}}」",
-    "clients_not_found": "找不到用戶端",
-    "client_confirm_delete": "您確定要刪除「{{key}}」用戶端嗎？",
-    "list_confirm_delete": "您確定要刪除這個清單嗎？",
-    "auto_clients_title": "用戶端（連接時間）",
-    "auto_clients_desc": "未設定但有連接過 AdGuard Home 的用戶端",
-    "access_title": "存取設定",
-    "access_desc": "您可以在這裡設定 AdGuard Home DNS 伺服器存取規則。",
-    "access_allowed_title": "用戶端白名單",
-    "access_allowed_desc": "輸入 CIDR 或 IP 位址格式的清單，設定後 AdGuard Home 將僅接受設定的 IP 位址查詢請求。",
-    "access_disallowed_title": "用戶端黑名單",
-    "access_disallowed_desc": "輸入 CIDR 或 IP 位址格式的清單，設定後 AdGuard Home 將拒絕設定的 IP 位址查詢請求。",
-    "access_blocked_title": "網域黑名單",
-    "access_blocked_desc": "請不要與過濾器混淆，AdGuard Home 將對這些網域執行過濾檢查，而是直接拒絕查詢。您可以輸入特定網域名稱來使用設定，或使用萬用字元，例如：「example.org」、「*.example.org」或「||example.org^」。",
-    "access_settings_saved": "存取設定已儲存",
-    "updates_checked": "檢查更新成功",
-    "updates_version_equal": "AdGuard Home 是最新的版本",
-    "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 僅適用於 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>。",
-    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> 支援 <1>DNS-over-HTTPS</1>，若要使用您必須先產生 <2>DNS Stamp</2>。",
-    "setup_dns_privacy_ios_2": "<0>AdGuard for iOS</0> 支援 <1>DNS-over-HTTPS</1> 與 <1>DNS-over-TLS</1> 設定。",
-    "setup_dns_privacy_other_title": "其他實作軟體",
-    "setup_dns_privacy_other_1": "AdGuard Home 本身在任何平台都是安全的 DNS 用戶端。",
-    "setup_dns_privacy_other_2": "<0>dnsproxy</0> 支援所有加密 DNS 協定。",
-    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> 支援 <1>DNS-over-HTTPS</1>。",
-    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> 支援 <1>DNS-over-HTTPS</1>。",
-    "setup_dns_privacy_other_5": "您可以在<0>這裏</0>與<1>這裏</1>找到更多實作軟體。",
-    "setup_dns_notice": "要使用  <1>DNS-over-HTTPS</1> 或 <1>DNS-over-TLS</1>，您必須先在 AdGuard Home 完成 <0>加密設定</0>。",
-    "rewrite_added": "「{{key}}」的 DNS 覆寫新增成功",
-    "rewrite_deleted": "「{{key}}」的 DNS 覆寫刪除成功",
-    "rewrite_add": "新增 DNS 覆寫",
-    "rewrite_not_found": "找不到 DNS 覆寫",
-    "rewrite_confirm_delete": "您確定要刪除 \"{{key}}\" 的 DNS 覆寫？",
-    "rewrite_desc": "提供簡單的方式對特定網域自訂 DNS 回應。",
-    "rewrite_applied": "已套用 DNS 覆寫規則",
-    "rewrite_hosts_applied": "由「hosts 檔案」覆寫",
-    "dns_rewrites": "DNS 覆寫",
-    "form_domain": "輸入網域名稱或使用萬用字元。",
-    "form_answer": "輸入 IP 或網域名稱",
-    "form_error_domain_format": "網域格式無效",
-    "form_error_answer_format": "回應格式無效",
-    "configure": "設定",
-    "main_settings": "主要設定",
-    "block_services": "封鎖特定服務",
-    "blocked_services": "已封鎖服務",
-    "blocked_services_desc": "用來快速封鎖熱門網站或服務",
-    "blocked_services_saved": "已成功封鎖服務",
-    "blocked_services_global": "使用全域封鎖服務",
-    "blocked_service": "封鎖服務",
-    "block_all": "封鎖全部",
-    "unblock_all": "全部解除封鎖",
-    "encryption_certificate_path": "憑證路徑",
-    "encryption_private_key_path": "私鑰路徑",
-    "encryption_certificates_source_path": "設定憑證檔案路徑",
-    "encryption_certificates_source_content": "貼上憑證內容",
-    "encryption_key_source_path": "設定私鑰路徑",
-    "encryption_key_source_content": "貼上私鑰內容",
-    "stats_params": "統計資料設定",
-    "config_successfully_saved": "已儲存設定",
-    "interval_24_hour": "24 小時",
-    "interval_days": "{{count}} 天",
-    "interval_days_plural": "{{count}} 天",
-    "domain": "網域",
-    "answer": "回應",
-    "filter_added_successfully": "已成功新增清單",
-    "filter_removed_successfully": "已成功移除清單",
-    "filter_updated": "已成功更新清單",
-    "statistics_configuration": "統計資料設定",
-    "statistics_retention": "統計資料保留時間",
-    "statistics_retention_desc": "如果您縮短期限部分資料可能將會遺失",
-    "statistics_clear": " 清除統計資料",
-    "statistics_clear_confirm": "您確定要清除統計資料嗎？",
-    "statistics_retention_confirm": "您確定要更改統計資料保存時間嗎？如果您縮短期限部分資料可能將會遺失",
-    "statistics_cleared": "已清除統計資料",
-    "interval_hours": "{{count}} 小時",
-    "interval_hours_plural": "{{count}} 小時",
-    "filters_configuration": "過濾器設定",
-    "filters_enable": "開啟過濾器",
-    "filters_interval": "過濾器更新頻率",
-    "disabled": "已停用",
-    "username_label": "使用者名稱",
-    "username_placeholder": "輸入使用者名稱",
-    "password_label": "密碼",
-    "password_placeholder": "輸入密碼",
-    "sign_in": "登入",
-    "sign_out": "登出",
-    "forgot_password": "忘記密碼？",
-    "forgot_password_desc": "請依照<0>步驟</0>來為您的帳號建立新密碼。",
-    "location": "位置",
-    "orgname": "組織名稱",
-    "netname": "網路名稱",
-    "network": "網路",
-    "descr": "描述",
-    "whois": "Whois",
-    "filtering_rules_learn_more": "<0>進一步了解</0>關於創建自己的「hosts 檔案」",
-    "blocked_by_response": "回應時被 CNAME 或 IP 封鎖",
-    "blocked_by_cname_or_ip": "使用 CNAME 或 IP 封鎖",
-    "try_again": "再試一次",
-    "domain_desc": "輸入您想要覆寫的網域或萬用字元。",
-    "example_rewrite_domain": "DNS 覆寫只套用在這個域名。",
-    "example_rewrite_wildcard": "DNS 覆寫會套用在 <0>example.org</0> 及所有子域名。",
-    "rewrite_ip_address": "IP 位址：使用 A 或 AAAA 紀錄回應",
-    "rewrite_domain_name": "網域名稱：新增一筆 CNAME 紀錄",
-    "rewrite_A": "<0>A</0>: 特殊值，將上游查詢結果覆寫 <0>A</0> 紀錄",
-    "rewrite_AAAA": "<0>AAAA</0>: 特殊值，將上游查詢結果覆寫 <0>AAAA</0> 紀錄",
-    "disable_ipv6": "停用 IPv6",
-    "disable_ipv6_desc": "開啟此功能後所有，所有對於 IPv6 位址（AAAA）的查詢都會被捨棄。",
-    "fastest_addr": "Fastest IP 位址",
-    "fastest_addr_desc": "從所有 DNS 伺服器查詢中回應最快的 IP 位址",
-    "autofix_warning_text": "如果您點擊「修復」，AdGuard Home 將更改您的系統 DNS 設定更改為 AdGuard Home 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 請求預設由本機的 AdGuard Home 處理。",
-    "tags_title": "標籤",
-    "tags_desc": "您可以選擇與用戶端相對應的標籤。標籤可已包含在過濾規則內且使用上更精確。\n<0>進一步了解</0>",
-    "form_select_tags": "選擇用戶端標籤",
-    "check_title": "過濾檢查",
-    "check_desc": "檢查網域是否被封鎖",
-    "check": "檢查",
-    "form_enter_host": "輸入網域",
-    "filtered_custom_rules": "被自訂過濾規則封鎖",
-    "choose_from_list": "從清單中選取",
-    "add_custom_list": "新增自訂清單",
-    "host_whitelisted": "主機已列入白名單",
-    "check_ip": "IP 位址：{{ip}}",
-    "check_cname": "CNAME：{{cname}}",
-    "check_reason": "原因：{{reason}}",
-    "check_rule": "規則：{{rule}}",
-    "check_service": "服務名稱：{{service}}",
-    "check_not_found": "未在您的過濾清單中找到",
-    "client_confirm_block": "您確定要封鎖「{{ip}}」用戶端？",
-    "client_confirm_unblock": "您確定要將「{{ip}}」解除封鎖嗎？",
-    "client_blocked": "已封鎖「{{ip}}」",
-    "client_unblocked": "已解除封鎖「{{ip}}」",
-    "static_ip": "靜態 IP 位址",
-    "static_ip_desc": "由於 AdGuard Home 是個伺服器，因此需要一組靜態 IP 位址使它正常運作。否則在某些時候您的路由器可能會發派不同的 IP 位址給 AdGuard Home。",
-    "set_static_ip": "設定一組靜態 IP 位址",
-    "install_static_ok": "好消息！靜態 IP 位址設定完成了",
-    "install_static_error": "AdGuard Home 無法在這個網路介面上執行自動設定。請尋找有關如何手動更改設定的說明。",
-    "install_static_configure": "我們偵測到 <0>{{ip}}</0> 動態 IP 已被使用。您想要將它當作靜態 IP 使用嗎？",
-    "confirm_static_ip": "AdGuard Home 將使用 {{ip}} 作為靜態 IP。要繼續處理？",
-    "list_updated": "已更新 {{count}} 個清單",
-    "list_updated_plural": "已更新 {{count}} 個清單",
-    "dnssec_enable": "啟用 DNSSEC",
-    "dnssec_enable_desc": "在連出 DNS 查詢結果中加入 DNSSEC 旗幟並檢查結果（必須開啟 DNSSEC-enabled 解析器）",
-    "validated_with_dnssec": "DNSSEC 驗證有效",
-    "all_queries": "所有查詢",
-    "show_blocked_responses": "已封鎖",
-    "show_whitelisted_responses": "已加入允許清單",
-    "show_processed_responses": "已處理",
-    "blocked_safebrowsing": "被安全瀏覽封鎖",
-    "blocked_adult_websites": "已封鎖的成人網站",
-    "blocked_threats": "已封鎖的威脅",
-    "allowed": "已允許",
-    "filtered": "已過濾",
-    "rewritten": "已覆寫",
-    "safe_search": "安全搜尋",
-    "blocklist": "封鎖清單",
-    "milliseconds_abbreviation": "ms",
-    "cache_size": "快取大小",
-    "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": "區域性",
-    "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": "建立設定檔來使用 DHCP 伺服器",
-    "original_response": "原始回應",
-    "click_to_view_queries": "按一下以檢視查詢結果",
-    "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
-    "experimental": "實驗性"
-}
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -11,8 +11,6 @@
    "save_config": "儲存配置",
    "enabled_dhcp": "動態主機設定協定（DHCP）伺服器被啟用",
    "disabled_dhcp": "動態主機設定協定（DHCP）伺服器被禁用",
-    "unavailable_dhcp": "DHCP 為不可用的",
-    "unavailable_dhcp_desc": "AdGuard Home 無法於您的作業系統上執行 DHCP 伺服器",
    "dhcp_title": "動態主機設定協定（DHCP）伺服器（實驗性的！）",
    "dhcp_description": "如果您的路由器未提供動態主機設定協定（DHCP）設定，您可使用 AdGuard 自身內建的 DHCP 伺服器。",
    "dhcp_enable": "啟用動態主機設定協定（DHCP）伺服器",
@@ -23,8 +21,6 @@
    "dhcp_static_leases": "動態主機設定協定（DHCP）靜態租約",
    "dhcp_leases_not_found": "無已發現之動態主機設定協定（DHCP）租約",
    "dhcp_config_saved": "動態主機設定協定（DHCP）配置被成功地儲存",
-    "dhcp_ipv4_settings": "DHCP IPv4 設定",
-    "dhcp_ipv6_settings": "DHCP IPv6 設定",
    "form_error_required": "必填的欄位",
    "form_error_ip4_format": "無效的 IPv4 格式",
    "form_error_ip6_format": "無效的 IPv6 格式",
@@ -33,12 +29,11 @@
    "form_error_client_id_format": "無效的用戶端 ID 格式",
    "form_error_positive": "必須大於 0",
    "form_error_negative": "必須等於或大於 0",
-    "range_end_error": "必須大於起始範圍",
    "dhcp_form_gateway_input": "閘道 IP",
    "dhcp_form_subnet_input": "子網路遮罩",
    "dhcp_form_range_title": "IP 位址範圍",
-    "dhcp_form_range_start": "起始範圍",
-    "dhcp_form_range_end": "結束範圍",
+    "dhcp_form_range_start": "範圍開始",
+    "dhcp_form_range_end": "範圍結束",
    "dhcp_form_lease_title": "動態主機設定協定（DHCP）租約時間（以秒數）",
    "dhcp_form_lease_input": "租約期間",
    "dhcp_interface_select": "選擇動態主機設定協定（DHCP）介面",
@@ -112,7 +107,7 @@
    "enforced_save_search": "已強制執行的安全搜尋",
    "number_of_dns_query_to_safe_search": "安全搜尋已被強制執行之屬於搜尋引擎的 DNS 請求之數量",
    "average_processing_time": "平均的處理時間",
-    "average_processing_time_hint": "在處理一項 DNS 請求時以毫秒（ms）計的平均時間",
+    "average_processing_time_hint": "於處理一項 DNS 請求上以毫秒（ms）計之平均的時間",
    "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域",
    "filters_block_toggle_hint": "您可在<a href='#filters'>過濾器</a>設定中設置封鎖規則。",
    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
@@ -132,8 +127,7 @@
    "encryption_settings": "加密設定",
    "dhcp_settings": "動態主機設定協定（DHCP）設定",
    "upstream_dns": "上游的 DNS 伺服器",
-    "upstream_dns_help": "輸入伺服器位址，每行一個。<a>了解更多</a>有關配置上游的 DNS 伺服器。",
-    "upstream_dns_configured_in_file": "被配置在 {{path}}",
+    "upstream_dns_hint": "如果您將該欄位留空，AdGuard Home 將使用 <a href='https://www.quad9.net/' target='_blank'>Quad9</a> 作為上游。",
    "test_upstream_btn": "測試上行資料流",
    "upstreams": "上游",
    "apply_btn": "套用",
@@ -187,7 +181,6 @@
    "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_sdns": "您可使用關於 <1>DNSCrypt</1> 或 <2>DNS-over-HTTPS</2> 解析器之 <0>DNS 戳記</0>",
    "example_upstream_tcp": "一般的 DNS（透過 TCP）",
    "all_lists_up_to_date_toast": "所有的清單已是最新的",
@@ -196,10 +189,6 @@
    "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": "域名",
@@ -219,8 +208,8 @@
    "page_table_footer_text": "頁面",
    "rows_table_footer_text": "列",
    "updated_custom_filtering_toast": "已更新自訂的過濾規則",
-    "rule_removed_from_custom_filtering_toast": "從自訂的過濾規則中被移除的規則：{{rule}}",
-    "rule_added_to_custom_filtering_toast": "被加至自訂的過濾規則中的規則：{{rule}}",
+    "rule_removed_from_custom_filtering_toast": "規則從自訂的過濾規則中被移除",
+    "rule_added_to_custom_filtering_toast": "規則被加至自訂的過濾規則中",
    "query_log_response_status": "狀態：{{value}}",
    "query_log_filtered": "被 {{filter}} 過濾",
    "query_log_confirm_clear": "您確定您想要清除整個查詢記錄嗎？",
@@ -241,7 +230,6 @@
    "blocking_mode": "封鎖模式",
    "default": "預設",
    "nxdomain": "不存在的網域（NXDOMAIN）",
-    "refused": "已拒絕（REFUSED）",
    "null_ip": "無效的 IP",
    "custom_ip": "自訂的 IP",
    "blocking_ipv4": "封鎖 IPv4",
@@ -253,11 +241,10 @@
    "rate_limit": "速率限制",
    "edns_enable": "啟用對於 DNS 的擴充機制（EDNS）用戶端子網路",
    "edns_cs_desc": "如果被啟用，AdGuard Home 將持續傳送用戶端的子網路到 DNS 伺服器。",
-    "rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（設定它為 0 表示無限制的）",
+    "rate_limit_desc": "單一的用戶端被允許傳送的每秒請求之數量（0：無限制的）",
    "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
    "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
-    "blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以 REFUSED 回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
-    "blocking_mode_refused": "已拒絕（REFUSED）：以 REFUSED 碼回覆",
+    "blocking_mode_default": "預設：當被廣告封鎖樣式的規則封鎖時，以 NXDOMAIN 回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
    "blocking_mode_nxdomain": "不存在的網域（NXDOMAIN）：以 NXDOMAIN 碼回覆",
    "blocking_mode_null_ip": "無效的 IP：以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆",
    "blocking_mode_custom_ip": "自訂的 IP：以一組手動地被設定的 IP 位址回覆",
@@ -316,7 +303,7 @@
    "install_devices_android_list_5": "更改 DNS 1 和 DNS 2 位置的值為您的 AdGuard Home 伺服器位址。",
    "install_devices_ios_list_1": "從主畫面中，輕觸設定。",
    "install_devices_ios_list_2": "在左側的選單中選擇 Wi-Fi（不可能為行動網路配置 DNS）。",
-    "install_devices_ios_list_3": "向目前現行的網路之名稱輕觸。",
+    "install_devices_ios_list_3": "於目前現行的網路之名稱上輕觸。",
    "install_devices_ios_list_4": "在該 DNS 欄位中，輸入您的 AdGuard Home 伺服器位址。",
    "get_started": "開始吧",
    "next": "下一頁",
@@ -334,8 +321,6 @@
    "encryption_https_desc": "如果 HTTPS 連接埠被配置，AdGuard Home 管理員介面透過 HTTPS 將為可存取的，且它也將於 '/dns-query' 位置上提供 DNS-over-HTTPS。",
    "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-encoded）憑證。",
@@ -369,7 +354,7 @@
    "fix": "修復",
    "dns_providers": "這裡是一個從中選擇之<0>已知的 DNS 供應商之清單</0>。",
    "update_now": "立即更新",
-    "update_failed": "自動更新已失敗。請<a>遵循這些步驟</a>以手動地更新。",
+    "update_failed": "自動更新已失敗。請<a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>遵循這些步驟</a>以手動地更新。",
    "processing_update": "請稍候，AdGuard Home 正被更新",
    "clients_title": "用戶端",
    "clients_desc": "配置被連線到 AdGuard Home 的裝置",
@@ -564,9 +549,10 @@
    "enter_cache_size": "輸入快取大小",
    "enter_cache_ttl_min_override": "輸入最小的存活時間（TTL）",
    "enter_cache_ttl_max_override": "輸入最大的存活時間（TTL）",
-    "cache_ttl_min_override_desc": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最小值）",
+    "cache_ttl_min_override_desc": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最小值）。此數值不能大於 3600（1 小時）",
    "cache_ttl_max_override_desc": "覆寫從上游的伺服器收到的存活時間（TTL）數值（最大值）",
-    "ttl_cache_validation": "最小的快取存活時間（TTL）數值必須小於或等於最大的數值",
+    "min_exceeds_max_value": "最小值超過最大值",
+    "value_not_larger_than": "數值不能大於 {{maximum}}",
    "filter_category_general": "一般的",
    "filter_category_security": "安全性",
    "filter_category_regional": "區域性的",
@@ -575,10 +561,7 @@
    "filter_category_security_desc": "專精於封鎖惡意軟體、網路釣魚或詐騙網域之清單",
    "filter_category_regional_desc": "專注於區域性的廣告和追蹤伺服器之清單",
    "filter_category_other_desc": "其它的封鎖清單",
-    "setup_config_to_enable_dhcp_server": "設置配置以啟用 DHCP 伺服器",
    "original_response": "原始的回應",
    "click_to_view_queries": "點擊以檢視查詢",
-    "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。",
-    "adg_will_drop_dns_queries": "AdGuard Home 將持續排除來自此用戶端之所有的 DNS 查詢。",
-    "experimental": "實驗性的"
+    "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。"
 }
--- a/client/src/tests/helpers.test.js
+++ b/client/src/tests/helpers.test.js
@@ -1,5 +1,134 @@
-import { sortIp, countClientsStatistics, findAddressType } from '../helpers/helpers';
-import { ADDRESS_TYPES } from '../helpers/constants';
+import { getIpMatchListStatus, sortIp } from '../helpers/helpers';
+import { 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);
+        });
+    });
+});

 describe('sortIp', () => {
    describe('ipv4', () => {
@@ -353,56 +482,3 @@ describe('sortIp', () => {
        });
    });
 });
-
-describe('findAddressType', () => {
-    describe('ip', () => {
-        expect(findAddressType('127.0.0.1')).toStrictEqual(ADDRESS_TYPES.IP);
-    });
-    describe('cidr', () => {
-        expect(findAddressType('127.0.0.1/8')).toStrictEqual(ADDRESS_TYPES.CIDR);
-    });
-    describe('mac', () => {
-        expect(findAddressType('00:1B:44:11:3A:B7')).toStrictEqual(ADDRESS_TYPES.UNKNOWN);
-    });
-});
-
-describe('countClientsStatistics', () => {
-    test('single ip', () => {
-        expect(countClientsStatistics(['127.0.0.1'], {
-            '127.0.0.1': 1,
-        })).toStrictEqual(1);
-    });
-    test('multiple ip', () => {
-        expect(countClientsStatistics(['127.0.0.1', '127.0.0.2'], {
-            '127.0.0.1': 1,
-            '127.0.0.2': 2,
-        })).toStrictEqual(1 + 2);
-    });
-    test('cidr', () => {
-        expect(countClientsStatistics(['127.0.0.0/8'], {
-            '127.0.0.1': 1,
-            '127.0.0.2': 2,
-        })).toStrictEqual(1 + 2);
-    });
-    test('cidr and multiple ip', () => {
-        expect(countClientsStatistics(['1.1.1.1', '2.2.2.2', '3.3.3.0/24'], {
-            '1.1.1.1': 1,
-            '2.2.2.2': 2,
-            '3.3.3.3': 3,
-        })).toStrictEqual(1 + 2 + 3);
-    });
-    test('mac', () => {
-        expect(countClientsStatistics(['00:1B:44:11:3A:B7', '2.2.2.2', '3.3.3.0/24'], {
-            '1.1.1.1': 1,
-            '2.2.2.2': 2,
-            '3.3.3.3': 3,
-        })).toStrictEqual(2 + 3);
-    });
-    test('not found', () => {
-        expect(countClientsStatistics(['4.4.4.4', '5.5.5.5', '6.6.6.6'], {
-            '1.1.1.1': 1,
-            '2.2.2.2': 2,
-            '3.3.3.3': 3,
-        })).toStrictEqual(0);
-    });
-});
--- a/client/src/actions/access.js
+++ b/client/src/actions/access.js
@@ -3,6 +3,7 @@ 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');
@@ -48,16 +49,19 @@ 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 = (ip, disallowed, disallowed_rule) => async (dispatch) => {
+export const toggleClientBlock = (type, ip) => async (dispatch) => {
    dispatch(toggleClientBlockRequest());
    try {
        const {
-            allowed_clients, blocked_hosts, disallowed_clients = [],
+            allowed_clients, disallowed_clients, blocked_hosts,
        } = await apiClient.getAccessList();
+        let updatedDisallowedClients = disallowed_clients || [];

-        const updatedDisallowedClients = disallowed
-            ? disallowed_clients.filter((client) => client !== disallowed_rule)
-            : disallowed_clients.concat(ip);
+        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 values = {
            allowed_clients,
@@ -68,9 +72,9 @@ export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dis
        await apiClient.setAccessList(values);
        dispatch(toggleClientBlockSuccess(values));

-        if (disallowed) {
-            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
-        } else {
+        if (type === BLOCK_ACTIONS.UNBLOCK) {
+            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip })));
+        } else if (type === BLOCK_ACTIONS.BLOCK) {
            dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
        }
    } catch (error) {
--- a/client/src/actions/encryption.js
+++ b/client/src/actions/encryption.js
@@ -34,7 +34,6 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
        values.private_key = btoa(values.private_key);
        values.port_https = values.port_https || 0;
        values.port_dns_over_tls = values.port_dns_over_tls || 0;
-        values.port_dns_over_quic = values.port_dns_over_quic || 0;

        const response = await apiClient.setTlsConfig(values);
        response.certificate_chain = atob(response.certificate_chain);
@@ -60,7 +59,6 @@ export const validateTlsConfig = (config) => async (dispatch) => {
        values.private_key = btoa(values.private_key);
        values.port_https = values.port_https || 0;
        values.port_dns_over_tls = values.port_dns_over_tls || 0;
-        values.port_dns_over_quic = values.port_dns_over_quic || 0;

        const response = await apiClient.validateTlsConfig(values);
        response.certificate_chain = atob(response.certificate_chain);
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -2,24 +2,12 @@ import { createAction } from 'redux-actions';
 import i18next from 'i18next';
 import axios from 'axios';

-import endsWith from 'lodash/endsWith';
-import escapeRegExp from 'lodash/escapeRegExp';
-import React from 'react';
-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,
-} from '../helpers/constants';
+import { splitByNewLine, sortClients } from '../helpers/helpers';
+import { CHECK_TIMEOUT, SETTINGS_NAMES } from '../helpers/constants';
 import { areEqualVersions } from '../helpers/version';
 import { getTlsStatus } from './encryption';
 import apiClient from '../api/Api';
 import { addErrorToast, addNoticeToast, addSuccessToast } from './toasts';
-import { getFilteringStatus, setRules } from './filtering';

 export const toggleSettingStatus = createAction('SETTING_STATUS_TOGGLE');
 export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
@@ -191,14 +179,7 @@ export const getUpdate = () => async (dispatch, getState) => {

    dispatch(getUpdateRequest());
    const handleRequestError = () => {
-        const options = {
-            components: {
-                a: <a href={GETTING_STARTED_LINK} target="_blank"
-                      rel="noopener noreferrer" />,
-            },
-        };
-
-        dispatch(addNoticeToast({ error: 'update_failed', options }));
+        dispatch(addNoticeToast({ error: 'update_failed' }));
        dispatch(getUpdateFailure());
    };

@@ -295,21 +276,14 @@ export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
 export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
 export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');

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

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

-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');
@@ -374,8 +342,6 @@ export const getDhcpStatus = () => async (dispatch) => {
    dispatch(getDhcpStatusRequest());
    try {
        const status = await apiClient.getDhcpStatus();
-        const globalStatus = await apiClient.getGlobalStatus();
-        status.dhcp_available = globalStatus.dhcp_available;
        dispatch(getDhcpStatusSuccess(status));
    } catch (error) {
        dispatch(addErrorToast({ error }));
@@ -402,69 +368,11 @@ export const findActiveDhcpRequest = createAction('FIND_ACTIVE_DHCP_REQUEST');
 export const findActiveDhcpSuccess = createAction('FIND_ACTIVE_DHCP_SUCCESS');
 export const findActiveDhcpFailure = createAction('FIND_ACTIVE_DHCP_FAILURE');

-export const findActiveDhcp = (name) => async (dispatch, getState) => {
+export const findActiveDhcp = (name) => async (dispatch) => {
    dispatch(findActiveDhcpRequest());
    try {
        const activeDhcp = await apiClient.findActiveDhcp(name);
        dispatch(findActiveDhcpSuccess(activeDhcp));
-        const { check, interface_name, interfaces } = getState().dhcp;
-        const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name;
-        const v4 = check?.v4 ?? { static_ip: {}, other_server: {} };
-        const v6 = check?.v6 ?? { other_server: {} };
-
-        let isError = false;
-        let isStaticIPError = false;
-
-        const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
-        const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
-
-        if (hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR) {
-            isError = true;
-            if (v4.other_server.error) {
-                dispatch(addErrorToast({ error: v4.other_server.error }));
-            }
-        }
-
-        if (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR) {
-            isError = true;
-            if (v6.other_server.error) {
-                dispatch(addErrorToast({ error: v6.other_server.error }));
-            }
-        }
-
-        if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) {
-            isStaticIPError = true;
-            dispatch(addErrorToast({ error: 'dhcp_static_ip_error' }));
-        }
-
-
-        if (isError) {
-            dispatch(addErrorToast({ error: 'dhcp_error' }));
-        }
-
-        if (isStaticIPError || isError) {
-            // No need to proceed if there was an error discovering DHCP server
-            return;
-        }
-
-        if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
-                || (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) {
-            dispatch(addErrorToast({ error: 'dhcp_found' }));
-        } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO
-                && v4.static_ip.ip
-                && interface_name) {
-            const warning = i18next.t('dhcp_dynamic_ip_found', {
-                interfaceName: interface_name,
-                ipAddress: v4.static_ip.ip,
-                interpolation: {
-                    prefix: '<0>{{',
-                    suffix: '}}</0>',
-                },
-            });
-            dispatch(addErrorToast({ error: warning }));
-        } else {
-            dispatch(addSuccessToast('dhcp_not_found'));
-        }
    } catch (error) {
        dispatch(addErrorToast({ error }));
        dispatch(findActiveDhcpFailure());
@@ -475,11 +383,14 @@ export const setDhcpConfigRequest = createAction('SET_DHCP_CONFIG_REQUEST');
 export const setDhcpConfigSuccess = createAction('SET_DHCP_CONFIG_SUCCESS');
 export const setDhcpConfigFailure = createAction('SET_DHCP_CONFIG_FAILURE');

-export const setDhcpConfig = (values) => async (dispatch) => {
+export const setDhcpConfig = (values) => async (dispatch, getState) => {
+    const { config } = getState().dhcp;
+    const updatedConfig = { ...config, ...values };
    dispatch(setDhcpConfigRequest());
+    dispatch(findActiveDhcp(values.interface_name));
    try {
-        await apiClient.setDhcpConfig(values);
-        dispatch(setDhcpConfigSuccess(values));
+        await apiClient.setDhcpConfig(updatedConfig);
+        dispatch(setDhcpConfigSuccess(updatedConfig));
        dispatch(addSuccessToast('dhcp_config_saved'));
    } catch (error) {
        dispatch(addErrorToast({ error }));
@@ -505,6 +416,7 @@ export const toggleDhcp = (values) => async (dispatch) => {
            enabled: true,
        };
        successMessage = 'enabled_dhcp';
+        dispatch(findActiveDhcp(values.interface_name));
    }

    try {
@@ -571,44 +483,3 @@ export const removeStaticLease = (config) => async (dispatch) => {
 };

 export const removeToast = createAction('REMOVE_TOAST');
-
-export const toggleBlocking = (
-    type, domain, baseRule, baseUnblocking,
-) => async (dispatch, getState) => {
-    const baseBlockingRule = baseRule || `||${domain}^$important`;
-    const baseUnblockingRule = baseUnblocking || `@@${baseBlockingRule}`;
-    const { userRules } = getState().filtering;
-
-    const lineEnding = !endsWith(userRules, '\n') ? '\n' : '';
-
-    const blockingRule = type === BLOCK_ACTIONS.BLOCK ? baseUnblockingRule : baseBlockingRule;
-    const unblockingRule = type === BLOCK_ACTIONS.BLOCK ? baseBlockingRule : baseUnblockingRule;
-    const preparedBlockingRule = new RegExp(`(^|\n)${escapeRegExp(blockingRule)}($|\n)`);
-    const preparedUnblockingRule = new RegExp(`(^|\n)${escapeRegExp(unblockingRule)}($|\n)`);
-
-    const matchPreparedBlockingRule = userRules.match(preparedBlockingRule);
-    const matchPreparedUnblockingRule = userRules.match(preparedUnblockingRule);
-
-    if (matchPreparedBlockingRule) {
-        await dispatch(setRules(userRules.replace(`${blockingRule}`, '')));
-        dispatch(addSuccessToast(i18next.t('rule_removed_from_custom_filtering_toast', { rule: blockingRule })));
-    } else if (!matchPreparedUnblockingRule) {
-        await dispatch(setRules(`${userRules}${lineEnding}${unblockingRule}\n`));
-        dispatch(addSuccessToast(i18next.t('rule_added_to_custom_filtering_toast', { rule: unblockingRule })));
-    } else if (matchPreparedUnblockingRule) {
-        dispatch(addSuccessToast(i18next.t('rule_added_to_custom_filtering_toast', { rule: unblockingRule })));
-        return;
-    } else if (!matchPreparedBlockingRule) {
-        dispatch(addSuccessToast(i18next.t('rule_removed_from_custom_filtering_toast', { rule: blockingRule })));
-        return;
-    }
-
-    dispatch(getFilteringStatus());
-};
-
-export const toggleBlockingForClient = (type, domain, client) => {
-    const baseRule = `||${domain}^$client='${client.replace(/'/g, '/\'')}'`;
-    const baseUnblocking = `@@${baseRule}`;
-
-    return toggleBlocking(type, domain, baseRule, baseUnblocking);
-};
--- a/client/src/actions/login.js
+++ b/client/src/actions/login.js
@@ -2,7 +2,6 @@ import { createAction } from 'redux-actions';

 import apiClient from '../api/Api';
 import { addErrorToast } from './toasts';
-import { HTML_PAGES } from '../helpers/constants';

 export const processLoginRequest = createAction('PROCESS_LOGIN_REQUEST');
 export const processLoginFailure = createAction('PROCESS_LOGIN_FAILURE');
@@ -12,8 +11,7 @@ export const processLogin = (values) => async (dispatch) => {
    dispatch(processLoginRequest());
    try {
        await apiClient.login(values);
-        const dashboardUrl = window.location.origin
-                + window.location.pathname.replace(HTML_PAGES.LOGIN, HTML_PAGES.MAIN);
+        const dashboardUrl = window.location.origin + window.location.pathname.replace('/login.html', '/');
        window.location.replace(dashboardUrl);
        dispatch(processLoginSuccess());
    } catch (error) {
--- a/client/src/actions/queryLogs.js
+++ b/client/src/actions/queryLogs.js
@@ -3,21 +3,12 @@ import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
 import { normalizeLogs, getParamsForClientsSearch, addClientInfo } from '../helpers/helpers';
 import {
-    DEFAULT_LOGS_FILTER, FORM_NAME, QUERY_LOGS_PAGE_LIMIT,
+    DEFAULT_LOGS_FILTER,
+    TABLE_DEFAULT_PAGE_SIZE,
+    TABLE_FIRST_PAGE,
 } 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({
@@ -25,8 +16,13 @@ const getLogsWithParams = async (config) => {
        older_than,
    });
    const { data, oldest } = rawLogs;
-    const normalizedLogs = normalizeLogs(data);
-    const logs = await enrichWithClientInfo(normalizedLogs);
+    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');
+    }

    return {
        logs,
@@ -41,22 +37,15 @@ export const getAdditionalLogsRequest = createAction('GET_ADDITIONAL_LOGS_REQUES
 export const getAdditionalLogsFailure = createAction('GET_ADDITIONAL_LOGS_FAILURE');
 export const getAdditionalLogsSuccess = createAction('GET_ADDITIONAL_LOGS_SUCCESS');

-const shortPollQueryLogs = async (data, filter, dispatch, getState, total) => {
+const checkFilteredLogs = async (data, filter, dispatch, total) => {
    const { logs, oldest } = data;
    const totalData = total || { logs };

-    const queryForm = getState().form[FORM_NAME.LOGS_FILTER];
-    const currentQuery = queryForm && queryForm.values.search;
-    const previousQuery = filter?.search;
-    const isQueryTheSame = typeof previousQuery === 'string'
-            && typeof currentQuery === 'string'
-            && previousQuery === currentQuery;
+    const needToGetAdditionalLogs = (logs.length < TABLE_DEFAULT_PAGE_SIZE
+        || totalData.logs.length < TABLE_DEFAULT_PAGE_SIZE)
+        && oldest !== '';

-    const isShortPollingNeeded = (logs.length < QUERY_LOGS_PAGE_LIMIT
-            || totalData.logs.length < QUERY_LOGS_PAGE_LIMIT)
-            && oldest !== '' && isQueryTheSame;
-
-    if (isShortPollingNeeded) {
+    if (needToGetAdditionalLogs) {
        dispatch(getAdditionalLogsRequest());

        try {
@@ -65,7 +54,7 @@ const shortPollQueryLogs = async (data, filter, dispatch, getState, total) => {
                filter,
            });
            if (additionalLogs.oldest.length > 0) {
-                return await shortPollQueryLogs(additionalLogs, filter, dispatch, getState, {
+                return await checkFilteredLogs(additionalLogs, filter, dispatch, {
                    logs: [...totalData.logs, ...additionalLogs.logs],
                    oldest: additionalLogs.oldest,
                });
@@ -82,42 +71,31 @@ const shortPollQueryLogs = async (data, filter, dispatch, getState, total) => {
    return totalData;
 };

+export const setLogsPagination = createAction('LOGS_PAGINATION');
+export const setLogsPage = createAction('SET_LOG_PAGE');
 export const toggleDetailedLogs = createAction('TOGGLE_DETAILED_LOGS');

 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) => {
+export const getLogs = (config) => async (dispatch, getState) => {
    dispatch(getLogsRequest());
    try {
-        const { isFiltered, filter, oldest } = getState().queryLogs;
+        const { isFiltered, filter, page } = getState().queryLogs;
        const data = await getLogsWithParams({
-            older_than: oldest,
+            ...config,
            filter,
        });

        if (isFiltered) {
-            const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
+            const additionalData = await checkFilteredLogs(data, filter, dispatch);
            const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
            dispatch(getLogsSuccess(updatedData));
+            dispatch(setLogsPagination({
+                page,
+                pageSize: TABLE_DEFAULT_PAGE_SIZE,
+            }));
        } else {
            dispatch(getLogsSuccess(data));
        }
@@ -133,7 +111,7 @@ export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
 *
 * @param filter
 * @param {string} filter.search
- * @param {string} filter.response_status 'QUERY' field of RESPONSE_FILTER object
+ * @param {string} filter.response_status query field of RESPONSE_FILTER object
 * @returns function
 */
 export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
@@ -142,20 +120,21 @@ export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
 export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
 export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');

-export const setFilteredLogs = (filter) => async (dispatch, getState) => {
+export const setFilteredLogs = (filter) => async (dispatch) => {
    dispatch(setFilteredLogsRequest());
    try {
        const data = await getLogsWithParams({
            older_than: '',
            filter,
        });
-        const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
+        const additionalData = await checkFilteredLogs(data, filter, dispatch);
        const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;

        dispatch(setFilteredLogsSuccess({
            ...updatedData,
            filter,
        }));
+        dispatch(setLogsPage(TABLE_FIRST_PAGE));
    } catch (error) {
        dispatch(addErrorToast({ error }));
        dispatch(setFilteredLogsFailure(error));
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -1,32 +1,26 @@
 import axios from 'axios';

 import { getPathWithQueryString } from '../helpers/helpers';
-import { QUERY_LOGS_PAGE_LIMIT, HTML_PAGES, R_PATH_LAST_PART } from '../helpers/constants';
+import { R_PATH_LAST_PART } from '../helpers/constants';
 import { BASE_URL } from '../../constants';

 class Api {
    baseUrl = BASE_URL;

    async makeRequest(path, method = 'POST', config) {
-        const url = `${this.baseUrl}/${path}`;
-
        try {
            const response = await axios({
-                url,
+                url: `${this.baseUrl}/${path}`,
                method,
                ...config,
            });
            return response.data;
        } catch (error) {
-            const errorPath = url;
+            console.error(error);
+            const errorPath = `${this.baseUrl}/${path}`;
            if (error.response) {
-                const { pathname } = document.location;
-                const shouldRedirect = pathname !== HTML_PAGES.LOGIN
-                        && pathname !== HTML_PAGES.INSTALL;
-
-                if (error.response.status === 403 && shouldRedirect) {
-                    const loginPageUrl = window.location.href
-                        .replace(R_PATH_LAST_PART, HTML_PAGES.LOGIN);
+                if (error.response.status === 403) {
+                    const loginPageUrl = window.location.href.replace(R_PATH_LAST_PART, '/login.html');
                    window.location.replace(loginPageUrl);
                    return false;
                }
@@ -38,13 +32,25 @@ class Api {
    }

    // Global methods
-    GLOBAL_STATUS = { path: 'status', method: 'GET' }
+    GLOBAL_STATUS = {
+        path: 'status',
+        method: 'GET',
+    };

-    GLOBAL_TEST_UPSTREAM_DNS = { path: 'test_upstream_dns', method: 'POST' };
+    GLOBAL_TEST_UPSTREAM_DNS = {
+        path: 'test_upstream_dns',
+        method: 'POST',
+    };

-    GLOBAL_VERSION = { path: 'version.json', method: 'POST' };
+    GLOBAL_VERSION = {
+        path: 'version.json',
+        method: 'POST',
+    };

-    GLOBAL_UPDATE = { path: 'update', method: 'POST' };
+    GLOBAL_UPDATE = {
+        path: 'update',
+        method: 'POST',
+    };

    getGlobalStatus() {
        const { path, method } = this.GLOBAL_STATUS;
@@ -75,21 +81,45 @@ class Api {
    }

    // Filtering
-    FILTERING_STATUS = { path: 'filtering/status', method: 'GET' };
+    FILTERING_STATUS = {
+        path: 'filtering/status',
+        method: 'GET',
+    };

-    FILTERING_ADD_FILTER = { path: 'filtering/add_url', method: 'POST' };
+    FILTERING_ADD_FILTER = {
+        path: 'filtering/add_url',
+        method: 'POST',
+    };

-    FILTERING_REMOVE_FILTER = { path: 'filtering/remove_url', method: 'POST' };
+    FILTERING_REMOVE_FILTER = {
+        path: 'filtering/remove_url',
+        method: 'POST',
+    };

-    FILTERING_SET_RULES = { path: 'filtering/set_rules', method: 'POST' };
+    FILTERING_SET_RULES = {
+        path: 'filtering/set_rules',
+        method: 'POST',
+    };

-    FILTERING_REFRESH = { path: 'filtering/refresh', method: 'POST' };
+    FILTERING_REFRESH = {
+        path: 'filtering/refresh',
+        method: 'POST',
+    };

-    FILTERING_SET_URL = { path: 'filtering/set_url', method: 'POST' };
+    FILTERING_SET_URL = {
+        path: 'filtering/set_url',
+        method: 'POST',
+    };

-    FILTERING_CONFIG = { path: 'filtering/config', method: 'POST' };
+    FILTERING_CONFIG = {
+        path: 'filtering/config',
+        method: 'POST',
+    };

-    FILTERING_CHECK_HOST = { path: 'filtering/check_host', method: 'GET' };
+    FILTERING_CHECK_HOST = {
+        path: 'filtering/check_host',
+        method: 'GET',
+    };

    getFilteringStatus() {
        const { path, method } = this.FILTERING_STATUS;
@@ -160,11 +190,20 @@ class Api {
    }

    // Parental
-    PARENTAL_STATUS = { path: 'parental/status', method: 'GET' };
+    PARENTAL_STATUS = {
+        path: 'parental/status',
+        method: 'GET',
+    };

-    PARENTAL_ENABLE = { path: 'parental/enable', method: 'POST' };
+    PARENTAL_ENABLE = {
+        path: 'parental/enable',
+        method: 'POST',
+    };

-    PARENTAL_DISABLE = { path: 'parental/disable', method: 'POST' };
+    PARENTAL_DISABLE = {
+        path: 'parental/disable',
+        method: 'POST',
+    };

    getParentalStatus() {
        const { path, method } = this.PARENTAL_STATUS;
@@ -187,11 +226,20 @@ class Api {
    }

    // Safebrowsing
-    SAFEBROWSING_STATUS = { path: 'safebrowsing/status', method: 'GET' };
+    SAFEBROWSING_STATUS = {
+        path: 'safebrowsing/status',
+        method: 'GET',
+    };

-    SAFEBROWSING_ENABLE = { path: 'safebrowsing/enable', method: 'POST' };
+    SAFEBROWSING_ENABLE = {
+        path: 'safebrowsing/enable',
+        method: 'POST',
+    };

-    SAFEBROWSING_DISABLE = { path: 'safebrowsing/disable', method: 'POST' };
+    SAFEBROWSING_DISABLE = {
+        path: 'safebrowsing/disable',
+        method: 'POST',
+    };

    getSafebrowsingStatus() {
        const { path, method } = this.SAFEBROWSING_STATUS;
@@ -209,11 +257,20 @@ class Api {
    }

    // Safesearch
-    SAFESEARCH_STATUS = { path: 'safesearch/status', method: 'GET' };
+    SAFESEARCH_STATUS = {
+        path: 'safesearch/status',
+        method: 'GET',
+    };

-    SAFESEARCH_ENABLE = { path: 'safesearch/enable', method: 'POST' };
+    SAFESEARCH_ENABLE = {
+        path: 'safesearch/enable',
+        method: 'POST',
+    };

-    SAFESEARCH_DISABLE = { path: 'safesearch/disable', method: 'POST' };
+    SAFESEARCH_DISABLE = {
+        path: 'safesearch/disable',
+        method: 'POST',
+    };

    getSafesearchStatus() {
        const { path, method } = this.SAFESEARCH_STATUS;
@@ -231,9 +288,15 @@ class Api {
    }

    // Language
-    CURRENT_LANGUAGE = { path: 'i18n/current_language', method: 'GET' };
+    CURRENT_LANGUAGE = {
+        path: 'i18n/current_language',
+        method: 'GET',
+    };

-    CHANGE_LANGUAGE = { path: 'i18n/change_language', method: 'POST' };
+    CHANGE_LANGUAGE = {
+        path: 'i18n/change_language',
+        method: 'POST',
+    };

    getCurrentLanguage() {
        const { path, method } = this.CURRENT_LANGUAGE;
@@ -250,19 +313,40 @@ class Api {
    }

    // DHCP
-    DHCP_STATUS = { path: 'dhcp/status', method: 'GET' };
+    DHCP_STATUS = {
+        path: 'dhcp/status',
+        method: 'GET',
+    };

-    DHCP_SET_CONFIG = { path: 'dhcp/set_config', method: 'POST' };
+    DHCP_SET_CONFIG = {
+        path: 'dhcp/set_config',
+        method: 'POST',
+    };

-    DHCP_FIND_ACTIVE = { path: 'dhcp/find_active_dhcp', method: 'POST' };
+    DHCP_FIND_ACTIVE = {
+        path: 'dhcp/find_active_dhcp',
+        method: 'POST',
+    };

-    DHCP_INTERFACES = { path: 'dhcp/interfaces', method: 'GET' };
+    DHCP_INTERFACES = {
+        path: 'dhcp/interfaces',
+        method: 'GET',
+    };

-    DHCP_ADD_STATIC_LEASE = { path: 'dhcp/add_static_lease', method: 'POST' };
+    DHCP_ADD_STATIC_LEASE = {
+        path: 'dhcp/add_static_lease',
+        method: 'POST',
+    };

-    DHCP_REMOVE_STATIC_LEASE = { path: 'dhcp/remove_static_lease', method: 'POST' };
+    DHCP_REMOVE_STATIC_LEASE = {
+        path: 'dhcp/remove_static_lease',
+        method: 'POST',
+    };

-    DHCP_RESET = { path: 'dhcp/reset', method: 'POST' };
+    DHCP_RESET = {
+        path: 'dhcp/reset',
+        method: 'POST',
+    };

    getDhcpStatus() {
        const { path, method } = this.DHCP_STATUS;
@@ -316,11 +400,20 @@ class Api {
    }

    // Installation
-    INSTALL_GET_ADDRESSES = { path: 'install/get_addresses', method: 'GET' };
+    INSTALL_GET_ADDRESSES = {
+        path: 'install/get_addresses',
+        method: 'GET',
+    };

-    INSTALL_CONFIGURE = { path: 'install/configure', method: 'POST' };
+    INSTALL_CONFIGURE = {
+        path: 'install/configure',
+        method: 'POST',
+    };

-    INSTALL_CHECK_CONFIG = { path: 'install/check_config', method: 'POST' };
+    INSTALL_CHECK_CONFIG = {
+        path: 'install/check_config',
+        method: 'POST',
+    };

    getDefaultAddresses() {
        const { path, method } = this.INSTALL_GET_ADDRESSES;
@@ -346,11 +439,20 @@ class Api {
    }

    // DNS-over-HTTPS and DNS-over-TLS
-    TLS_STATUS = { path: 'tls/status', method: 'GET' };
+    TLS_STATUS = {
+        path: 'tls/status',
+        method: 'GET',
+    };

-    TLS_CONFIG = { path: 'tls/configure', method: 'POST' };
+    TLS_CONFIG = {
+        path: 'tls/configure',
+        method: 'POST',
+    };

-    TLS_VALIDATE = { path: 'tls/validate', method: 'POST' };
+    TLS_VALIDATE = {
+        path: 'tls/validate',
+        method: 'POST',
+    };

    getTlsStatus() {
        const { path, method } = this.TLS_STATUS;
@@ -376,15 +478,30 @@ class Api {
    }

    // Per-client settings
-    GET_CLIENTS = { path: 'clients', method: 'GET' };
+    GET_CLIENTS = {
+        path: 'clients',
+        method: 'GET',
+    };

-    FIND_CLIENTS = { path: 'clients/find', method: 'GET' };
+    FIND_CLIENTS = {
+        path: 'clients/find',
+        method: 'GET',
+    };

-    ADD_CLIENT = { path: 'clients/add', method: 'POST' };
+    ADD_CLIENT = {
+        path: 'clients/add',
+        method: 'POST',
+    };

-    DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
+    DELETE_CLIENT = {
+        path: 'clients/delete',
+        method: 'POST',
+    };

-    UPDATE_CLIENT = { path: 'clients/update', method: 'POST' };
+    UPDATE_CLIENT = {
+        path: 'clients/update',
+        method: 'POST',
+    };

    getClients() {
        const { path, method } = this.GET_CLIENTS;
@@ -425,9 +542,15 @@ class Api {
    }

    // DNS access settings
-    ACCESS_LIST = { path: 'access/list', method: 'GET' };
+    ACCESS_LIST = {
+        path: 'access/list',
+        method: 'GET',
+    };

-    ACCESS_SET = { path: 'access/set', method: 'POST' };
+    ACCESS_SET = {
+        path: 'access/set',
+        method: 'POST',
+    };

    getAccessList() {
        const { path, method } = this.ACCESS_LIST;
@@ -444,11 +567,20 @@ class Api {
    }

    // DNS rewrites
-    REWRITES_LIST = { path: 'rewrite/list', method: 'GET' };
+    REWRITES_LIST = {
+        path: 'rewrite/list',
+        method: 'GET',
+    };

-    REWRITE_ADD = { path: 'rewrite/add', method: 'POST' };
+    REWRITE_ADD = {
+        path: 'rewrite/add',
+        method: 'POST',
+    };

-    REWRITE_DELETE = { path: 'rewrite/delete', method: 'POST' };
+    REWRITE_DELETE = {
+        path: 'rewrite/delete',
+        method: 'POST',
+    };

    getRewritesList() {
        const { path, method } = this.REWRITES_LIST;
@@ -474,9 +606,15 @@ class Api {
    }

    // Blocked services
-    BLOCKED_SERVICES_LIST = { path: 'blocked_services/list', method: 'GET' };
+    BLOCKED_SERVICES_LIST = {
+        path: 'blocked_services/list',
+        method: 'GET',
+    };

-    BLOCKED_SERVICES_SET = { path: 'blocked_services/set', method: 'POST' };
+    BLOCKED_SERVICES_SET = {
+        path: 'blocked_services/set',
+        method: 'POST',
+    };

    getBlockedServices() {
        const { path, method } = this.BLOCKED_SERVICES_LIST;
@@ -493,13 +631,25 @@ class Api {
    }

    // Settings for statistics
-    GET_STATS = { path: 'stats', method: 'GET' };
+    GET_STATS = {
+        path: 'stats',
+        method: 'GET',
+    };

-    STATS_INFO = { path: 'stats_info', method: 'GET' };
+    STATS_INFO = {
+        path: 'stats_info',
+        method: 'GET',
+    };

-    STATS_CONFIG = { path: 'stats_config', method: 'POST' };
+    STATS_CONFIG = {
+        path: 'stats_config',
+        method: 'POST',
+    };

-    STATS_RESET = { path: 'stats_reset', method: 'POST' };
+    STATS_RESET = {
+        path: 'stats_reset',
+        method: 'POST',
+    };

    getStats() {
        const { path, method } = this.GET_STATS;
@@ -526,18 +676,28 @@ class Api {
    }

    // Query log
-    GET_QUERY_LOG = { path: 'querylog', method: 'GET' };
+    GET_QUERY_LOG = {
+        path: 'querylog',
+        method: 'GET',
+    };

-    QUERY_LOG_CONFIG = { path: 'querylog_config', method: 'POST' };
+    QUERY_LOG_CONFIG = {
+        path: 'querylog_config',
+        method: 'POST',
+    };

-    QUERY_LOG_INFO = { path: 'querylog_info', method: 'GET' };
+    QUERY_LOG_INFO = {
+        path: 'querylog_info',
+        method: 'GET',
+    };

-    QUERY_LOG_CLEAR = { path: 'querylog_clear', method: 'POST' };
+    QUERY_LOG_CLEAR = {
+        path: 'querylog_clear',
+        method: 'POST',
+    };

    getQueryLog(params) {
        const { path, method } = this.GET_QUERY_LOG;
-        // eslint-disable-next-line no-param-reassign
-        params.limit = QUERY_LOGS_PAGE_LIMIT;
        const url = getPathWithQueryString(path, params);
        return this.makeRequest(url, method);
    }
@@ -562,7 +722,10 @@ class Api {
    }

    // Login
-    LOGIN = { path: 'login', method: 'POST' };
+    LOGIN = {
+        path: 'login',
+        method: 'POST',
+    };

    login(data) {
        const { path, method } = this.LOGIN;
@@ -574,7 +737,10 @@ class Api {
    }

    // Profile
-    GET_PROFILE = { path: 'profile', method: 'GET' };
+    GET_PROFILE = {
+        path: 'profile',
+        method: 'GET',
+    };

    getProfile() {
        const { path, method } = this.GET_PROFILE;
@@ -582,9 +748,15 @@ class Api {
    }

    // DNS config
-    GET_DNS_CONFIG = { path: 'dns_info', method: 'GET' };
+    GET_DNS_CONFIG = {
+        path: 'dns_info',
+        method: 'GET',
+    };

-    SET_DNS_CONFIG = { path: 'dns_config', method: 'POST' };
+    SET_DNS_CONFIG = {
+        path: 'dns_config',
+        method: 'POST',
+    };

    getDnsConfig() {
        const { path, method } = this.GET_DNS_CONFIG;
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -42,6 +42,13 @@ body {
    background: linear-gradient(45deg, rgba(99, 125, 120, 1) 0%, rgba(88, 177, 101, 1) 100%);
 }

+@media (max-width: 575px) {
+    .container {
+        padding-right: 0;
+        padding-left: 0;
+    }
+}
+
 .modal-body--medium {
    max-height: 20rem;
    overflow-y: scroll;
@@ -58,20 +65,3 @@ body {
 .mw-75 {
    max-width: 75% !important;
 }
-
-.cursor--not-allowed {
-    cursor: not-allowed;
-}
-
-.select--no-warning {
-    margin-bottom: 1.375rem;
-}
-
-.button-action {
-    visibility: hidden;
-}
-
-.logs__row:hover .button-action,
-.button-action--active {
-    visibility: visible;
-}
--- a/client/src/components/App/index.js
+++ b/client/src/components/App/index.js
@@ -26,19 +26,18 @@ import Header from '../Header';
 import { changeLanguage, getDnsStatus } from '../../actions';

 import Dashboard from '../../containers/Dashboard';
+import Logs from '../../containers/Logs';
 import SetupGuide from '../../containers/SetupGuide';
 import Settings from '../../containers/Settings';
 import Dns from '../../containers/Dns';
 import Encryption from '../../containers/Encryption';
-import Dhcp from '../Settings/Dhcp';
+import Dhcp from '../../containers/Dhcp';
 import Clients from '../../containers/Clients';
 import DnsBlocklist from '../../containers/DnsBlocklist';
 import DnsAllowlist from '../../containers/DnsAllowlist';
 import DnsRewrites from '../../containers/DnsRewrites';
 import CustomRules from '../../containers/CustomRules';
 import Services from '../Filters/Services';
-import Logs from '../Logs';
-

 const ROUTES = [
    {
@@ -97,10 +96,10 @@ const ROUTES = [
 ];

 const renderRoute = ({ path, component, exact }, idx) => <Route
-        key={idx}
-        exact={exact}
-        path={path}
-        component={component}
+    key={idx}
+    exact={exact}
+    path={path}
+    component={component}
 />;

 const App = () => {
@@ -143,28 +142,34 @@ const App = () => {
        window.location.reload();
    };

-    return <HashRouter hashType="noslash">
-        {updateAvailable && <>
-            <UpdateTopline />
-            <UpdateOverlay />
-        </>}
-        {!processingEncryption && <EncryptionTopline />}
-        <LoadingBar className="loading-bar" updateTime={1000} />
-        <Header />
-        <div className="container container--wrap pb-5">
-            {processing && <Loading />}
-            {!isCoreRunning && <div className="row row-cards">
-                <div className="col-lg-12">
-                    <Status reloadPage={reloadPage} message="dns_start" />
-                    <Loading />
+    return (
+        <HashRouter hashType="noslash">
+            <>
+                {updateAvailable && <>
+                    <UpdateTopline />
+                    <UpdateOverlay />
+                </>}
+                {!processingEncryption && <EncryptionTopline />}
+                <LoadingBar className="loading-bar" updateTime={1000} />
+                <Header />
+                <div className="container container--wrap pb-5">
+                    {processing && <Loading />}
+                    {!isCoreRunning && (
+                        <div className="row row-cards">
+                            <div className="col-lg-12">
+                                <Status reloadPage={reloadPage} message="dns_start" />
+                                <Loading />
+                            </div>
+                        </div>
+                    )}
+                    {!processing && isCoreRunning && ROUTES.map(renderRoute)}
                </div>
-            </div>}
-            {!processing && isCoreRunning && ROUTES.map(renderRoute)}
-        </div>
-        <Footer />
-        <Toasts />
-        <Icons />
-    </HashRouter>;
+                <Footer />
+                <Toasts />
+                <Icons />
+            </>
+        </HashRouter>
+    );
 };

 renderRoute.propTypes = {
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -1,18 +1,14 @@
 import React from 'react';
 import ReactTable from 'react-table';
 import PropTypes from 'prop-types';
-import { Trans, useTranslation } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';

-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import classNames from 'classnames';
 import Card from '../ui/Card';
 import Cell from '../ui/Cell';

-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';
+import { getPercent, getIpMatchListStatus, sortIp } from '../../helpers/helpers';
+import { IP_MATCH_LIST_STATUS, STATUS_COLORS } from '../../helpers/constants';
+import { formatClientCell } from '../../helpers/formatClientCell';

 const getClientsPercentColor = (percent) => {
    if (percent > 50) {
@@ -24,123 +20,126 @@ const getClientsPercentColor = (percent) => {
    return STATUS_COLORS.red;
 };

-const CountCell = (row) => {
-    const { value, original: { ip } } = row;
-    const numDnsQueries = useSelector((state) => state.stats.numDnsQueries, shallowEqual);
-
-    const percent = getPercent(numDnsQueries, value);
+const countCell = (dnsQueries) => function cell(row) {
+    const { value } = row;
+    const percent = getPercent(dnsQueries, value);
    const percentColor = getClientsPercentColor(percent);

-    return <Cell value={value} percent={percent} color={percentColor} search={ip} />;
+    return <Cell value={value} percent={percent} color={percentColor} search={row.original.ip} />;
 };

-const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
-    const dispatch = useDispatch();
-    const { t } = useTranslation();
-    const processingSet = useSelector((state) => state.access.processingSet);
-
-    const buttonClass = classNames('button-action button-action--main', {
-        'button-action--unblock': disallowed,
-    });
-
-    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)) {
-            await dispatch(toggleClientBlock(ip, disallowed, disallowed_rule));
-            await dispatch(getStats());
+const renderBlockingButton = (ipMatchListStatus, ip, handleClick, processing) => {
+    const buttonProps = ipMatchListStatus === IP_MATCH_LIST_STATUS.NOT_FOUND
+        ? {
+            className: 'btn-outline-danger',
+            text: 'block',
+            type: 'block',
        }
-    };
+        : {
+            className: 'btn-outline-secondary',
+            text: 'unblock',
+            type: 'unblock',
+        };

-    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
+    return (
+        <div className="table__action button__action">
+            <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>;
+                className={`btn btn-sm ${buttonProps.className}`}
+                onClick={() => handleClick(buttonProps.type, ip)}
+                disabled={processing}
+            >
+                <Trans>{buttonProps.text}</Trans>
+            </button>
+        </div>
+    );
 };

-const ClientCell = (row) => {
-    const { value, original: { info, info: { disallowed, disallowed_rule } } } = row;
+const clientCell = (t, toggleClientStatus, processing, disallowedClients) => function cell(row) {
+    const { value } = row;
+    const ipMatchListStatus = getIpMatchListStatus(value, disallowedClients);

-    return <>
-        <div className="logs__row logs__row--overflow logs__row--column d-flex align-items-center">
-            {renderFormattedClientCell(value, info, true)}
-            {renderBlockingButton(value, disallowed, disallowed_rule)}
-        </div>
-    </>;
+    return (
+        <>
+            <div className="logs__row logs__row--overflow logs__row--column">
+                {formatClientCell(row, true, false)}
+            </div>
+            {ipMatchListStatus !== IP_MATCH_LIST_STATUS.CIDR
+            && renderBlockingButton(ipMatchListStatus, value, toggleClientStatus, processing)}
+        </>
+    );
 };

 const Clients = ({
+    t,
    refreshButton,
+    topClients,
    subtitle,
-}) => {
-    const { t } = useTranslation();
-    const topClients = useSelector((state) => state.stats.topClients, shallowEqual);
-
-    return <Card
-            title={t('top_clients')}
-            subtitle={subtitle}
-            bodyType="card-table"
-            refresh={refreshButton}
+    dnsQueries,
+    toggleClientStatus,
+    processingAccessSet,
+    disallowedClients,
+}) => (
+    <Card
+        title={t('top_clients')}
+        subtitle={subtitle}
+        bodyType="card-table"
+        refresh={refreshButton}
    >
        <ReactTable
-                data={topClients.map(({
-                    name: ip, count, info, blocked,
-                }) => ({
-                    ip,
-                    count,
-                    info,
-                    blocked,
-                }))}
-                columns={[
-                    {
-                        Header: 'IP',
-                        accessor: 'ip',
-                        sortMethod: sortIp,
-                        Cell: ClientCell,
-                    },
-                    {
-                        Header: <Trans>requests_count</Trans>,
-                        accessor: 'count',
-                        minWidth: 180,
-                        maxWidth: 200,
-                        Cell: CountCell,
-                    },
-                ]}
-                showPagination={false}
-                noDataText={t('no_clients_found')}
-                minRows={6}
-                defaultPageSize={100}
-                className="-highlight card-table-overflow--limited clients__table"
-                getTrProps={(_state, rowInfo) => {
-                    if (!rowInfo) {
-                        return {};
-                    }
+            data={topClients.map(({
+                name: ip, count, info, blocked,
+            }) => ({
+                ip,
+                count,
+                info,
+                blocked,
+            }))}
+            columns={[
+                {
+                    Header: 'IP',
+                    accessor: 'ip',
+                    sortMethod: sortIp,
+                    Cell: clientCell(t, toggleClientStatus, processingAccessSet, disallowedClients),
+                },
+                {
+                    Header: <Trans>requests_count</Trans>,
+                    accessor: 'count',
+                    minWidth: 180,
+                    maxWidth: 200,
+                    Cell: countCell(dnsQueries),
+                },
+            ]}
+            showPagination={false}
+            noDataText={t('no_clients_found')}
+            minRows={6}
+            defaultPageSize={100}
+            className="-highlight card-table-overflow--limited clients__table"
+            getTrProps={(_state, rowInfo) => {
+                if (!rowInfo) {
+                    return {};
+                }

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

-                    return disallowed ? { className: 'logs__row--red' } : {};
-                }}
+                return getIpMatchListStatus(ip, disallowedClients)
+                === IP_MATCH_LIST_STATUS.NOT_FOUND ? {} : { className: 'red' };
+            }}
        />
-    </Card>;
-};
+    </Card>
+);

 Clients.propTypes = {
+    topClients: PropTypes.array.isRequired,
+    dnsQueries: PropTypes.number.isRequired,
    refreshButton: PropTypes.node.isRequired,
+    clients: PropTypes.array.isRequired,
+    autoClients: PropTypes.array.isRequired,
    subtitle: PropTypes.string.isRequired,
+    t: PropTypes.func.isRequired,
+    toggleClientStatus: PropTypes.func.isRequired,
+    processingAccessSet: PropTypes.bool.isRequired,
+    disallowedClients: PropTypes.string.isRequired,
 };

-export default Clients;
+export default withTranslation()(Clients);
--- a/client/src/components/Dashboard/Counters.js
+++ b/client/src/components/Dashboard/Counters.js
@@ -47,32 +47,32 @@ const Counters = ({ refreshButton, subtitle }) => {
            label: 'dns_query',
            count: numDnsQueries,
            tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
-            response_status: RESPONSE_FILTER.ALL.QUERY,
+            response_status: RESPONSE_FILTER.ALL.query,
        },
        {
            label: 'blocked_by',
            count: numBlockedFiltering,
            tooltipTitle: 'number_of_dns_query_blocked_24_hours',
-            response_status: RESPONSE_FILTER.BLOCKED.QUERY,
+            response_status: RESPONSE_FILTER.BLOCKED.query,
            translationComponents: [<a href="#filters" key="0">link</a>],
        },
        {
            label: 'stats_malware_phishing',
            count: numReplacedSafebrowsing,
            tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
-            response_status: RESPONSE_FILTER.BLOCKED_THREATS.QUERY,
+            response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
        },
        {
            label: 'stats_adult',
            count: numReplacedParental,
            tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
-            response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.QUERY,
+            response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
        },
        {
            label: 'enforced_save_search',
            count: numReplacedSafesearch,
            tooltipTitle: 'number_of_dns_query_to_safe_search',
-            response_status: RESPONSE_FILTER.SAFE_SEARCH.QUERY,
+            response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
        },
        {
            label: 'average_processing_time',
--- a/client/src/components/Dashboard/Dashboard.css
+++ b/client/src/components/Dashboard/Dashboard.css
@@ -26,10 +26,3 @@
    left: -20px;
    width: calc(100% + 20px);
 }
-
-@media (max-width: 1279.98px) {
-    .table__action {
-        position: absolute;
-        right: 0;
-    }
-}
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -1,6 +1,6 @@
-import React, { useEffect } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { Trans, useTranslation } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';

 import Statistics from './Statistics';
 import Counters from './Counters';
@@ -10,132 +10,147 @@ import BlockedDomains from './BlockedDomains';

 import PageTitle from '../ui/PageTitle';
 import Loading from '../ui/Loading';
+import { BLOCK_ACTIONS } from '../../helpers/constants';
 import './Dashboard.css';

-const Dashboard = ({
-    getAccessList,
-    getStats,
-    getStatsConfig,
-    dashboard,
-    toggleProtection,
-    stats,
-    access,
-}) => {
-    const { t } = useTranslation();
+class Dashboard extends Component {
+    componentDidMount() {
+        this.getAllStats();
+    }

-    const getAllStats = () => {
-        getAccessList();
-        getStats();
-        getStatsConfig();
+    getAllStats = () => {
+        this.props.getAccessList();
+        this.props.getStats();
+        this.props.getStatsConfig();
    };

-    useEffect(() => {
-        getAllStats();
-    }, []);
-
-    const getToggleFilteringButton = () => {
-        const { protectionEnabled, processingProtection } = dashboard;
+    getToggleFilteringButton = () => {
+        const { protectionEnabled, processingProtection } = this.props.dashboard;
        const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
        const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';

-        return <button
+        return (
+            <button
                type="button"
                className={`btn btn-sm mr-2 ${buttonClass}`}
-                onClick={() => toggleProtection(protectionEnabled)}
+                onClick={() => this.props.toggleProtection(protectionEnabled)}
                disabled={processingProtection}
-        >
-            <Trans>{buttonText}</Trans>
-        </button>;
+            >
+                <Trans>{buttonText}</Trans>
+            </button>
+        );
    };

-    const refreshButton = <button
-            type="button"
-            className="btn btn-icon btn-outline-primary btn-sm"
-            onClick={() => getAllStats()}
-    >
-        <svg className="icons">
-            <use xlinkHref="#refresh" />
-        </svg>
-    </button>;
+    toggleClientStatus = (type, ip) => {
+        const confirmMessage = type === BLOCK_ACTIONS.BLOCK ? 'client_confirm_block' : 'client_confirm_unblock';

-    const subtitle = stats.interval === 1
-        ? t('for_last_24_hours')
-        : t('for_last_days', { count: stats.interval });
+        if (window.confirm(this.props.t(confirmMessage, { ip }))) {
+            this.props.toggleClientBlock(type, ip);
+        }
+    };

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

-    return <>
-        <PageTitle title={t('dashboard')}>
-            <div className="page-title__actions">
-                {getToggleFilteringButton()}
-                {refreshFullButton}
-            </div>
-        </PageTitle>
-        {statsProcessing && <Loading />}
-        {!statsProcessing && <div className="row row-cards dashboard">
-            <div className="col-lg-12">
-                <Statistics
-                        interval={stats.interval}
-                        dnsQueries={stats.dnsQueries}
-                        blockedFiltering={stats.blockedFiltering}
-                        replacedSafebrowsing={stats.replacedSafebrowsing}
-                        replacedParental={stats.replacedParental}
-                        numDnsQueries={stats.numDnsQueries}
-                        numBlockedFiltering={stats.numBlockedFiltering}
-                        numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
-                        numReplacedParental={stats.numReplacedParental}
-                        refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <Counters
-                        subtitle={subtitle}
-                        refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <Clients
-                        subtitle={subtitle}
-                        dnsQueries={stats.numDnsQueries}
-                        topClients={stats.topClients}
-                        clients={dashboard.clients}
-                        autoClients={dashboard.autoClients}
-                        refreshButton={refreshButton}
-                        processingAccessSet={access.processingSet}
-                        disallowedClients={access.disallowed_clients}
-                />
-            </div>
-            <div className="col-lg-6">
-                <QueriedDomains
-                        subtitle={subtitle}
-                        dnsQueries={stats.numDnsQueries}
-                        topQueriedDomains={stats.topQueriedDomains}
-                        refreshButton={refreshButton}
-                />
-            </div>
-            <div className="col-lg-6">
-                <BlockedDomains
-                        subtitle={subtitle}
-                        topBlockedDomains={stats.topBlockedDomains}
-                        blockedFiltering={stats.numBlockedFiltering}
-                        replacedSafebrowsing={stats.numReplacedSafebrowsing}
-                        replacedParental={stats.numReplacedParental}
-                        refreshButton={refreshButton}
-                />
-            </div>
-        </div>}
-    </>;
-};
+        const subtitle = stats.interval === 1
+            ? 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={() => this.getAllStats()}
+            >
+                <Trans>refresh_statics</Trans>
+            </button>
+        );
+
+        const refreshButton = (
+            <button
+                type="button"
+                className="btn btn-icon btn-outline-primary btn-sm"
+                onClick={() => this.getAllStats()}
+            >
+                <svg className="icons">
+                    <use xlinkHref="#refresh" />
+                </svg>
+            </button>
+        );
+
+        return (
+            <Fragment>
+                <PageTitle title={t('dashboard')}>
+                    <div className="page-title__actions">
+                        {this.getToggleFilteringButton()}
+                        {refreshFullButton}
+                    </div>
+                </PageTitle>
+                {statsProcessing && <Loading />}
+                {!statsProcessing && (
+                    <div className="row row-cards">
+                        <div className="col-lg-12">
+                            <Statistics
+                                interval={stats.interval}
+                                dnsQueries={stats.dnsQueries}
+                                blockedFiltering={stats.blockedFiltering}
+                                replacedSafebrowsing={stats.replacedSafebrowsing}
+                                replacedParental={stats.replacedParental}
+                                numDnsQueries={stats.numDnsQueries}
+                                numBlockedFiltering={stats.numBlockedFiltering}
+                                numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
+                                numReplacedParental={stats.numReplacedParental}
+                                refreshButton={refreshButton}
+                            />
+                        </div>
+                        <div className="col-lg-6">
+                            <Counters
+                                subtitle={subtitle}
+                                refreshButton={refreshButton}
+                            />
+                        </div>
+                        <div className="col-lg-6">
+                            <Clients
+                                subtitle={subtitle}
+                                dnsQueries={stats.numDnsQueries}
+                                topClients={stats.topClients}
+                                clients={dashboard.clients}
+                                autoClients={dashboard.autoClients}
+                                refreshButton={refreshButton}
+                                toggleClientStatus={this.toggleClientStatus}
+                                processingAccessSet={access.processingSet}
+                                disallowedClients={access.disallowed_clients}
+                            />
+                        </div>
+                        <div className="col-lg-6">
+                            <QueriedDomains
+                                subtitle={subtitle}
+                                dnsQueries={stats.numDnsQueries}
+                                topQueriedDomains={stats.topQueriedDomains}
+                                refreshButton={refreshButton}
+                            />
+                        </div>
+                        <div className="col-lg-6">
+                            <BlockedDomains
+                                subtitle={subtitle}
+                                topBlockedDomains={stats.topBlockedDomains}
+                                blockedFiltering={stats.numBlockedFiltering}
+                                replacedSafebrowsing={stats.numReplacedSafebrowsing}
+                                replacedParental={stats.numReplacedParental}
+                                refreshButton={refreshButton}
+                            />
+                        </div>
+                    </div>
+                )}
+            </Fragment>
+        );
+    }
+}

 Dashboard.propTypes = {
    dashboard: PropTypes.object.isRequired,
@@ -145,7 +160,9 @@ Dashboard.propTypes = {
    getStatsConfig: PropTypes.func.isRequired,
    toggleProtection: PropTypes.func.isRequired,
    getClients: PropTypes.func.isRequired,
+    t: PropTypes.func.isRequired,
+    toggleClientBlock: PropTypes.func.isRequired,
    getAccessList: PropTypes.func.isRequired,
 };

-export default Dashboard;
+export default withTranslation()(Dashboard);
--- a/client/src/components/Filters/Check/Info.js
+++ b/client/src/components/Filters/Check/Info.js
@@ -1,124 +1,165 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import classNames from 'classnames';
+import React, { Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { withTranslation } from 'react-i18next';

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

-const renderBlockingButton = (isFiltered, domain) => {
-    const processingRules = useSelector((state) => state.filtering.processingRules);
-    const dispatch = useDispatch();
-    const { t } = useTranslation();
-
-    const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
-
-    const onClick = async () => {
-        await dispatch(toggleBlocking(buttonType, domain));
-    };
-
-    const buttonClass = classNames('mt-3 button-action button-action--main button-action--active button-action--small', {
-        'button-action--unblock': isFiltered,
-    });
-
-    return <button type="button"
-                className={buttonClass}
-                onClick={onClick}
-                disabled={processingRules}
-        >
-            {t(buttonType)}
-        </button>;
-};
-
-const getTitle = (reason) => {
-    const { t } = useTranslation();
-
-    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 filterName = getFilterName(
-        filters,
-        whitelistFilters,
-        filter_id,
-        'filtered_custom_rules',
-        (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];
+const getFilterName = (id, filters, whitelistFilters, t) => {
+    if (id === 0) {
+        return t('filtered_custom_rules');
    }

-    return <>
-        <div>{t('check_reason', { reason })}</div>
-        <div>{filterName}</div>
-    </>;
+    const filter = filters.find((filter) => filter.id === id)
+        || whitelistFilters.find((filter) => filter.id === id);
+
+    if (filter && filter.name) {
+        return t('query_log_filtered', { filter: filter.name });
+    }
+
+    return '';
 };

-const Info = () => {
-    const {
-        hostname,
-        reason,
-        rule,
-        service_name,
-        cname,
-        ip_addrs,
-    } = useSelector((state) => state.filtering.check, shallowEqual);
-    const { t } = useTranslation();
+const getTitle = (reason, filterName, t, onlyFiltered) => {
+    if (checkNotFilteredNotFound(reason)) {
+        return t('check_not_found');
+    }

-    const title = getTitle(reason);
+    if (checkRewrite(reason)) {
+        return t('rewrite_applied');
+    }

-    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),
-    });
+    if (checkRewriteHosts(reason)) {
+        return t('rewrite_hosts_applied');
+    }

+    if (checkBlackList(reason)) {
+        return filterName;
+    }
+
+    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>
+    );
+};
+
+const getColor = (reason) => {
+    if (checkFiltered(reason)) {
+        return 'red';
+    } if (checkRewrite(reason) || checkRewriteHosts(reason)) {
+        return 'blue';
+    } if (checkWhiteList(reason)) {
+        return 'green';
+    }
+
+    return '';
+};
+
+const Info = ({
+    filters,
+    whitelistFilters,
+    hostname,
+    reason,
+    filter_id,
+    rule,
+    service_name,
+    cname,
+    ip_addrs,
+    t,
+}) => {
+    const filterName = getFilterName(filter_id, filters, whitelistFilters, t);
    const onlyFiltered = checkSafeSearch(reason)
        || checkSafeBrowsing(reason)
        || checkParental(reason);
+    const title = getTitle(reason, filterName, t, onlyFiltered);
+    const color = getColor(reason);

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

-export default Info;
+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);
--- a/client/src/components/Filters/Check/index.js
+++ b/client/src/components/Filters/Check/index.js
@@ -1,66 +1,99 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
 import { Field, reduxForm } from 'redux-form';
-import { useSelector } from 'react-redux';
+import flow from 'lodash/flow';
 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,
-        handleSubmit,
+        processing,
+        check,
+        filters,
+        whitelistFilters,
    } = props;

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

-    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>
+    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>
+                        )}
                    </div>
-                    {hostname && <>
-                        <hr />
-                        <Info />
-                    </>}
                </div>
-            </div>
-        </form>
-    </Card>;
+            </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 reduxForm({ form: FORM_NAME.DOMAIN_CHECK })(Check);
+export default flow([
+    withTranslation(),
+    reduxForm({ form: FORM_NAME.DOMAIN_CHECK }),
+])(Check);
--- a/client/src/components/Filters/CustomRules.js
+++ b/client/src/components/Filters/CustomRules.js
@@ -1,18 +1,13 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } 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();
    }
@@ -39,42 +34,30 @@ 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={classnames('form-control font-monospace text-input form-control--textarea-large', {
-                                    'text-input--largest': isFirefox,
-                                })}
-                                value={userRules}
-                                onChange={this.handleChange}
-                                onScroll={this.onScroll}
+                            className="form-control form-control--textarea-large font-monospace"
+                            value={userRules}
+                            onChange={this.handleChange}
                        />
-                            {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"
@@ -88,8 +71,14 @@ class CustomRules extends Component {
                    <hr />
                    <Examples />
                </Card>
-                <Check onSubmit={this.handleCheck} />
-            </>
+                <Check
+                    filters={filters}
+                    whitelistFilters={whitelistFilters}
+                    check={check}
+                    onSubmit={this.handleCheck}
+                    processing={processingCheck}
+                />
+            </Fragment>
        );
    }
 }
--- 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 { modalFilterUrl, modalType } = this.props.filtering;
+        const { filtering: { modalFilterUrl, modalType } } = this.props;

        switch (modalType) {
            case MODAL_TYPE.EDIT_FILTERS:
--- a/client/src/components/Filters/Form.js
+++ b/client/src/components/Filters/Form.js
@@ -5,11 +5,9 @@ import { withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 import classNames from 'classnames';
 import { validatePath, validateRequiredValue } from '../../helpers/validators';
-import { CheckboxField, renderInputField } from '../../helpers/form';
+import { renderInputField, renderSelectField } 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',
@@ -34,22 +32,6 @@ 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];
@@ -76,11 +58,12 @@ 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}
+                        component={renderSelectField}
                        placeholder={t(name)}
                        disabled={isSelected}
+                        checked={isSelected}
                    />
                    {renderIcons(iconsData)}
                </div>;
@@ -99,6 +82,7 @@ const Form = (props) => {
        modalType,
        toggleFilteringModal,
        selectedSources,
+        filtersCatalog,
    } = props;

    const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
@@ -164,13 +148,13 @@ const Form = (props) => {
            >
                {t('cancel_btn')}
            </button>
-            {modalType !== MODAL_TYPE.SELECT_MODAL_TYPE && <button
+            <button
                type="submit"
                className="btn btn-success"
                disabled={processingAddFilter || processingConfigFilter}
            >
                {t('save_btn')}
-            </button>}
+            </button>
        </div>
    </form>;
 };
@@ -184,6 +168,7 @@ 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,7 +78,6 @@ class Modal extends Component {
                break;
            }
            default:
-                break;
        }

        const title = t(getTitle(modalType, whitelist));
@@ -100,6 +99,7 @@ class Modal extends Component {
                    <Form
                        selectedSources={selectedSources}
                        initialValues={initialValues}
+                        filtersCatalog={filtersCatalog}
                        modalType={modalType}
                        onSubmit={handleSubmit}
                        processingAddFilter={processingAddFilter}
--- a/client/src/components/Filters/Table.js
+++ b/client/src/components/Filters/Table.js
@@ -48,7 +48,7 @@ class Table extends Component {
            accessor: 'url',
            minWidth: 200,
            Cell: ({ value }) => (
-                <div className="logs__row">
+                <div className="logs__row o-hidden">
                    {isValidAbsolutePath(value) ? value
                        : <a
                            href={value}
--- a/client/src/components/Header/Header.css
+++ b/client/src/components/Header/Header.css
@@ -164,10 +164,6 @@
        color: #9aa0ac;
    }

-    .nav-icon--white {
-        color: #fff;
-    }
-
    .header-brand-img {
        height: 32px;
    }
--- a/client/src/components/Header/index.js
+++ b/client/src/components/Header/index.js
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { shallowEqual, useSelector } from 'react-redux';
-import { useTranslation } from 'react-i18next';
+import { Trans } from 'react-i18next';
 import classnames from 'classnames';
 import Menu from './Menu';
 import logo from '../ui/svg/logo.svg';
@@ -9,7 +9,6 @@ import './Header.css';

 const Header = () => {
    const [isMenuOpen, setIsMenuOpen] = useState(false);
-    const { t } = useTranslation();

    const {
        protectionEnabled,
@@ -34,42 +33,45 @@ const Header = () => {
        'badge-danger': !protectionEnabled,
    });

-    return <div className="header">
-        <div className="header__container">
-            <div className="header__row">
-                <div
-                    className="header-toggler d-lg-none ml-lg-0 collapsed"
-                    onClick={toggleMenuOpen}
-                >
-                    <span className="header-toggler-icon" />
-                </div>
-                <div className="header__column">
-                    <div className="d-flex align-items-center">
-                        <Link to="/" className="nav-link pl-0 pr-1">
-                            <img src={logo} alt="" className="header-brand-img" />
-                        </Link>
-                        {!processing && isCoreRunning
-                        && <span className={badgeClass}
-                        >{t(protectionEnabled ? 'on' : 'off')}
-                        </span>}
+    return (
+        <div className="header">
+            <div className="header__container">
+                <div className="header__row">
+                    <div
+                        className="header-toggler d-lg-none ml-lg-0 collapsed"
+                        onClick={toggleMenuOpen}
+                    >
+                        <span className="header-toggler-icon" />
                    </div>
-                </div>
-                <Menu
-                    pathname={pathname}
-                    isMenuOpen={isMenuOpen}
-                    closeMenu={closeMenu}
-                />
-                <div className="header__column">
-                    <div className="header__right">
-                        {!processingProfile && name
-                        && <a href="control/logout" className="btn btn-sm btn-outline-secondary">
-                            {t('sign_out')}
-                        </a>}
+                    <div className="header__column">
+                        <div className="d-flex align-items-center">
+                            <Link to="/" className="nav-link pl-0 pr-1">
+                                <img src={logo} alt="" className="header-brand-img" />
+                            </Link>
+                            {!processing && isCoreRunning && (
+                                <span className={badgeClass}>
+                                        <Trans>{protectionEnabled ? 'on' : 'off'}</Trans>
+                                    </span>
+                            )}
+                        </div>
+                    </div>
+                    <Menu
+                        pathname={pathname}
+                        isMenuOpen={isMenuOpen}
+                        closeMenu={closeMenu}
+                    />
+                    <div className="header__column">
+                        <div className="header__right">
+                            {!processingProfile && name
+                            && <a href="control/logout" className="btn btn-sm btn-outline-secondary">
+                                <Trans>sign_out</Trans>
+                            </a>}
+                        </div>
                    </div>
                </div>
            </div>
        </div>
-    </div>;
+    );
 };

 export default Header;
--- a/client/src/components/Logs/Cells/ClientCell.js
+++ b/client/src/components/Logs/Cells/ClientCell.js
@@ -1,184 +0,0 @@
-import React, { useState } from 'react';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { nanoid } from 'nanoid';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import propTypes from 'prop-types';
-import { checkFiltered, getBlockingClientName } from '../../../helpers/helpers';
-import { BLOCK_ACTIONS } from '../../../helpers/constants';
-import { toggleBlocking, toggleBlockingForClient } from '../../../actions';
-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, disallowed, disallowed_rule,
-    },
-    reason,
-}) => {
-    const { t } = useTranslation();
-    const dispatch = useDispatch();
-    const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
-    const processingRules = useSelector((state) => state.filtering.processingRules);
-    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-    const [isOptionsOpened, setOptionsOpened] = useState(false);
-
-    const autoClient = autoClients.find((autoClient) => autoClient.name === client);
-    const source = autoClient?.source;
-    const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
-
-    const id = nanoid();
-
-    const data = {
-        address: client,
-        name,
-        country: whois_info?.country,
-        city: whois_info?.city,
-        network: whois_info?.orgname,
-        source_label: source,
-    };
-
-    const processedData = Object.entries(data);
-
-    const isFiltered = checkFiltered(reason);
-
-    const nameClass = classNames('w-90 o-hidden d-flex flex-column', {
-        'mt-2': isDetailed && !name && !whoisAvailable,
-        'white-space--nowrap': isDetailed,
-    });
-
-    const hintClass = classNames('icons mr-4 icon--24 icon--lightgray', {
-        'my-3': isDetailed,
-    });
-
-    const renderBlockingButton = (isFiltered, domain) => {
-        const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
-        const clients = useSelector((state) => state.dashboard.clients);
-
-        const {
-            confirmMessage,
-            buttonKey: blockingClientKey,
-            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 = [
-            {
-                name: blockingForClientKey,
-                onClick: () => {
-                    dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
-                },
-            },
-            {
-                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 = (options) => {
-            if (options.length === 0) {
-                return null;
-            }
-            return <>{options.map(({ name, onClick, disabled }) => <button
-                    key={name}
-                    className="button-action--arrow-option px-4 py-2"
-                    onClick={onClick}
-                    disabled={disabled}
-            >{t(name)}
-            </button>)}</>;
-        };
-
-        const content = getOptions(BUTTON_OPTIONS);
-
-        const buttonClass = classNames('button-action button-action--main', {
-            'button-action--unblock': isFiltered,
-            'button-action--with-options': content,
-            'button-action--active': isOptionsOpened,
-        });
-
-        const buttonArrowClass = classNames('button-action button-action--arrow', {
-            'button-action--unblock': isFiltered,
-            'button-action--active': isOptionsOpened,
-        });
-
-        const containerClass = classNames('button-action__container', {
-            'button-action__container--detailed': isDetailed,
-        });
-
-        return <div className={containerClass}>
-            <button type="button"
-                    className={buttonClass}
-                    onClick={onClick}
-                    disabled={processingRules}
-            >
-                {t(buttonType)}
-            </button>
-            {content && <button className={buttonArrowClass} disabled={processingRules}>
-                <IconTooltip
-                        className='h-100'
-                        tooltipClass='button-action--arrow-option-container'
-                        xlinkHref='chevron-down'
-                        triggerClass='button-action--icon'
-                        content={content} placement="bottom-end" trigger="click"
-                        onVisibilityChange={setOptionsOpened}
-                />
-            </button>}
-        </div>;
-    };
-
-    return <div className="o-hidden h-100 logs__cell logs__cell--client" role="gridcell">
-        <IconTooltip className={hintClass} columnClass='grid grid--limited' tooltipClass='px-5 pb-5 pt-4 mw-75'
-                     xlinkHref='question' contentItemClass="contentItemClass" title="client_details"
-                     content={processedData} placement="bottom" />
-        <div className={nameClass}>
-            <div data-tip={true} data-for={id}>
-                {renderFormattedClientCell(client, info, isDetailed, true)}
-            </div>
-            {isDetailed && name && !whoisAvailable
-            && <div className="detailed-info d-none d-sm-block logs__text"
-                    title={name}>{name}</div>}
-        </div>
-        {renderBlockingButton(isFiltered, domain)}
-    </div>;
-};
-
-ClientCell.propTypes = {
-    client: propTypes.string.isRequired,
-    domain: propTypes.string.isRequired,
-    info: propTypes.oneOfType([
-        propTypes.string,
-        propTypes.shape({
-            name: propTypes.string.isRequired,
-            whois_info: propTypes.shape({
-                country: propTypes.string,
-                city: propTypes.string,
-                orgname: propTypes.string,
-            }),
-            disallowed: propTypes.bool.isRequired,
-            disallowed_rule: propTypes.string.isRequired,
-        }),
-    ]),
-    reason: propTypes.string.isRequired,
-};
-
-export default ClientCell;
--- a/client/src/components/Logs/Cells/DateCell.js
+++ b/client/src/components/Logs/Cells/DateCell.js
@@ -1,29 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import propTypes from 'prop-types';
-import { formatDateTime, formatTime } from '../../../helpers/helpers';
-import { DEFAULT_SHORT_DATE_FORMAT_OPTIONS, DEFAULT_TIME_FORMAT } from '../../../helpers/constants';
-
-const DateCell = ({ time }) => {
-    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-
-    if (!time) {
-        return '–';
-    }
-
-    const formattedTime = formatTime(time, DEFAULT_TIME_FORMAT);
-    const formattedDate = formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS);
-
-    return <div className="logs__cell logs__cell logs__cell--date text-truncate" role="gridcell">
-        <div className="logs__time" title={formattedTime}>{formattedTime}</div>
-        {isDetailed
-        && <div className="detailed-info d-none d-sm-block text-truncate"
-                title={formattedDate}>{formattedDate}</div>}
-    </div>;
-};
-
-DateCell.propTypes = {
-    time: propTypes.string.isRequired,
-};
-
-export default DateCell;
--- a/client/src/components/Logs/Cells/Header.js
+++ b/client/src/components/Logs/Cells/Header.js
@@ -1,54 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
-import classNames from 'classnames';
-import React from 'react';
-import { toggleDetailedLogs } from '../../../actions/queryLogs';
-import HeaderCell from './HeaderCell';
-
-const Header = () => {
-    const { t } = useTranslation();
-    const dispatch = useDispatch();
-    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-    const disableDetailedMode = () => dispatch(toggleDetailedLogs(false));
-    const enableDetailedMode = () => dispatch(toggleDetailedLogs(true));
-
-    const HEADERS = [
-        {
-            className: 'logs__cell--date',
-            content: 'time_table_header',
-        },
-        {
-            className: 'logs__cell--domain',
-            content: 'request_table_header',
-        },
-        {
-            className: 'logs__cell--response',
-            content: 'response_table_header',
-        },
-        {
-            className: 'logs__cell--client',
-            content: <>
-                {t('client_table_header')}
-                {<span>
-                    <svg className={classNames('icons icon--24 icon--green cursor--pointer mr-2', { 'icon--selected': !isDetailed })}
-                         onClick={disableDetailedMode}
-                    >
-                    <title>{t('compact')}</title>
-                    <use xlinkHref='#list' /></svg>
-                <svg className={classNames('icons icon--24 icon--green cursor--pointer', { 'icon--selected': isDetailed })}
-                     onClick={enableDetailedMode}
-                >
-                    <title>{t('default')}</title>
-                    <use xlinkHref='#detailed_list' />
-                    </svg>
-            </span>}
-            </>,
-        },
-    ];
-
-    return <div className="logs__cell--header__container px-5" role="row">
-        {HEADERS.map(HeaderCell)}
-    </div>;
-};
-
-export default Header;
--- a/client/src/components/Logs/Cells/HeaderCell.js
+++ b/client/src/components/Logs/Cells/HeaderCell.js
@@ -1,22 +0,0 @@
-import classNames from 'classnames';
-import React from 'react';
-import propTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
-
-const HeaderCell = ({ content, className }, idx) => {
-    const { t } = useTranslation();
-    return <div
-            key={idx}
-            className={classNames('logs__cell--header__item logs__cell logs__text--bold', className)}
-            role="columnheader"
-    >
-        {typeof content === 'string' ? t(content) : content}
-    </div>;
-};
-
-HeaderCell.propTypes = {
-    content: propTypes.oneOfType([propTypes.string, propTypes.element]).isRequired,
-    className: propTypes.string,
-};
-
-export default HeaderCell;
--- a/client/src/components/Logs/Cells/ResponseCell.js
+++ b/client/src/components/Logs/Cells/ResponseCell.js
@@ -1,121 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { shallowEqual, useSelector } from 'react-redux';
-import classNames from 'classnames';
-import React from 'react';
-import propTypes from 'prop-types';
-import {
-    formatElapsedMs,
-    getFilterName,
-    getServiceName,
-} from '../../../helpers/helpers';
-import { FILTERED_STATUS, FILTERED_STATUS_TO_META_MAP } from '../../../helpers/constants';
-import IconTooltip from './IconTooltip';
-
-const ResponseCell = ({
-    elapsedMs,
-    originalResponse,
-    reason,
-    response,
-    status,
-    upstream,
-    rule,
-    filterId,
-    service_name,
-}) => {
-    const { t } = useTranslation();
-    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
-    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
-    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-
-    const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
-
-    const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
-            || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
-
-    const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
-
-    const statusLabel = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.LABEL || reason);
-    const boldStatusLabel = <span className="font-weight-bold">{statusLabel}</span>;
-    const filter = getFilterName(filters, whitelistFilters, filterId);
-
-    const renderResponses = (responseArr) => {
-        if (!responseArr || responseArr.length === 0) {
-            return '';
-        }
-
-        return <div>{responseArr.map((response) => {
-            const className = classNames('white-space--nowrap', {
-                'overflow-break': response.length > 100,
-            });
-
-            return <div key={response} className={className}>{`${response}\n`}</div>;
-        })}</div>;
-    };
-
-    const COMMON_CONTENT = {
-        encryption_status: boldStatusLabel,
-        install_settings_dns: upstream,
-        elapsed: formattedElapsedMs,
-        response_code: status,
-        ...(service_name ? { service_name: getServiceName(service_name) } : { filter }),
-        rule_label: rule,
-        response_table_header: renderResponses(response),
-        original_response: renderResponses(originalResponse),
-    };
-
-    const content = rule
-        ? Object.entries(COMMON_CONTENT)
-        : Object.entries({
-            ...COMMON_CONTENT,
-            filter: '',
-        });
-
-    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
-                className={classNames('icons mr-4 icon--24 icon--lightgray', { 'my-3': isDetailed })}
-                columnClass='grid grid--limited'
-                tooltipClass='px-5 pb-5 pt-4 mw-75 custom-tooltip__response-details'
-                contentItemClass='text-truncate key-colon o-hidden'
-                xlinkHref='question'
-                title='response_details'
-                content={content}
-                placement='bottom'
-        />
-        <div className="text-truncate">
-            <div className="text-truncate" title={statusLabel}>{statusLabel}</div>
-            {isDetailed && <div
-                    className="detailed-info d-none d-sm-block pt-1 text-truncate"
-                    title={detailedInfo}>{detailedInfo}</div>}
-        </div>
-    </div>;
-};
-
-ResponseCell.propTypes = {
-    elapsedMs: propTypes.string.isRequired,
-    originalResponse: propTypes.array.isRequired,
-    reason: propTypes.string.isRequired,
-    response: propTypes.array.isRequired,
-    status: propTypes.string.isRequired,
-    upstream: propTypes.string.isRequired,
-    rule: propTypes.string,
-    filterId: propTypes.number,
-    service_name: propTypes.string,
-};
-
-export default ResponseCell;
--- a/client/src/components/Logs/Cells/getClientCell.js
+++ b/client/src/components/Logs/Cells/getClientCell.js
@@ -0,0 +1,110 @@
+import React from 'react';
+import { nanoid } from 'nanoid';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import { formatClientCell } from '../../../helpers/formatClientCell';
+import getIconTooltip from './getIconTooltip';
+import { checkFiltered } from '../../../helpers/helpers';
+import { BLOCK_ACTIONS } from '../../../helpers/constants';
+
+const getClientCell = ({
+    row, t, isDetailed, toggleBlocking, autoClients, processingRules,
+}) => {
+    const {
+        reason, client, domain, info: { name, whois_info },
+    } = row.original;
+
+    const autoClient = autoClients.find((autoClient) => autoClient.name === client);
+    const source = autoClient?.source;
+    const whoisAvailable = whois_info && Object.keys(whois_info).length > 0;
+
+    const id = nanoid();
+
+    const data = {
+        address: client,
+        name,
+        country: whois_info?.country,
+        city: whois_info?.city,
+        network: whois_info?.orgname,
+        source_label: source,
+    };
+
+    const processedData = Object.entries(data);
+
+    const isFiltered = checkFiltered(reason);
+
+    const nameClass = classNames('w-90 o-hidden d-flex flex-column', {
+        'mt-2': isDetailed && !name && !whoisAvailable,
+        'white-space--nowrap': isDetailed,
+    });
+
+    const hintClass = classNames('icons mr-4 icon--24 icon--lightgray', {
+        'my-3': isDetailed,
+    });
+
+    const renderBlockingButton = (isFiltered, domain) => {
+        const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
+
+        const buttonClass = classNames('logs__action button__action', {
+            'btn-outline-secondary': isFiltered,
+            'btn-outline-danger': !isFiltered,
+            'logs__action--detailed': isDetailed,
+        });
+
+        const onClick = () => toggleBlocking(buttonType, domain);
+
+        return (
+            <div className={buttonClass}>
+                <button
+                    type="button"
+                    className={`btn btn-sm ${buttonClass}`}
+                    onClick={onClick}
+                    disabled={processingRules}
+                >
+                    {t(buttonType)}
+                </button>
+            </div>
+        );
+    };
+
+    return (
+        <div className="logs__row o-hidden h-100">
+            {getIconTooltip({
+                className: hintClass,
+                columnClass: 'grid grid--limited',
+                tooltipClass: 'px-5 pb-5 pt-4 mw-75',
+                xlinkHref: 'question',
+                contentItemClass: 'text-truncate key-colon',
+                title: 'client_details',
+                content: processedData,
+                placement: 'bottom',
+            })}
+            <div className={nameClass}>
+                <div data-tip={true} data-for={id}>
+                    {formatClientCell(row, isDetailed)}
+                </div>
+
+                {isDetailed && name && !whoisAvailable && (
+                    <div
+                        className="detailed-info d-none d-sm-block logs__text"
+                        title={name}
+                    >
+                        {name}
+                    </div>
+                )}
+            </div>
+            {renderBlockingButton(isFiltered, domain)}
+        </div>
+    );
+};
+
+getClientCell.propTypes = {
+    row: PropTypes.object.isRequired,
+    t: PropTypes.func.isRequired,
+    isDetailed: PropTypes.bool.isRequired,
+    toggleBlocking: PropTypes.func.isRequired,
+    autoClients: PropTypes.array.isRequired,
+    processingRules: PropTypes.bool.isRequired,
+};
+
+export default getClientCell;
--- a/client/src/components/Logs/Cells/getDateCell.js
+++ b/client/src/components/Logs/Cells/getDateCell.js
@@ -0,0 +1,28 @@
+import React from 'react';
+
+import { formatTime, formatDateTime } from '../../../helpers/helpers';
+import {
+    DEFAULT_SHORT_DATE_FORMAT_OPTIONS,
+    DEFAULT_TIME_FORMAT,
+} from '../../../helpers/constants';
+
+const getDateCell = (row, isDetailed) => {
+    const { time } = row.original;
+
+    if (!time) {
+        return '–';
+    }
+
+    const formattedTime = formatTime(time, DEFAULT_TIME_FORMAT);
+    const formattedDate = formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS);
+
+    return (
+        <div className="logs__cell">
+            <div className="logs__time" title={formattedTime}>{formattedTime}</div>
+            {isDetailed && <div className="detailed-info d-none d-sm-block text-truncate"
+                                title={formattedDate}>{formattedDate}</div>}
+        </div>
+    );
+};
+
+export default getDateCell;
--- a/client/src/components/Logs/Cells/getDomainCell.js
+++ b/client/src/components/Logs/Cells/getDomainCell.js
@@ -1,8 +1,7 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import classNames from 'classnames';
-import propTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
+import PropTypes from 'prop-types';
+import getIconTooltip from './getIconTooltip';
 import {
    DEFAULT_SHORT_DATE_FORMAT_OPTIONS,
    LONG_TIME_FORMAT,
@@ -10,19 +9,15 @@ import {
 } from '../../../helpers/constants';
 import { captitalizeWords, formatDateTime, formatTime } from '../../../helpers/helpers';
 import { getSourceData } from '../../../helpers/trackers/trackers';
-import IconTooltip from './IconTooltip';

-const DomainCell = ({
-    answer_dnssec,
-    client_proto,
-    domain,
-    time,
-    tracker,
-    type,
-}) => {
-    const { t } = useTranslation();
-    const dnssec_enabled = useSelector((state) => state.dnsConfig.dnssec_enabled);
-    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
+const getDomainCell = (props) => {
+    const {
+        row, t, isDetailed, dnssec_enabled,
+    } = props;
+
+    const {
+        tracker, type, answer_dnssec, client_proto, domain, time,
+    } = row.original;

    const hasTracker = !!tracker;

@@ -55,8 +50,8 @@ const DomainCell = ({
        name_table_header: tracker?.name,
        category_label: hasTracker && captitalizeWords(tracker.category),
        source_label: 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>,
    };

    const renderGrid = (content, idx) => {
@@ -77,42 +72,51 @@ const DomainCell = ({

    const renderContent = hasTracker ? requestDetails.concat(getGrid(knownTrackerDataObj, 'known_tracker', 'pt-4')) : requestDetails;

-    const valueClass = classNames('w-100 text-truncate', {
+    const trackerHint = getIconTooltip({
+        className: privacyIconClass,
+        tooltipClass: 'pt-4 pb-5 px-5 mw-75',
+        xlinkHref: 'privacy',
+        contentItemClass: 'key-colon',
+        renderContent,
+        place: 'bottom',
+    });
+
+    const valueClass = classNames('w-100', {
        'px-2 d-flex justify-content-center flex-column': isDetailed,
    });

    const details = [ip, protocol].filter(Boolean)
        .join(', ');

-    return <div className="d-flex o-hidden logs__cell logs__cell logs__cell--domain" role="gridcell">
-        {dnssec_enabled && <IconTooltip
-                className={lockIconClass}
-                tooltipClass='py-4 px-5 pb-45'
-                canShowTooltip={!!answer_dnssec}
-                xlinkHref='lock'
-                columnClass='w-100'
-                content='validated_with_dnssec'
-                placement='bottom'
-        />}
-        <IconTooltip className={privacyIconClass} tooltipClass='pt-4 pb-5 px-5 mw-75'
-                     xlinkHref='privacy' contentItemClass='key-colon' renderContent={renderContent}
-                     place='bottom' />
-        <div className={valueClass}>
-            <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>}
+    return (
+        <div className="logs__row o-hidden">
+            {dnssec_enabled && getIconTooltip({
+                className: lockIconClass,
+                tooltipClass: 'py-4 px-5 pb-45',
+                canShowTooltip: answer_dnssec,
+                xlinkHref: 'lock',
+                columnClass: 'w-100',
+                content: 'validated_with_dnssec',
+                placement: 'bottom',
+            })}
+            {trackerHint}
+            <div className={valueClass}>
+                <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>}
+            </div>
        </div>
-    </div>;
+    );
 };

-DomainCell.propTypes = {
-    answer_dnssec: propTypes.bool.isRequired,
-    client_proto: propTypes.string.isRequired,
-    domain: propTypes.string.isRequired,
-    time: propTypes.string.isRequired,
-    type: propTypes.string.isRequired,
-    tracker: propTypes.object,
+getDomainCell.propTypes = {
+    row: PropTypes.object.isRequired,
+    t: PropTypes.func.isRequired,
+    isDetailed: PropTypes.bool.isRequired,
+    toggleBlocking: PropTypes.func.isRequired,
+    autoClients: PropTypes.array.isRequired,
+    dnssec_enabled: PropTypes.bool.isRequired,
 };

-export default DomainCell;
+export default getDomainCell;
--- a/client/src/components/Logs/Cells/getIconTooltip.js
+++ b/client/src/components/Logs/Cells/getIconTooltip.js
@@ -6,21 +6,17 @@ import { processContent } from '../../../helpers/helpers';
 import Tooltip from '../../ui/Tooltip';
 import 'react-popper-tooltip/dist/styles.css';
 import './IconTooltip.css';
-import { SHOW_TOOLTIP_DELAY } from '../../../helpers/constants';

-const IconTooltip = ({
+const getIconTooltip = ({
    className,
    contentItemClass,
    columnClass,
-    triggerClass,
    canShowTooltip = true,
    xlinkHref,
    title,
    placement,
    tooltipClass,
    content,
-    trigger,
-    onVisibilityChange,
    renderContent = content ? React.Children.map(
        processContent(content),
        (item, idx) => <div key={idx} className={contentItemClass}>
@@ -40,10 +36,6 @@ const IconTooltip = ({
        className={tooltipClassName}
        content={tooltipContent}
        placement={placement}
-        triggerClass={triggerClass}
-        trigger={trigger}
-        onVisibilityChange={onVisibilityChange}
-        delayShow={trigger === 'click' ? 0 : SHOW_TOOLTIP_DELAY}
    >
        {xlinkHref && <svg className={className}>
            <use xlinkHref={`#${xlinkHref}`} />
@@ -51,20 +43,20 @@ const IconTooltip = ({
    </Tooltip>;
 };

-IconTooltip.propTypes = {
+getIconTooltip.propTypes = {
    className: PropTypes.string,
-    trigger: PropTypes.string,
-    triggerClass: PropTypes.string,
    contentItemClass: PropTypes.string,
    columnClass: PropTypes.string,
    tooltipClass: PropTypes.string,
    title: PropTypes.string,
    placement: PropTypes.string,
-    canShowTooltip: PropTypes.bool,
+    canShowTooltip: PropTypes.string,
    xlinkHref: PropTypes.string,
-    content: PropTypes.node,
+    content: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.array,
+    ]),
    renderContent: PropTypes.arrayOf(PropTypes.element),
-    onVisibilityChange: PropTypes.func,
 };

-export default IconTooltip;
+export default getIconTooltip;
--- a/client/src/components/Logs/Cells/getResponseCell.js
+++ b/client/src/components/Logs/Cells/getResponseCell.js
@@ -0,0 +1,79 @@
+import React from 'react';
+import classNames from 'classnames';
+import { formatElapsedMs } from '../../../helpers/helpers';
+import {
+    FILTERED_STATUS,
+    FILTERED_STATUS_TO_META_MAP,
+} from '../../../helpers/constants';
+import getIconTooltip from './getIconTooltip';
+
+const getResponseCell = (row, filtering, t, isDetailed, getFilterName) => {
+    const {
+        reason, filterId, rule, status, upstream, elapsedMs, response, originalResponse,
+    } = row.original;
+
+    const { filters, whitelistFilters } = filtering;
+    const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
+
+    const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
+        || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
+
+    const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
+
+    const statusLabel = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.label || reason);
+    const boldStatusLabel = <span className="font-weight-bold">{statusLabel}</span>;
+    const filter = getFilterName(filters, whitelistFilters, filterId, t);
+
+    const renderResponses = (responseArr) => {
+        if (responseArr?.length === 0) {
+            return '';
+        }
+
+        return <div>{responseArr.map((response) => {
+            const className = classNames('white-space--nowrap', {
+                'overflow-break': response.length > 100,
+            });
+
+            return <div key={response} className={className}>{`${response}\n`}</div>;
+        })}</div>;
+    };
+
+    const COMMON_CONTENT = {
+        encryption_status: boldStatusLabel,
+        install_settings_dns: upstream,
+        elapsed: formattedElapsedMs,
+        response_code: status,
+        filter,
+        rule_label: rule,
+        response_table_header: renderResponses(response),
+        original_response: renderResponses(originalResponse),
+    };
+
+    const content = rule
+        ? Object.entries(COMMON_CONTENT)
+        : Object.entries({ ...COMMON_CONTENT, filter: '' });
+    const detailedInfo = isBlocked ? filter : formattedElapsedMs;
+
+    return (
+        <div className="logs__row">
+            {getIconTooltip({
+                className: classNames('icons mr-4 icon--24 icon--lightgray', { 'my-3': isDetailed }),
+                columnClass: 'grid grid--limited',
+                tooltipClass: 'px-5 pb-5 pt-4 mw-75 custom-tooltip__response-details',
+                contentItemClass: 'text-truncate key-colon o-hidden',
+                xlinkHref: 'question',
+                title: 'response_details',
+                content,
+                placement: 'bottom',
+            })}
+            <div className="text-truncate">
+                <div className="text-truncate" title={statusLabel}>{statusLabel}</div>
+                {isDetailed && <div
+                    className="detailed-info d-none d-sm-block pt-1 text-truncate"
+                    title={detailedInfo}>{detailedInfo}</div>}
+            </div>
+        </div>
+    );
+};
+
+export default getResponseCell;
--- a/client/src/components/Logs/Cells/helpers/index.js
+++ b/client/src/components/Logs/Cells/helpers/index.js
@@ -1,18 +0,0 @@
-import i18next from 'i18next';
-
-export const BUTTON_PREFIX = 'btn_';
-
-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 buttonKey = i18next.t(disallowed ? 'allow_this_client' : 'disallow_this_client');
-    const isNotInAllowedList = disallowed && disallowed_rule === '';
-
-    return {
-        confirmMessage,
-        buttonKey,
-        isNotInAllowedList,
-    };
-};
--- a/client/src/components/Logs/Cells/index.js
+++ b/client/src/components/Logs/Cells/index.js
@@ -1,250 +0,0 @@
-import React, { memo } from 'react';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import propTypes from 'prop-types';
-import {
-    captitalizeWords,
-    checkFiltered,
-    formatDateTime,
-    formatElapsedMs,
-    formatTime,
-    getBlockingClientName,
-    getFilterName,
-    getServiceName,
-    processContent,
-} from '../../../helpers/helpers';
-import {
-    BLOCK_ACTIONS,
-    DEFAULT_SHORT_DATE_FORMAT_OPTIONS,
-    FILTERED_STATUS,
-    FILTERED_STATUS_TO_META_MAP,
-    LONG_TIME_FORMAT,
-    QUERY_STATUS_COLORS,
-    SCHEME_TO_PROTOCOL_MAP,
-} from '../../../helpers/constants';
-import { getSourceData } from '../../../helpers/trackers/trackers';
-import { toggleBlocking, toggleBlockingForClient } from '../../../actions';
-import DateCell from './DateCell';
-import DomainCell from './DomainCell';
-import ResponseCell from './ResponseCell';
-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,
-    rowProps,
-    rowProps: { reason },
-    isSmallScreen,
-    setDetailedDataCurrent,
-    setButtonType,
-    setModalOpened,
-}) => {
-    const dispatch = useDispatch();
-    const { t } = useTranslation();
-    const dnssec_enabled = useSelector((state) => state.dnsConfig.dnssec_enabled);
-    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
-    const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
-    const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
-
-    const clients = useSelector((state) => state.dashboard.clients);
-
-    const onClick = () => {
-        if (!isSmallScreen) {
-            return;
-        }
-        const {
-            answer_dnssec,
-            client,
-            domain,
-            elapsedMs,
-            info,
-            info: { disallowed, disallowed_rule },
-            reason,
-            response,
-            time,
-            tracker,
-            upstream,
-            type,
-            client_proto,
-            filterId,
-            rule,
-            originalResponse,
-            status,
-            service_name,
-        } = rowProps;
-
-        const hasTracker = !!tracker;
-
-        const autoClient = autoClients
-            .find((autoClient) => autoClient.name === client);
-
-        const { whois_info } = info;
-        const country = whois_info?.country;
-        const city = whois_info?.city;
-        const network = whois_info?.orgname;
-
-        const source = autoClient?.source;
-
-        const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
-        const isFiltered = checkFiltered(reason);
-
-        const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
-                || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
-
-        const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
-        const onToggleBlock = () => {
-            dispatch(toggleBlocking(buttonType, domain));
-        };
-
-        const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
-        const requestStatus = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.LABEL || reason);
-
-        const protocol = t(SCHEME_TO_PROTOCOL_MAP[client_proto]) || '';
-
-        const sourceData = getSourceData(tracker);
-
-        const filter = getFilterName(filters, whitelistFilters, filterId);
-
-        const {
-            confirmMessage,
-            buttonKey: blockingClientKey,
-            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 onBlockingForClientClick = () => {
-            dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
-        };
-
-        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,
-            known_tracker: hasTracker && 'title',
-            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>,
-            response_details: 'title',
-            install_settings_dns: upstream,
-            elapsed: formattedElapsedMs,
-            filter: rule ? filter : null,
-            rule_label: rule,
-            response_table_header: response?.join('\n'),
-            response_code: status,
-            client_details: 'title',
-            ip_address: client,
-            name: info?.name,
-            country,
-            city,
-            network,
-            source_label: source,
-            validated_with_dnssec: dnssec_enabled ? Boolean(answer_dnssec) : false,
-            original_response: originalResponse?.join('\n'),
-            [BUTTON_PREFIX + buttonType]: blockButton,
-            [BUTTON_PREFIX + blockingForClientKey]: blockForClientButton,
-            [BUTTON_PREFIX + blockingClientKey]: blockClientButton,
-        };
-
-        setDetailedDataCurrent(processContent(detailedData));
-        setButtonType(buttonType);
-        setModalOpened(true);
-    };
-
-    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-
-    const className = classNames('d-flex px-5 logs__row',
-        `logs__row--${FILTERED_STATUS_TO_META_MAP?.[reason]?.COLOR ?? QUERY_STATUS_COLORS.WHITE}`, {
-            'logs__cell--detailed': isDetailed,
-        });
-
-    return <div style={style} className={className} onClick={onClick} role="row">
-        <DateCell {...rowProps} />
-        <DomainCell {...rowProps} />
-        <ResponseCell {...rowProps} />
-        <ClientCell {...rowProps} />
-    </div>;
-});
-
-Row.displayName = 'Row';
-
-Row.propTypes = {
-    style: propTypes.object,
-    rowProps: propTypes.shape({
-        reason: propTypes.string.isRequired,
-        answer_dnssec: propTypes.bool.isRequired,
-        client: propTypes.string.isRequired,
-        domain: propTypes.string.isRequired,
-        elapsedMs: propTypes.string.isRequired,
-        info: propTypes.oneOfType([
-            propTypes.string,
-            propTypes.shape({
-                whois_info: propTypes.shape({
-                    country: propTypes.string,
-                    city: propTypes.string,
-                    orgname: propTypes.string,
-                }),
-            })]),
-        response: propTypes.array.isRequired,
-        time: propTypes.string.isRequired,
-        tracker: propTypes.object,
-        upstream: propTypes.string.isRequired,
-        type: propTypes.string.isRequired,
-        client_proto: propTypes.string.isRequired,
-        filterId: propTypes.number,
-        rule: propTypes.string,
-        originalResponse: propTypes.array,
-        status: propTypes.string.isRequired,
-        service_name: propTypes.string,
-    }).isRequired,
-    isSmallScreen: propTypes.bool.isRequired,
-    setDetailedDataCurrent: propTypes.func.isRequired,
-    setButtonType: propTypes.func.isRequired,
-    setModalOpened: propTypes.func.isRequired,
-};
-
-export default Row;
--- a/client/src/components/Logs/Filters/Form.js
+++ b/client/src/components/Logs/Filters/Form.js
@@ -107,7 +107,7 @@ const Form = (props) => {

    const {
        response_status, search,
-    } = useSelector((state) => state?.form[FORM_NAME.LOGS_FILTER].values, shallowEqual);
+    } = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual);

    const [
        debouncedSearch,
@@ -171,14 +171,14 @@ const Form = (props) => {
                >
                    {Object.values(RESPONSE_FILTER)
                        .map(({
-                            QUERY, LABEL, disabled,
+                            query, label, disabled,
                        }) => (
                            <option
-                                key={LABEL}
-                                value={QUERY}
+                                key={label}
+                                value={query}
                                disabled={disabled}
                            >
-                                {t(LABEL)}
+                                {t(label)}
                            </option>
                        ))
                    }
@@ -197,4 +197,5 @@ Form.propTypes = {

 export default reduxForm({
    form: FORM_NAME.LOGS_FILTER,
+    enableReinitialize: true,
 })(Form);
--- a/client/src/components/Logs/Filters/index.js
+++ b/client/src/components/Logs/Filters/index.js
@@ -1,46 +1,33 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
+import { Trans } from 'react-i18next';
 import Form from './Form';
-import { refreshFilteredLogs } from '../../../actions/queryLogs';
-import { addSuccessToast } from '../../../actions/toasts';

-const Filters = ({ filter, setIsLoading }) => {
-    const { t } = useTranslation();
-    const dispatch = useDispatch();
-
-    const refreshLogs = async () => {
-        setIsLoading(true);
-        await dispatch(refreshFilteredLogs());
-        dispatch(addSuccessToast('query_log_updated'));
-        setIsLoading(false);
-    };
-
-    return <div className="page-header page-header--logs">
-        <h1 className="page-title page-title--large">
-            {t('query_log')}
-            <button
+const Filters = ({ filter, refreshLogs, setIsLoading }) => (
+        <div className="page-header page-header--logs">
+            <h1 className="page-title page-title--large">
+                <Trans>query_log</Trans>
+                <button
                    type="button"
                    className="btn btn-icon--green logs__refresh"
-                    title={t('refresh_btn')}
                    onClick={refreshLogs}
-            >
-                <svg className="icons icon--24">
-                    <use xlinkHref="#update" />
-                </svg>
-            </button>
-        </h1>
-        <Form
+                >
+                    <svg className="icons icon--24">
+                        <use xlinkHref="#update" />
+                    </svg>
+                </button>
+            </h1>
+            <Form
                responseStatusClass="d-sm-block"
                initialValues={filter}
                setIsLoading={setIsLoading}
-        />
-    </div>;
-};
+            />
+        </div>
+);

 Filters.propTypes = {
    filter: PropTypes.object.isRequired,
+    refreshLogs: PropTypes.func.isRequired,
    processingGetLogs: PropTypes.bool.isRequired,
    setIsLoading: PropTypes.func.isRequired,
 };
--- a/client/src/components/Logs/InfiniteTable.js
+++ b/client/src/components/Logs/InfiniteTable.js
@@ -1,87 +0,0 @@
-import React, {
-    useCallback,
-    useEffect,
-    useRef,
-} from 'react';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { useTranslation } from 'react-i18next';
-import propTypes from 'prop-types';
-import throttle from 'lodash/throttle';
-import Loading from '../ui/Loading';
-import Header from './Cells/Header';
-import { getLogs } from '../../actions/queryLogs';
-import Row from './Cells';
-import { isScrolledIntoView } from '../../helpers/helpers';
-import { QUERY_LOGS_PAGE_LIMIT } from '../../helpers/constants';
-
-const InfiniteTable = ({
-    isLoading,
-    items,
-    isSmallScreen,
-    setDetailedDataCurrent,
-    setButtonType,
-    setModalOpened,
-}) => {
-    const { t } = useTranslation();
-    const dispatch = useDispatch();
-    const loader = useRef(null);
-
-    const {
-        isEntireLog,
-        processingGetLogs,
-    } = useSelector((state) => state.queryLogs, shallowEqual);
-
-    const loading = isLoading || processingGetLogs;
-
-    const listener = useCallback(() => {
-        if (loader.current && isScrolledIntoView(loader.current)) {
-            dispatch(getLogs());
-        }
-    }, [loader.current, isScrolledIntoView, getLogs]);
-
-    useEffect(() => {
-        listener();
-    }, [items.length < QUERY_LOGS_PAGE_LIMIT]);
-
-    useEffect(() => {
-        const THROTTLE_TIME = 100;
-        const throttledListener = throttle(listener, THROTTLE_TIME);
-
-        window.addEventListener('scroll', throttledListener);
-        return () => {
-            window.removeEventListener('scroll', throttledListener);
-        };
-    }, []);
-
-    const renderRow = (row, idx) => <Row
-                    key={idx}
-                    rowProps={row}
-                    isSmallScreen={isSmallScreen}
-                    setDetailedDataCurrent={setDetailedDataCurrent}
-                    setButtonType={setButtonType}
-                    setModalOpened={setModalOpened}
-            />;
-
-    const isNothingFound = items.length === 0 && !processingGetLogs;
-
-    return <div className='logs__table' role='grid'>
-        {loading && <Loading />}
-        <Header />
-        {isNothingFound
-            ? <label className="logs__no-data">{t('nothing_found')}</label>
-            : <>{items.map(renderRow)}
-                    {!isEntireLog && <div ref={loader} className="logs__loading text-center">{t('loading_table_status')}</div>}
-            </>}
-    </div>;
-};
-
-InfiniteTable.propTypes = {
-    isLoading: propTypes.bool.isRequired,
-    items: propTypes.array.isRequired,
-    isSmallScreen: propTypes.bool.isRequired,
-    setDetailedDataCurrent: propTypes.func.isRequired,
-    setButtonType: propTypes.func.isRequired,
-    setModalOpened: propTypes.func.isRequired,
-};
-
-export default InfiniteTable;
--- a/client/src/components/Logs/Logs.css
+++ b/client/src/components/Logs/Logs.css
@@ -1,32 +1,44 @@
 :root {
-    --blue: #e5effd;
-    --green-pale: rgba(103, 178, 121, 0.1);
-    --red: rgba(223, 56, 18, 0.05);
-    --white: #fff;
-    --yellow: rgba(247, 181, 0, 0.1);
-    --size-date: 70;
-    --size-domain: 180;
-    --size-response: 150;
-    --size-client: 123;
-    --gray-216: rgba(216, 216, 216, 0.23);
    --gray-4d: #4D4D4D;
-    --gray-f3: #F3F3F3;
    --gray-8: #888;
    --danger: #DF3812;
-    --white80: rgba(255, 255, 255, 0.8);
-
-    --btn-block: #C23814;
-    --btn-block-disabled: #E3B3A6;
-    --btn-block-active: #A62200;
-
-    --btn-unblock: #888888;
-    --btn-unblock-disabled: #D8D8D8;
-    --btn-unblock-active: #4D4D4D;
-
-    --option-border-radius: 4px;
 }

-.logs__text {
+.logs__row {
+    position: relative;
+    display: flex;
+    min-height: 26px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.card-table .logs__row {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.logs__row--center {
+    justify-content: center;
+}
+
+.logs__row--column {
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+}
+
+.logs__row--icons {
+    max-width: 180px;
+    flex-flow: row wrap;
+}
+
+.logs__row .list-unstyled {
+    margin-bottom: 0;
+    overflow: hidden;
+}
+
+.logs__text,
+.logs__row .list-unstyled li {
    padding: 0 1px;
    text-overflow: ellipsis;
    white-space: nowrap;
@@ -42,6 +54,237 @@
    font-weight: bold;
 }

+.logs__text--full {
+    width: 100%;
+}
+
+.logs__text--wrap {
+    line-height: 1.4;
+    white-space: normal;
+}
+
+.logs__text--nowrap {
+    line-height: 1.4;
+    white-space: nowrap;
+}
+
+.logs__text--whois {
+    line-height: 1.2;
+    color: #9aa0ac;
+}
+
+.logs__row .tooltip-custom {
+    top: 0;
+    margin-left: 0;
+    margin-right: 5px;
+}
+
+.tooltip__option {
+    height: 2.5rem !important;
+    width: 10.5rem;
+    padding: 0.3125rem 1.5rem 0.6875rem;
+}
+
+.tooltip__option:hover {
+    background-color: var(--gray-f3);
+    cursor: pointer;
+}
+
+.button__action {
+    background-color: #fff;
+    border-radius: 4px;
+    transition: opacity 0.2s ease, visibility 0.2s ease;
+    visibility: hidden;
+    opacity: 0;
+}
+
+.table__action {
+    position: absolute;
+    top: 11px;
+    right: 15px;
+}
+
+.logs__action {
+    position: absolute;
+    top: 0;
+    right: 1rem;
+}
+
+.logs__action--detailed {
+    top: 5px;
+}
+
+.logs__table .rt-td,
+.clients__table .rt-td {
+    position: relative;
+}
+
+.logs__table .rt-thead, .logs__table .rt-tbody {
+    min-width: 100% !important;
+}
+
+.logs__table .rt-tr:hover .logs__action,
+.clients__table .rt-tr:hover .table__action {
+    visibility: visible;
+    opacity: 1;
+}
+
+.logs__table .rt-tr-group:first-child .tooltip-custom:before {
+    top: calc(100% + 12px);
+    bottom: initial;
+    z-index: 1;
+}
+
+.logs__table .rt-tr-group:first-child .tooltip-custom:after {
+    top: initial;
+    bottom: -4px;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid #585965;
+}
+
+.logs__table .rt-tr-group:first-child .popover__body {
+    top: calc(100% + 5px);
+    bottom: initial;
+    z-index: 1;
+}
+
+.logs__table .rt-tr-group:first-child .popover__body:after {
+    top: -11px;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid #585965;
+}
+
+.logs__table .rt-thead.-filters input,
+.logs__table .rt-thead.-filters select {
+    padding: 6px 7px;
+    border-radius: 3px;
+    font-size: 0.9375rem;
+    line-height: 1.6;
+    color: #495057;
+    border: 1px solid rgba(0, 40, 100, 0.12);
+}
+
+.logs__table .rt-thead.-filters select {
+    background: #fff url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHZpZXdCb3g9JzAgMCAxMCA1Jz48cGF0aCBmaWxsPScjOTk5JyBkPSdNMCAwTDEwIDBMNSA1TDAgMCcvPjwvc3ZnPg==") no-repeat right 0.75rem center;
+    background-size: 8px 10px;
+}
+
+.logs__table .rt-thead.-filters input:focus,
+.logs__table .rt-thead.-filters select:focus {
+    border-color: #1991eb;
+    box-shadow: 0 0 0 2px rgba(70, 127, 207, 0.25);
+}
+
+.logs__text-wrap {
+    display: flex;
+    align-items: center;
+    max-width: 100%;
+}
+
+.logs__list-wrap {
+    display: flex;
+    max-width: 100%;
+}
+
+.logs__list-item {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.logs__input-wrap {
+    position: relative;
+}
+
+.logs__whois {
+    display: inline;
+    font-size: 12px;
+    white-space: nowrap;
+}
+
+.logs__whois::after {
+    content: "|";
+    padding: 0 5px;
+    opacity: 0.3;
+}
+
+.logs__whois:last-child::after {
+    content: "";
+}
+
+.logs__whois-icon.icons {
+    position: relative;
+    top: -2px;
+    width: 12px;
+    height: 12px;
+    margin-right: 1px;
+    opacity: 0.5;
+}
+
+/* New logs */
+.logs__table {
+    background-color: #fff;
+    border: 0;
+    border-radius: 8px;
+    min-height: 42rem;
+    max-width: 100%;
+}
+
+.logs__table--detailed {
+    min-height: 50rem;
+}
+
+.logs__table .rt-thead.-header {
+    box-shadow: none;
+    font-weight: bold;
+}
+
+.logs__table .rt-thead .rt-th {
+    padding: 0.9375rem 0.9375rem 0.875rem 0;
+    text-align: left;
+    border-right: 0;
+}
+
+.logs__table .rt-tbody .rt-td {
+    padding: 1rem 1rem 0.5rem 0;
+    border-right: 0;
+}
+
+.logs__table .rt-thead .rt-th:last-child,
+.logs__table .rt-tbody .rt-td:last-child {
+    padding-right: 0;
+}
+
+.logs__table .rt-tbody .rt-tr-group {
+    border-bottom: 0;
+}
+
+.logs__table .rt-tr {
+    position: relative;
+    padding: 0 24px;
+}
+
+.logs__table .rt-tr {
+    position: relative;
+    padding: 0 1.5rem;
+}
+
+.logs__table .rt-tr-group:not(:first-child) .rt-tr:before {
+    content: "";
+    position: absolute;
+    left: 1.5rem;
+    right: 1.5rem;
+    top: 0;
+    width: calc(100% - 3rem);
+    height: 2px;
+    background-color: rgba(216, 216, 216, 0.23);
+}
+
+.logs__table .rt-tr-group:last-child .rt-tr:after,
+.logs__table .rt-thead .rt-tr:after {
+    display: none;
+}
+
 .logs__time {
    font-size: 1rem;
    line-height: 1.5;
@@ -59,24 +302,132 @@
    border-radius: 4px;
 }

+/* Hide 3 and 4 column on mobile */
+.logs__table .rt-thead .rt-th:nth-child(3),
+.logs__table .rt-thead .rt-th:nth-child(4),
+.logs__table .rt-tbody .rt-td:nth-child(3),
+.logs__table .rt-tbody .rt-td:nth-child(4) {
+    display: none;
+}
+
+@media screen and (min-width: 768px) {
+    .logs__table .rt-thead .rt-th:nth-child(3),
+    .logs__table .rt-thead .rt-th:nth-child(4),
+    .logs__table .rt-tbody .rt-td:nth-child(3),
+    .logs__table .rt-tbody .rt-td:nth-child(4) {
+        display: block;
+    }
+}
+
 .text-pre {
    white-space: pre-wrap !important;
    overflow-wrap: break-word;
    overflow: visible;
 }

+.custom-pagination {
+    width: 11.875rem !important;
+    background-color: transparent;
+    box-shadow: none !important;
+    border: none !important;
+    align-items: center !important;
+}
+
+.custom-pagination--padding {
+    padding: 2.5rem 0 2.5rem !important;
+}
+
+.custom-pagination .-btn {
+    --side-size: 2rem;
+    background-color: transparent !important;
+    border: 1px solid var(--gray-d8) !important;
+    border-radius: 4px !important;
+    width: var(--side-size) !important;
+    height: var(--side-size) !important;
+}
+
+.custom-pagination .-btn:enabled:hover {
+    background-color: var(--gray-f3) !important;
+}
+
+.custom-pagination .-previous {
+    flex: 0 1 !important;
+}
+
+.custom-pagination .-next {
+    flex: 0 1 !important;
+}
+
+.custom-pagination .-btn {
+    display: flex !important;
+}
+
+.logs__table .-pageInfo {
+    --side-size: 2rem;
+    font-variant-numeric: tabular-nums !important;
+    background-color: transparent !important;
+    border: 1px solid var(--gray-d8) !important;
+    border-radius: 4px !important;
+    width: var(--side-size) !important;
+    height: var(--side-size) !important;
+    margin: 0 !important;
+    display: flex !important;
+    justify-content: center;
+    align-items: center;
+}
+
+.logs__table .pagination-bottom {
+    justify-content: center !important;
+    display: flex !important;
+}
+
+.logs__table .-center:before {
+    content: '...';
+    transform: translateY(-0.25rem);
+    margin: auto;
+}
+
+.logs__table .-center:after {
+    content: '...';
+    transform: translateY(-0.25rem);
+    margin: auto;
+}
+
+.icon--detailed-info {
+    position: absolute;
+    right: 0;
+    top: 0.5rem;
+}
+
 .link--green {
    color: var(--green79);
 }

+.row--detailed {
+    height: 4.9rem
+}
+
 .w-90 {
    max-width: 90% !important;
 }

+.h-85 {
+    height: 85% !important;
+}
+
+.pt-45 {
+    padding-top: 1.25rem !important;
+}
+
 .pb-45 {
    padding-bottom: 1.25rem !important;
 }

+.py-45 {
+    padding-top: 1.25rem !important;
+    padding-bottom: 1.25rem !important;
+}
+
 .mh-100 {
    max-height: 100% !important;
 }
@@ -96,7 +447,7 @@
 }

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

 .form-control--search {
@@ -142,6 +493,14 @@
 }

@media (max-width: 767.98px) {
+    .rt-tr .logs__row .logs__text {
+        max-width: calc(100% - 1.5rem);
+    }
+
+    .ml-small {
+        margin-left: 1.5rem;
+    }
+
    .form-control--container {
        width: 100%;
        flex-direction: column;
@@ -158,275 +517,38 @@
    }
 }

-@media screen and (max-width: 767.98px) {
-    .logs__table .logs__cell--response,
-    .logs__table .logs__cell--client {
-        display: none !important;
+@media (max-width: 575px) {
+    .logs__table .rt-tr {
+        height: 3.125rem;
+    }
+
+    .logs__table .rt-tbody .rt-td {
+        padding: 0.625rem 1rem 0.875rem 0;
+    }
+
+    .logs__table {
+        min-height: 42rem;
    }
 }

+.loading__container > .-loading-inner {
+    top: 10rem !important;
+    bottom: initial !important;
+}
+
+.loading__text {
+    transform: translateY(3rem);
+}
+
 .logs__refresh {
-    --size: 2.5rem;
    position: relative;
    top: 3px;
    display: inline-flex;
    align-items: center;
    justify-content: center;
-    width: var(--size);
-    height: var(--size);
+    width: 40px;
+    height: 40px;
    padding: 0;
-    margin-left: 0.9375rem;
+    margin-left: 15px;
    background-color: transparent;
 }
-
-.logs__cell {
-    padding: 1rem 1rem 0.5rem 0;
-}
-
-.logs__cell--date {
-    width: 4.375rem;
-    flex: var(--size-date) 0 auto;
-}
-
-.logs__cell--domain {
-    width: 11.25rem;
-    flex: var(--size-domain) 0 auto;
-}
-
-.logs__cell--response {
-    width: 9.375rem;
-    flex: var(--size-response) 0 auto;
-}
-
-.logs__cell--client {
-    width: 7.6875rem;
-    flex: var(--size-client) 0 auto;
-    padding-right: 0;
-    position: relative;
-}
-
-.logs__cell--header__container > .logs__cell--header__item {
-    border-right: 0;
-    font-size: 1rem;
-}
-
-.logs__cell--header__container > .logs__cell--header__item:last-child {
-    padding-right: 0;
-}
-
-.button-action__container {
-    display: flex;
-    position: absolute;
-    right: 0;
-    bottom: 0.5rem;
-    height: 1.6rem;
-}
-
-.button-action__container--detailed {
-    bottom: 1.3rem;
-}
-
-.button-action {
-    outline: 0 !important;
-    background: var(--btn-block);
-    border-radius: var(--option-border-radius);
-    font-size: 0.8rem;
-    color: var(--white);
-    letter-spacing: 0;
-    text-align: center;
-    line-height: 28px;
-    border: 0;
-}
-
-.button-action--small {
-    width: fit-content;
-}
-
-.button-action--unblock {
-    background: var(--btn-unblock);
-}
-
-.button-action--main {
-    padding: 0 1rem;
-    display: flex;
-    align-items: center;
-}
-
-.button-action--with-options {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.button-action--arrow {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left: 1px solid var(--white);
-    width: 1.5625rem;
-    padding: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.button-action:hover {
-    cursor: pointer;
-}
-
-.button-action--arrow .button-action--icon {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.button-action:active {
-    background: var(--btn-block-active);
-}
-
-.button-action--unblock:active {
-    background: var(--btn-unblock-active);
-}
-
-.button-action:disabled {
-    background: var(--btn-block-disabled);
-    cursor: default;
-}
-
-.button-action--unblock:disabled {
-    background: var(--btn-unblock-disabled);
-}
-
-.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;
-}
-
-.button-action--arrow-option-container {
-    overflow: visible;
-    transform-origin: left;
-    padding: 1rem 0;
-}
-
-.logs__row {
-    position: relative;
-    display: flex;
-    min-height: 26px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.logs__table .logs__row {
-    border-bottom: 2px solid var(--gray-216);
-}
-
-/* QUERY_STATUS_COLORS */
-.logs__row--blue {
-    background-color: var(--blue);
-}
-
-.logs__row--green {
-    background-color: var(--green-pale);
-}
-
-.logs__row--red {
-    background-color: var(--red) !important;
-}
-
-.logs__row--white {
-    background-color: var(--white);
-}
-
-.logs__row--yellow {
-    background-color: var(--yellow);
-}
-
-.logs__no-data {
-    color: var(--gray-4d);
-    background-color: var(--white80);
-    pointer-events: none;
-    font-weight: bold;
-    text-align: center;
-    padding-top: 21rem;
-    display: block;
-}
-
-.logs__loading {
-    padding: 1rem 0;
-}
-
-.logs__table {
-    background-color: var(--white);
-    border: 0;
-    border-radius: 8px;
-    min-height: 43rem;
-    max-width: 100%;
-    align-items: stretch;
-    width: 100%;
-    border-collapse: collapse;
-    contain: layout;
-    overflow-x: hidden;
-    overflow-y: scroll;
-    will-change: scroll-position;
-}
-
-.logs__table .logs__cell--response,
-.logs__table .logs__cell--client {
-    display: flex;
-}
-
-.logs__cell--header__container {
-    display: flex;
-}
-
-.logs__table > .logs__cell--header__container > .logs__cell--client {
-    display: flex;
-    justify-content: space-between;
-}
-
-.logs__table .loading:after {
-    top: 10%;
-}
-
-.logs__table .loading:before {
-    min-height: 100%;
-}
-
-.logs__whois {
-    display: inline;
-    font-size: 12px;
-    white-space: nowrap;
-}
-
-.logs__whois::after {
-    content: "|";
-    padding: 0 5px;
-    opacity: 0.3;
-}
-
-.logs__whois:last-child::after {
-    content: "";
-}
-
-.logs__whois-icon.icons {
-    position: relative;
-    top: -2px;
-    width: 12px;
-    height: 12px;
-    margin-right: 1px;
-    opacity: 0.5;
-}
--- a/client/src/components/Logs/Table.js
+++ b/client/src/components/Logs/Table.js
@@ -0,0 +1,414 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation, Trans } from 'react-i18next';
+import ReactTable from 'react-table';
+import classNames from 'classnames';
+import endsWith from 'lodash/endsWith';
+import escapeRegExp from 'lodash/escapeRegExp';
+import {
+    BLOCK_ACTIONS,
+    DEFAULT_SHORT_DATE_FORMAT_OPTIONS,
+    LONG_TIME_FORMAT,
+    FILTERED_STATUS_TO_META_MAP,
+    TABLE_DEFAULT_PAGE_SIZE,
+    SCHEME_TO_PROTOCOL_MAP,
+    CUSTOM_FILTERING_RULES_ID, FILTERED_STATUS,
+} from '../../helpers/constants';
+import getDateCell from './Cells/getDateCell';
+import getDomainCell from './Cells/getDomainCell';
+import getClientCell from './Cells/getClientCell';
+import getResponseCell from './Cells/getResponseCell';
+
+import {
+    captitalizeWords,
+    checkFiltered,
+    formatDateTime,
+    formatElapsedMs,
+    formatTime,
+    processContent,
+} from '../../helpers/helpers';
+import Loading from '../ui/Loading';
+import { getSourceData } from '../../helpers/trackers/trackers';
+
+const Table = (props) => {
+    const {
+        setDetailedDataCurrent,
+        setButtonType,
+        setModalOpened,
+        isSmallScreen,
+        setIsLoading,
+        filtering,
+        isDetailed,
+        toggleDetailedLogs,
+        setLogsPage,
+        setLogsPagination,
+        processingGetLogs,
+        logs,
+        pages,
+        page,
+        isLoading,
+    } = props;
+
+    const { t } = useTranslation();
+
+    const toggleBlocking = (type, domain) => {
+        const {
+            setRules, getFilteringStatus, addSuccessToast,
+        } = props;
+        const { userRules } = filtering;
+
+        const lineEnding = !endsWith(userRules, '\n') ? '\n' : '';
+        const baseRule = `||${domain}^$important`;
+        const baseUnblocking = `@@${baseRule}`;
+
+        const blockingRule = type === BLOCK_ACTIONS.BLOCK ? baseUnblocking : baseRule;
+        const unblockingRule = type === BLOCK_ACTIONS.BLOCK ? baseRule : baseUnblocking;
+        const preparedBlockingRule = new RegExp(`(^|\n)${escapeRegExp(blockingRule)}($|\n)`);
+        const preparedUnblockingRule = new RegExp(`(^|\n)${escapeRegExp(unblockingRule)}($|\n)`);
+
+        const matchPreparedBlockingRule = userRules.match(preparedBlockingRule);
+        const matchPreparedUnblockingRule = userRules.match(preparedUnblockingRule);
+
+        if (matchPreparedBlockingRule) {
+            setRules(userRules.replace(`${blockingRule}`, ''));
+            addSuccessToast(`${t('rule_removed_from_custom_filtering_toast')}: ${blockingRule}`);
+        } else if (!matchPreparedUnblockingRule) {
+            setRules(`${userRules}${lineEnding}${unblockingRule}\n`);
+            addSuccessToast(`${t('rule_added_to_custom_filtering_toast')}: ${unblockingRule}`);
+        } else if (matchPreparedUnblockingRule) {
+            addSuccessToast(`${t('rule_added_to_custom_filtering_toast')}: ${unblockingRule}`);
+            return;
+        } else if (!matchPreparedBlockingRule) {
+            addSuccessToast(`${t('rule_removed_from_custom_filtering_toast')}: ${blockingRule}`);
+            return;
+        }
+
+        getFilteringStatus();
+    };
+
+    const getFilterName = (filters, whitelistFilters, filterId, t) => {
+        if (filterId === CUSTOM_FILTERING_RULES_ID) {
+            return t('custom_filter_rules');
+        }
+
+        const filter = filters.find((filter) => filter.id === filterId)
+            || whitelistFilters.find((filter) => filter.id === filterId);
+        let filterName = '';
+
+        if (filter) {
+            filterName = filter.name;
+        }
+
+        if (!filterName) {
+            filterName = t('unknown_filter', { filterId });
+        }
+
+        return filterName;
+    };
+
+
+    const columns = [
+        {
+            Header: t('time_table_header'),
+            accessor: 'time',
+            Cell: (row) => getDateCell(row, isDetailed),
+            minWidth: 70,
+            maxHeight: 60,
+            headerClassName: 'logs__text',
+        },
+        {
+            Header: t('request_table_header'),
+            accessor: 'domain',
+            Cell: (row) => {
+                const {
+                    isDetailed,
+                    autoClients,
+                    dnssec_enabled,
+                } = props;
+
+                return getDomainCell({
+                    row,
+                    t,
+                    isDetailed,
+                    toggleBlocking,
+                    autoClients,
+                    dnssec_enabled,
+                });
+            },
+            minWidth: 180,
+            maxHeight: 60,
+            headerClassName: 'logs__text',
+        },
+        {
+            Header: t('response_table_header'),
+            accessor: 'response',
+            Cell: (row) => getResponseCell(
+                row,
+                filtering,
+                t,
+                isDetailed,
+                getFilterName,
+            ),
+            minWidth: 150,
+            maxHeight: 60,
+            headerClassName: 'logs__text',
+        },
+        {
+            Header: function Header() {
+                return <div className="d-flex justify-content-between">
+                    {t('client_table_header')}
+                    {<span>
+                        <svg
+                            className={classNames('icons icon--24 icon--green mr-2 cursor--pointer', {
+                                'icon--selected': !isDetailed,
+                            })}
+                            onClick={() => toggleDetailedLogs(false)}
+                        >
+                            <title><Trans>compact</Trans></title>
+                            <use xlinkHref='#list' />
+                        </svg>
+                    <svg
+                        className={classNames('icons icon--24 icon--green cursor--pointer', {
+                            'icon--selected': isDetailed,
+                        })}
+                        onClick={() => toggleDetailedLogs(true)}
+                    >
+                        <title><Trans>default</Trans></title>
+                        <use xlinkHref='#detailed_list' />
+                    </svg>
+                        </span>}
+                </div>;
+            },
+            accessor: 'client',
+            Cell: (row) => {
+                const {
+                    isDetailed,
+                    autoClients,
+                    filtering: { processingRules },
+                } = props;
+
+                return getClientCell({
+                    row,
+                    t,
+                    isDetailed,
+                    toggleBlocking,
+                    autoClients,
+                    processingRules,
+                });
+            },
+            minWidth: 123,
+            maxHeight: 60,
+            headerClassName: 'logs__text',
+            className: 'pb-0',
+        },
+    ];
+
+    const changePage = async (page) => {
+        setIsLoading(true);
+
+        const { oldest, getLogs, pages } = props;
+        const isLastPage = pages && (page + 1 === pages);
+
+        await Promise.all([
+            setLogsPage(page),
+            setLogsPagination({
+                page,
+                pageSize: TABLE_DEFAULT_PAGE_SIZE,
+            }),
+        ].concat(isLastPage ? getLogs(oldest, page) : []));
+
+        setIsLoading(false);
+    };
+
+    const tableClass = classNames('logs__table', {
+        'logs__table--detailed': isDetailed,
+    });
+
+    return (
+        <ReactTable
+            manual
+            minRows={0}
+            page={page}
+            pages={pages}
+            columns={columns}
+            filterable={false}
+            sortable={false}
+            resizable={false}
+            data={logs || []}
+            loading={isLoading || processingGetLogs}
+            showPageJump={false}
+            showPageSizeOptions={false}
+            onPageChange={changePage}
+            className={tableClass}
+            defaultPageSize={TABLE_DEFAULT_PAGE_SIZE}
+            loadingText={
+                <>
+                    <Loading />
+                    <h6 className="loading__text">{t('loading_table_status')}</h6>
+                </>
+            }
+            getLoadingProps={() => ({ className: 'loading__container' })}
+            rowsText={t('rows_table_footer_text')}
+            noDataText={!processingGetLogs
+            && <label className="logs__text logs__text--bold">{t('nothing_found')}</label>}
+            pageText=''
+            ofText=''
+            showPagination={logs.length > 0}
+            getPaginationProps={() => ({ className: 'custom-pagination custom-pagination--padding' })}
+            getTbodyProps={() => ({ className: 'd-block' })}
+            previousText={
+                <svg className="icons icon--24 icon--gray w-100 h-100 cursor--pointer">
+                    <title><Trans>previous_btn</Trans></title>
+                    <use xlinkHref="#arrow-left" />
+                </svg>}
+            nextText={
+                <svg className="icons icon--24 icon--gray w-100 h-100 cursor--pointer">
+                    <title><Trans>next_btn</Trans></title>
+                    <use xlinkHref="#arrow-right" />
+                </svg>}
+            renderTotalPagesCount={() => false}
+            getTrGroupProps={(_state, rowInfo) => {
+                if (!rowInfo) {
+                    return {};
+                }
+
+                const { reason } = rowInfo.original;
+                const colorClass = FILTERED_STATUS_TO_META_MAP[reason] ? FILTERED_STATUS_TO_META_MAP[reason].color : 'white';
+
+                return { className: colorClass };
+            }}
+            getTrProps={(state, rowInfo) => ({
+                className: isDetailed ? 'row--detailed' : '',
+                onClick: () => {
+                    if (isSmallScreen) {
+                        const { dnssec_enabled, autoClients } = props;
+                        const {
+                            answer_dnssec,
+                            client,
+                            domain,
+                            elapsedMs,
+                            info,
+                            reason,
+                            response,
+                            time,
+                            tracker,
+                            upstream,
+                            type,
+                            client_proto,
+                            filterId,
+                            rule,
+                            originalResponse,
+                            status,
+                        } = rowInfo.original;
+
+                        const hasTracker = !!tracker;
+
+                        const autoClient = autoClients
+                            .find((autoClient) => autoClient.name === client);
+
+                        const { whois_info } = info;
+                        const country = whois_info?.country;
+                        const city = whois_info?.city;
+                        const network = whois_info?.orgname;
+
+                        const source = autoClient?.source;
+
+                        const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
+                        const isFiltered = checkFiltered(reason);
+
+                        const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
+                            || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
+
+                        const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
+                        const onToggleBlock = () => {
+                            toggleBlocking(buttonType, domain);
+                        };
+
+                        const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
+                        const requestStatus = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.label || reason);
+
+                        const protocol = t(SCHEME_TO_PROTOCOL_MAP[client_proto]) || '';
+
+                        const sourceData = getSourceData(tracker);
+
+                        const { filters, whitelistFilters } = filtering;
+                        const filter = getFilterName(filters, whitelistFilters, filterId, t);
+
+                        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,
+                            domain,
+                            type_table_header: type,
+                            protocol,
+                            known_tracker: hasTracker && 'title',
+                            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>,
+                            response_details: 'title',
+                            install_settings_dns: upstream,
+                            elapsed: formattedElapsedMs,
+                            filter: rule ? filter : null,
+                            rule_label: rule,
+                            response_table_header: response?.join('\n'),
+                            response_code: status,
+                            client_details: 'title',
+                            ip_address: client,
+                            name: info?.name,
+                            country,
+                            city,
+                            network,
+                            source_label: source,
+                            validated_with_dnssec: dnssec_enabled ? Boolean(answer_dnssec) : false,
+                            original_response: originalResponse?.join('\n'),
+                            [buttonType]: <div onClick={onToggleBlock}
+                                               className={classNames('title--border text-center', {
+                                                   'bg--danger': isBlocked,
+                                               })}>{t(buttonType)}</div>,
+                        };
+
+                        setDetailedDataCurrent(processContent(detailedData));
+                        setButtonType(buttonType);
+                        setModalOpened(true);
+                    }
+                },
+            })}
+        />
+    );
+};
+
+Table.propTypes = {
+    logs: PropTypes.array.isRequired,
+    pages: PropTypes.number.isRequired,
+    page: PropTypes.number.isRequired,
+    autoClients: PropTypes.array.isRequired,
+    defaultPageSize: PropTypes.number,
+    oldest: PropTypes.string.isRequired,
+    filtering: PropTypes.object.isRequired,
+    processingGetLogs: PropTypes.bool.isRequired,
+    processingGetConfig: PropTypes.bool.isRequired,
+    isDetailed: PropTypes.bool.isRequired,
+    setLogsPage: PropTypes.func.isRequired,
+    setLogsPagination: PropTypes.func.isRequired,
+    getLogs: PropTypes.func.isRequired,
+    toggleDetailedLogs: PropTypes.func.isRequired,
+    setRules: PropTypes.func.isRequired,
+    addSuccessToast: PropTypes.func.isRequired,
+    getFilteringStatus: PropTypes.func.isRequired,
+    isLoading: PropTypes.bool.isRequired,
+    setIsLoading: PropTypes.func.isRequired,
+    dnssec_enabled: PropTypes.bool.isRequired,
+    setDetailedDataCurrent: PropTypes.func.isRequired,
+    setButtonType: PropTypes.func.isRequired,
+    setModalOpened: PropTypes.func.isRequired,
+    isSmallScreen: PropTypes.bool.isRequired,
+};
+
+export default Table;
--- a/client/src/components/Logs/index.js
+++ b/client/src/components/Logs/index.js
@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+import React, { Fragment, useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
 import { Trans } from 'react-i18next';
 import Modal from 'react-modal';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
@@ -7,32 +8,34 @@ import queryString from 'query-string';
 import classNames from 'classnames';
 import {
    BLOCK_ACTIONS,
+    TABLE_DEFAULT_PAGE_SIZE,
+    TABLE_FIRST_PAGE,
    SMALL_SCREEN_SIZE,
 } from '../../helpers/constants';
 import Loading from '../ui/Loading';
 import Filters from './Filters';
+import Table from './Table';
 import Disabled from './Disabled';
 import { getFilteringStatus } from '../../actions/filtering';
 import { getClients } from '../../actions';
 import { getDnsConfig } from '../../actions/dnsConfig';
 import {
    getLogsConfig,
+    refreshFilteredLogs,
    resetFilteredLogs,
    setFilteredLogs,
-    toggleDetailedLogs,
 } from '../../actions/queryLogs';
-import InfiniteTable from './InfiniteTable';
+import { addSuccessToast } from '../../actions/toasts';
 import './Logs.css';
-import { BUTTON_PREFIX } from './Cells/helpers';

-const processContent = (data) => Object.entries(data)
+const processContent = (data, buttonType) => Object.entries(data)
    .map(([key, value]) => {
        if (!value) {
            return null;
        }

        const isTitle = value === 'title';
-        const isButton = key.startsWith(BUTTON_PREFIX);
+        const isButton = key === buttonType;
        const isBoolean = typeof value === 'boolean';
        const isHidden = isBoolean && value === false;

@@ -45,20 +48,21 @@ const processContent = (data) => Object.entries(data)
            keyClass = '';
        }

-        return isHidden ? null : <div key={key}>
+        return isHidden ? null : <Fragment key={key}>
            <div
-                    className={classNames(`key__${key}`, keyClass, {
-                        'font-weight-bold': isBoolean && value === true,
-                    })}>
+                className={classNames(`key__${key}`, keyClass, {
+                    'font-weight-bold': isBoolean && value === true,
+                })}>
                <Trans>{isButton ? value : key}</Trans>
            </div>
            <div className={`value__${key} text-pre text-truncate`}>
                <Trans>{(isTitle || isButton || isBoolean) ? '' : value || '—'}</Trans>
            </div>
-        </div>;
+        </Fragment>;
    });

-const Logs = () => {
+
+const Logs = (props) => {
    const dispatch = useDispatch();
    const history = useHistory();

@@ -67,14 +71,7 @@ const Logs = () => {
        search: search_url_param = '',
    } = queryString.parse(history.location.search);

-    const {
-        enabled,
-        processingGetConfig,
-        processingAdditionalLogs,
-        processingGetLogs,
-    } = useSelector((state) => state.queryLogs, shallowEqual);
-    const filter = useSelector((state) => state.queryLogs.filter, shallowEqual);
-    const logs = useSelector((state) => state.queryLogs.logs, shallowEqual);
+    const { filter } = useSelector((state) => state.queryLogs, shallowEqual);

    const search = filter?.search || search_url_param;
    const response_status = filter?.response_status || response_status_url_param;
@@ -85,7 +82,6 @@ const Logs = () => {
    const [isModalOpened, setModalOpened] = useState(false);
    const [isLoading, setIsLoading] = useState(false);

-    const closeModal = () => setModalOpened(false);

    useEffect(() => {
        (async () => {
@@ -98,11 +94,44 @@ const Logs = () => {
        })();
    }, [response_status, search]);

+    const {
+        filtering,
+        setLogsPage,
+        setLogsPagination,
+        toggleDetailedLogs,
+        dashboard,
+        dnsConfig,
+        queryLogs: {
+            enabled,
+            processingGetConfig,
+            processingAdditionalLogs,
+            processingGetLogs,
+            oldest,
+            logs,
+            pages,
+            page,
+            isDetailed,
+        },
+    } = props;
+
    const mediaQuery = window.matchMedia(`(max-width: ${SMALL_SCREEN_SIZE}px)`);
    const mediaQueryHandler = (e) => {
        setIsSmallScreen(e.matches);
        if (e.matches) {
-            dispatch(toggleDetailedLogs(false));
+            toggleDetailedLogs(false);
+        }
+    };
+
+    const closeModal = () => setModalOpened(false);
+
+    const getLogs = (older_than, page, initial) => {
+        if (enabled) {
+            props.getLogs({
+                older_than,
+                page,
+                pageSize: TABLE_DEFAULT_PAGE_SIZE,
+                initial,
+            });
        }
    };

@@ -120,6 +149,7 @@ const Logs = () => {

        (async () => {
            setIsLoading(true);
+            dispatch(setLogsPage(TABLE_FIRST_PAGE));
            dispatch(getFilteringStatus());
            dispatch(getClients());
            try {
@@ -139,7 +169,6 @@ const Logs = () => {
                mediaQuery.removeEventListener('change', mediaQueryHandler);
            } catch (e1) {
                try {
-                    // Safari 13.1 do not support mediaQuery.addEventListener('change', handler)
                    mediaQuery.removeListener(mediaQueryHandler);
                } catch (e2) {
                    console.error(e2);
@@ -150,53 +179,99 @@ const Logs = () => {
        };
    }, []);

-    const renderPage = () => <>
-        <Filters
-                filter={{
-                    response_status,
-                    search,
-                }}
-                setIsLoading={setIsLoading}
-                processingGetLogs={processingGetLogs}
-                processingAdditionalLogs={processingAdditionalLogs}
-        />
-        <InfiniteTable
-                isLoading={isLoading}
-                items={logs}
-                isSmallScreen={isSmallScreen}
-                setDetailedDataCurrent={setDetailedDataCurrent}
-                setButtonType={setButtonType}
-                setModalOpened={setModalOpened}
-        />
-        <Modal portalClassName='grid' isOpen={isSmallScreen && isModalOpened}
-               onRequestClose={closeModal}
-               style={{
-                   content: {
-                       width: '100%',
-                       height: 'fit-content',
-                       left: 0,
-                       top: 47,
-                       padding: '1rem 1.5rem 1rem',
-                   },
-                   overlay: {
-                       backgroundColor: 'rgba(0,0,0,0.5)',
-                   },
-               }}
-        >
-            <svg
-                    className="icon icon--24 icon-cross d-block d-md-none cursor--pointer"
-                    onClick={closeModal}>
-                <use xlinkHref="#cross" />
-            </svg>
-            {processContent(detailedDataCurrent, buttonType)}
-        </Modal>
-    </>;
+    const refreshLogs = async () => {
+        setIsLoading(true);
+        await Promise.all([
+            dispatch(setLogsPage(TABLE_FIRST_PAGE)),
+            dispatch(refreshFilteredLogs()),
+        ]);
+        dispatch(addSuccessToast('query_log_updated'));
+        setIsLoading(false);
+    };

-    return <>
-        {enabled && processingGetConfig && <Loading />}
-        {enabled && !processingGetConfig && renderPage()}
-        {!enabled && !processingGetConfig && <Disabled />}
-    </>;
+    return (
+        <>
+            {enabled && processingGetConfig && <Loading />}
+            {enabled && !processingGetConfig && (
+                <>
+                    <Filters
+                        filter={{
+                            response_status,
+                            search,
+                        }}
+                        setIsLoading={setIsLoading}
+                        processingGetLogs={processingGetLogs}
+                        processingAdditionalLogs={processingAdditionalLogs}
+                        refreshLogs={refreshLogs}
+                    />
+                    <Table
+                        isLoading={isLoading}
+                        setIsLoading={setIsLoading}
+                        logs={logs}
+                        pages={pages}
+                        page={page}
+                        autoClients={dashboard.autoClients}
+                        oldest={oldest}
+                        filtering={filtering}
+                        processingGetLogs={processingGetLogs}
+                        processingGetConfig={processingGetConfig}
+                        isDetailed={isDetailed}
+                        setLogsPagination={setLogsPagination}
+                        setLogsPage={setLogsPage}
+                        toggleDetailedLogs={toggleDetailedLogs}
+                        getLogs={getLogs}
+                        setRules={props.setRules}
+                        addSuccessToast={props.addSuccessToast}
+                        getFilteringStatus={props.getFilteringStatus}
+                        dnssec_enabled={dnsConfig.dnssec_enabled}
+                        setDetailedDataCurrent={setDetailedDataCurrent}
+                        setButtonType={setButtonType}
+                        setModalOpened={setModalOpened}
+                        isSmallScreen={isSmallScreen}
+                    />
+                    <Modal portalClassName='grid' isOpen={isSmallScreen && isModalOpened}
+                           onRequestClose={closeModal}
+                           style={{
+                               content: {
+                                   width: '100%',
+                                   height: 'fit-content',
+                                   left: 0,
+                                   top: 47,
+                                   padding: '1rem 1.5rem 1rem',
+                               },
+                               overlay: {
+                                   backgroundColor: 'rgba(0,0,0,0.5)',
+                               },
+                           }}
+                    >
+                        <svg
+                            className="icon icon--24 icon-cross d-block d-md-none cursor--pointer"
+                            onClick={closeModal}>
+                            <use xlinkHref="#cross" />
+                        </svg>
+                        {processContent(detailedDataCurrent, buttonType)}
+                    </Modal>
+                </>
+            )}
+            {!enabled && !processingGetConfig && (
+                <Disabled />
+            )}
+        </>
+    );
+};
+
+Logs.propTypes = {
+    getLogs: PropTypes.func.isRequired,
+    queryLogs: PropTypes.object.isRequired,
+    dashboard: PropTypes.object.isRequired,
+    getFilteringStatus: PropTypes.func.isRequired,
+    filtering: PropTypes.object.isRequired,
+    setRules: PropTypes.func.isRequired,
+    addSuccessToast: PropTypes.func.isRequired,
+    setLogsPagination: PropTypes.func.isRequired,
+    setLogsPage: PropTypes.func.isRequired,
+    toggleDetailedLogs: PropTypes.func.isRequired,
+    dnsConfig: PropTypes.object.isRequired,
 };

 export default Logs;
--- a/client/src/components/Settings/Clients/ClientsTable.js
+++ b/client/src/components/Settings/Clients/ClientsTable.js
@@ -4,7 +4,7 @@ import { Trans, withTranslation } from 'react-i18next';
 import ReactTable from 'react-table';

 import { MODAL_TYPE } from '../../../helpers/constants';
-import { splitByNewLine, countClientsStatistics } from '../../../helpers/helpers';
+import { splitByNewLine } from '../../../helpers/helpers';
 import Card from '../../ui/Card';
 import Modal from './Modal';
 import CellWrap from '../../ui/CellWrap';
@@ -204,10 +204,7 @@ class ClientsTable extends Component {
        {
            Header: this.props.t('requests_count'),
            id: 'statistics',
-            accessor: (row) => countClientsStatistics(
-                row.ids,
-                this.props.normalizedTopClients.auto,
-            ),
+            accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0,
            sortMethod: (a, b) => b - a,
            minWidth: 120,
            Cell: (row) => {
--- 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,
-    CheckboxField,
+    renderSelectField,
    renderServiceField,
 } from '../../../helpers/form';
 import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
@@ -151,7 +151,7 @@ let Form = (props) => {
                        <Field
                            name={setting.name}
                            type="checkbox"
-                            component={CheckboxField}
+                            component={renderSelectField}
                            placeholder={t(setting.placeholder)}
                            disabled={
                                setting.name !== 'use_global_settings'
--- a/client/src/components/Settings/Clients/whoisCell.js
+++ b/client/src/components/Settings/Clients/whoisCell.js
@@ -14,7 +14,7 @@ const getFormattedWhois = (value, t) => {
                <div key={key} title={t(key)}>
                    {icon && (
                        <Fragment>
-                            <svg className="logs__whois-icon text-muted-dark icons icon--24">
+                            <svg className="logs__whois-icon text-muted-dark icons">
                                <use xlinkHref={`#${icon}`} />
                            </svg>
                            &nbsp;
--- a/client/src/components/Settings/Dhcp/Form.js
+++ b/client/src/components/Settings/Dhcp/Form.js
@@ -0,0 +1,235 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import { Field, reduxForm, formValueSelector } from 'redux-form';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
+import { renderInputField, toNumber } from '../../../helpers/form';
+import { FORM_NAME } from '../../../helpers/constants';
+import { validateIpv4, validateIsPositiveValue, validateRequiredValue } from '../../../helpers/validators';
+
+const renderInterfaces = ((interfaces) => (
+    Object.keys(interfaces).map((item) => {
+        const option = interfaces[item];
+        const { name } = option;
+        const onlyIPv6 = option.ip_addresses.every((ip) => ip.includes(':'));
+        let interfaceIP = option.ip_addresses[0];
+
+        if (!onlyIPv6) {
+            option.ip_addresses.forEach((ip) => {
+                if (!ip.includes(':')) {
+                    interfaceIP = ip;
+                }
+            });
+        }
+
+        return (
+            <option value={name} key={name} disabled={onlyIPv6}>
+                {name} - {interfaceIP}
+            </option>
+        );
+    })
+));
+
+const renderInterfaceValues = ((interfaceValues) => (
+    <ul className="list-unstyled mt-1 mb-0">
+        <li>
+            <span className="interface__title">MTU: </span>
+            {interfaceValues.mtu}
+        </li>
+        <li>
+            <span className="interface__title"><Trans>dhcp_hardware_address</Trans>: </span>
+            {interfaceValues.hardware_address}
+        </li>
+        <li>
+            <span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
+            {
+                interfaceValues.ip_addresses
+                    .map((ip) => <span key={ip} className="interface__ip">{ip}</span>)
+            }
+        </li>
+    </ul>
+));
+
+const clearFields = (change, resetDhcp, t) => {
+    const fields = {
+        interface_name: '',
+        gateway_ip: '',
+        subnet_mask: '',
+        range_start: '',
+        range_end: '',
+        lease_duration: 86400,
+    };
+
+    // eslint-disable-next-line no-alert
+    if (window.confirm(t('dhcp_reset'))) {
+        Object.keys(fields).forEach((field) => change(field, fields[field]));
+        resetDhcp();
+    }
+};
+
+let Form = (props) => {
+    const {
+        t,
+        handleSubmit,
+        submitting,
+        invalid,
+        enabled,
+        interfaces,
+        interfaceValue,
+        processingConfig,
+        processingInterfaces,
+        resetDhcp,
+        change,
+    } = props;
+
+    return (
+        <form onSubmit={handleSubmit}>
+            {!processingInterfaces && interfaces
+                && <div className="row">
+                    <div className="col-sm-12 col-md-6">
+                        <div className="form__group form__group--settings">
+                            <label>{t('dhcp_interface_select')}</label>
+                            <Field
+                                name="interface_name"
+                                component="select"
+                                className="form-control custom-select"
+                                validate={[validateRequiredValue]}
+                            >
+                                <option value="" disabled={enabled}>
+                                    {t('dhcp_interface_select')}
+                                </option>
+                                {renderInterfaces(interfaces)}
+                            </Field>
+                        </div>
+                    </div>
+                    {interfaceValue
+                        && <div className="col-sm-12 col-md-6">
+                            {interfaces[interfaceValue]
+                                && renderInterfaceValues(interfaces[interfaceValue])}
+                        </div>
+                    }
+                </div>
+            }
+            <hr/>
+            <div className="row">
+                <div className="col-lg-6">
+                    <div className="form__group form__group--settings">
+                        <label>{t('dhcp_form_gateway_input')}</label>
+                        <Field
+                            id="gateway_ip"
+                            name="gateway_ip"
+                            component={renderInputField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t('dhcp_form_gateway_input')}
+                            validate={[validateIpv4, validateRequiredValue]}
+                        />
+                    </div>
+                    <div className="form__group form__group--settings">
+                        <label>{t('dhcp_form_subnet_input')}</label>
+                        <Field
+                            id="subnet_mask"
+                            name="subnet_mask"
+                            component={renderInputField}
+                            type="text"
+                            className="form-control"
+                            placeholder={t('dhcp_form_subnet_input')}
+                            validate={[validateIpv4, validateRequiredValue]}
+                        />
+                    </div>
+                </div>
+                <div className="col-lg-6">
+                    <div className="form__group form__group--settings">
+                        <div className="row">
+                            <div className="col-12">
+                                <label>{t('dhcp_form_range_title')}</label>
+                            </div>
+                            <div className="col">
+                                <Field
+                                    id="range_start"
+                                    name="range_start"
+                                    component={renderInputField}
+                                    type="text"
+                                    className="form-control"
+                                    placeholder={t('dhcp_form_range_start')}
+                                    validate={[validateIpv4, validateRequiredValue]}
+                                />
+                            </div>
+                            <div className="col">
+                                <Field
+                                    id="range_end"
+                                    name="range_end"
+                                    component={renderInputField}
+                                    type="text"
+                                    className="form-control"
+                                    placeholder={t('dhcp_form_range_end')}
+                                    validate={[validateIpv4, validateRequiredValue]}
+                                />
+                            </div>
+                        </div>
+                    </div>
+                    <div className="form__group form__group--settings">
+                        <label>{t('dhcp_form_lease_title')}</label>
+                        <Field
+                            name="lease_duration"
+                            component={renderInputField}
+                            type="number"
+                            className="form-control"
+                            placeholder={t('dhcp_form_lease_input')}
+                            validate={[validateRequiredValue, validateIsPositiveValue]}
+                            normalize={toNumber}
+                        />
+                    </div>
+                </div>
+            </div>
+
+            <div className="btn-list">
+                <button
+                    type="submit"
+                    className="btn btn-success btn-standard"
+                    disabled={submitting || invalid || processingConfig}
+                >
+                    {t('save_config')}
+                </button>
+                <button
+                    type="button"
+                    className="btn btn-secondary btn-standart"
+                    disabled={submitting || processingConfig}
+                    onClick={() => clearFields(change, resetDhcp, t)}
+                >
+                    <Trans>reset_settings</Trans>
+                </button>
+            </div>
+        </form>
+    );
+};
+
+Form.propTypes = {
+    handleSubmit: PropTypes.func.isRequired,
+    submitting: PropTypes.bool.isRequired,
+    invalid: PropTypes.bool.isRequired,
+    interfaces: PropTypes.object.isRequired,
+    interfaceValue: PropTypes.string,
+    initialValues: PropTypes.object.isRequired,
+    processingConfig: PropTypes.bool.isRequired,
+    processingInterfaces: PropTypes.bool.isRequired,
+    enabled: PropTypes.bool.isRequired,
+    t: PropTypes.func.isRequired,
+    resetDhcp: PropTypes.func.isRequired,
+    change: PropTypes.func.isRequired,
+};
+
+const selector = formValueSelector(FORM_NAME.DHCP);
+
+Form = connect((state) => {
+    const interfaceValue = selector(state, 'interface_name');
+    return {
+        interfaceValue,
+    };
+})(Form);
+
+export default flow([
+    withTranslation(),
+    reduxForm({ form: FORM_NAME.DHCP }),
+])(Form);
--- a/client/src/components/Settings/Dhcp/FormDHCPv4.js
+++ b/client/src/components/Settings/Dhcp/FormDHCPv4.js
@@ -1,145 +0,0 @@
-import React, { useCallback } from 'react';
-import { shallowEqual, useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
-import { useTranslation } from 'react-i18next';
-
-import {
-    renderInputField,
-    toNumber,
-} from '../../../helpers/form';
-import { FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
-import {
-    validateIpv4,
-    validateRequiredValue,
-    validateIpv4RangeEnd,
-} from '../../../helpers/validators';
-
-const FormDHCPv4 = ({
-    handleSubmit,
-    submitting,
-    processingConfig,
-    ipv4placeholders,
-}) => {
-    const { t } = useTranslation();
-    const dhcp = useSelector((state) => state.form[FORM_NAME.DHCPv4], shallowEqual);
-    const interfaces = useSelector((state) => state.form[FORM_NAME.DHCP_INTERFACES], shallowEqual);
-    const interface_name = interfaces?.values?.interface_name;
-
-    const isInterfaceIncludesIpv4 = useSelector(
-        (state) => !!state.dhcp?.interfaces?.[interface_name]?.ipv4_addresses,
-    );
-
-    const isEmptyConfig = !Object.values(dhcp?.values?.v4 ?? {})
-        .some(Boolean);
-
-    const invalid = dhcp?.syncErrors || interfaces?.syncErrors || !isInterfaceIncludesIpv4
-        || isEmptyConfig || submitting || processingConfig;
-
-    const validateRequired = useCallback((value) => {
-        if (isEmptyConfig) {
-            return undefined;
-        }
-        return validateRequiredValue(value);
-    }, [isEmptyConfig]);
-
-    return <form onSubmit={handleSubmit}>
-        <div className="row">
-            <div className="col-lg-6">
-                <div className="form__group form__group--settings">
-                    <label>{t('dhcp_form_gateway_input')}</label>
-                    <Field
-                        name="v4.gateway_ip"
-                        component={renderInputField}
-                        type="text"
-                        className="form-control"
-                        placeholder={t(ipv4placeholders.gateway_ip)}
-                        validate={[validateIpv4, validateRequired]}
-                        disabled={!isInterfaceIncludesIpv4}
-                    />
-                </div>
-                <div className="form__group form__group--settings">
-                    <label>{t('dhcp_form_subnet_input')}</label>
-                    <Field
-                        name="v4.subnet_mask"
-                        component={renderInputField}
-                        type="text"
-                        className="form-control"
-                        placeholder={t(ipv4placeholders.subnet_mask)}
-                        validate={[validateIpv4, validateRequired]}
-                        disabled={!isInterfaceIncludesIpv4}
-                    />
-                </div>
-            </div>
-            <div className="col-lg-6">
-                <div className="form__group form__group--settings">
-                    <div className="row">
-                        <div className="col-12">
-                            <label>{t('dhcp_form_range_title')}</label>
-                        </div>
-                        <div className="col">
-                            <Field
-                                name="v4.range_start"
-                                component={renderInputField}
-                                type="text"
-                                className="form-control"
-                                placeholder={t(ipv4placeholders.range_start)}
-                                validate={[validateIpv4]}
-                                disabled={!isInterfaceIncludesIpv4}
-                            />
-                        </div>
-                        <div className="col">
-                            <Field
-                                name="v4.range_end"
-                                component={renderInputField}
-                                type="text"
-                                className="form-control"
-                                placeholder={t(ipv4placeholders.range_end)}
-                                validate={[validateIpv4, validateIpv4RangeEnd]}
-                                disabled={!isInterfaceIncludesIpv4}
-                            />
-                        </div>
-                    </div>
-                </div>
-                <div className="form__group form__group--settings">
-                    <label>{t('dhcp_form_lease_title')}</label>
-                    <Field
-                        name="v4.lease_duration"
-                        component={renderInputField}
-                        type="number"
-                        className="form-control"
-                        placeholder={t(ipv4placeholders.lease_duration)}
-                        validate={validateRequired}
-                        normalize={toNumber}
-                        min={1}
-                        max={UINT32_RANGE.MAX}
-                        disabled={!isInterfaceIncludesIpv4}
-                    />
-                </div>
-            </div>
-        </div>
-        <div className="btn-list">
-            <button
-                type="submit"
-                className="btn btn-success btn-standard"
-                disabled={invalid}
-            >
-                {t('save_config')}
-            </button>
-        </div>
-    </form>;
-};
-
-FormDHCPv4.propTypes = {
-    handleSubmit: PropTypes.func.isRequired,
-    submitting: PropTypes.bool.isRequired,
-    initialValues: PropTypes.object.isRequired,
-    processingConfig: PropTypes.bool.isRequired,
-    change: PropTypes.func.isRequired,
-    reset: PropTypes.func.isRequired,
-    ipv4placeholders: PropTypes.object.isRequired,
-};
-
-export default reduxForm({
-    form: FORM_NAME.DHCPv4,
-})(FormDHCPv4);
--- a/client/src/components/Settings/Dhcp/FormDHCPv6.js
+++ b/client/src/components/Settings/Dhcp/FormDHCPv6.js
@@ -1,117 +0,0 @@
-import React, { useCallback } from 'react';
-import { shallowEqual, useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
-import { useTranslation } from 'react-i18next';
-
-import {
-    renderInputField,
-    toNumber,
-} from '../../../helpers/form';
-import { FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
-import { validateIpv6, validateRequiredValue } from '../../../helpers/validators';
-
-const FormDHCPv6 = ({
-    handleSubmit,
-    submitting,
-    processingConfig,
-    ipv6placeholders,
-}) => {
-    const { t } = useTranslation();
-    const dhcp = useSelector((state) => state.form[FORM_NAME.DHCPv6], shallowEqual);
-    const interfaces = useSelector((state) => state.form[FORM_NAME.DHCP_INTERFACES], shallowEqual);
-    const interface_name = interfaces?.values?.interface_name;
-
-    const isInterfaceIncludesIpv6 = useSelector(
-        (state) => !!state.dhcp?.interfaces?.[interface_name]?.ipv6_addresses,
-    );
-
-    const isEmptyConfig = !Object.values(dhcp?.values?.v6 ?? {})
-        .some(Boolean);
-
-    const invalid = dhcp?.syncErrors || interfaces?.syncErrors || !isInterfaceIncludesIpv6
-        || isEmptyConfig || submitting || processingConfig;
-
-    const validateRequired = useCallback((value) => {
-        if (isEmptyConfig) {
-            return undefined;
-        }
-        return validateRequiredValue(value);
-    }, [isEmptyConfig]);
-
-    return <form onSubmit={handleSubmit}>
-        <div className="row">
-            <div className="col-lg-6">
-                <div className="form__group form__group--settings">
-                    <div className="row">
-                        <div className="col-12">
-                            <label>{t('dhcp_form_range_title')}</label>
-                        </div>
-                        <div className="col">
-                            <Field
-                                name="v6.range_start"
-                                component={renderInputField}
-                                type="text"
-                                className="form-control"
-                                placeholder={t(ipv6placeholders.range_start)}
-                                validate={[validateIpv6, validateRequired]}
-                                disabled={!isInterfaceIncludesIpv6}
-                            />
-                        </div>
-                        <div className="col">
-                            <Field
-                                name="v6.range_end"
-                                component="input"
-                                type="text"
-                                className="form-control disabled cursor--not-allowed"
-                                placeholder={t(ipv6placeholders.range_end)}
-                                value={t(ipv6placeholders.range_end)}
-                                disabled
-                            />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div className="row">
-            <div className="col-lg-6 form__group form__group--settings">
-                <label>{t('dhcp_form_lease_title')}</label>
-                <Field
-                    name="v6.lease_duration"
-                    component={renderInputField}
-                    type="number"
-                    className="form-control"
-                    placeholder={t(ipv6placeholders.lease_duration)}
-                    validate={validateRequired}
-                    normalizeOnBlur={toNumber}
-                    min={1}
-                    max={UINT32_RANGE.MAX}
-                    disabled={!isInterfaceIncludesIpv6}
-                />
-            </div>
-        </div>
-        <div className="btn-list">
-            <button
-                type="submit"
-                className="btn btn-success btn-standard"
-                disabled={invalid}
-            >
-                {t('save_config')}
-            </button>
-        </div>
-    </form>;
-};
-
-FormDHCPv6.propTypes = {
-    handleSubmit: PropTypes.func.isRequired,
-    submitting: PropTypes.bool.isRequired,
-    initialValues: PropTypes.object.isRequired,
-    processingConfig: PropTypes.bool.isRequired,
-    change: PropTypes.func.isRequired,
-    reset: PropTypes.func.isRequired,
-    ipv6placeholders: PropTypes.object.isRequired,
-};
-
-export default reduxForm({
-    form: FORM_NAME.DHCPv6,
-})(FormDHCPv6);
--- a/client/src/components/Settings/Dhcp/Interfaces.js
+++ b/client/src/components/Settings/Dhcp/Interfaces.js
@@ -1,109 +0,0 @@
-import React from 'react';
-import { shallowEqual, useSelector } from 'react-redux';
-import { Field, reduxForm } from 'redux-form';
-import { Trans, useTranslation } from 'react-i18next';
-import propTypes from 'prop-types';
-import { renderSelectField } from '../../../helpers/form';
-import { validateRequiredValue } from '../../../helpers/validators';
-import { FORM_NAME } from '../../../helpers/constants';
-
-const renderInterfaces = (interfaces) => Object.keys(interfaces)
-    .map((item) => {
-        const option = interfaces[item];
-        const { name } = option;
-
-        const [interfaceIPv4] = option?.ipv4_addresses ?? [];
-        const [interfaceIPv6] = option?.ipv6_addresses ?? [];
-
-        const optionContent = [name, interfaceIPv4, interfaceIPv6].filter(Boolean).join(' - ');
-
-        return <option value={name} key={name}>{optionContent}</option>;
-    });
-
-
-const getInterfaceValues = ({
-    gateway_ip,
-    hardware_address,
-    ip_addresses,
-}) => [
-    {
-        name: 'dhcp_form_gateway_input',
-        value: gateway_ip,
-    },
-    {
-        name: 'dhcp_hardware_address',
-        value: hardware_address,
-    },
-    {
-        name: 'dhcp_ip_addresses',
-        value: ip_addresses,
-        render: (ip_addresses) => ip_addresses
-            .map((ip) => <span key={ip} className="interface__ip">{ip}</span>),
-    },
-];
-
-const renderInterfaceValues = ({
-    gateway_ip,
-    hardware_address,
-    ip_addresses,
-}) => <div className='d-flex align-items-end col-6'>
-    <ul className="list-unstyled m-0">
-        {getInterfaceValues({
-            gateway_ip,
-            hardware_address,
-            ip_addresses,
-        }).map(({ name, value, render }) => value && <li key={name}>
-            <span className="interface__title"><Trans>{name}</Trans>: </span>
-            {render?.(value) || value}
-        </li>)}
-    </ul>
-</div>;
-
-const Interfaces = () => {
-    const { t } = useTranslation();
-
-    const {
-        processingInterfaces,
-        interfaces,
-        enabled,
-    } = useSelector((store) => store.dhcp, shallowEqual);
-
-    const interface_name = useSelector(
-        (store) => store.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name,
-    );
-
-    const interfaceValue = interface_name && interfaces[interface_name];
-
-    return !processingInterfaces
-            && interfaces
-            && <>
-                <div className="row align-items-center pb-2">
-                    <div className="col-6">
-                        <Field
-                                name="interface_name"
-                                component={renderSelectField}
-                                className="form-control custom-select"
-                                validate={[validateRequiredValue]}
-                                label='dhcp_interface_select'
-                        >
-                            <option value='' disabled={enabled}>
-                                {t('dhcp_interface_select')}
-                            </option>
-                            {renderInterfaces(interfaces)}
-                        </Field>
-                    </div>
-                    {interfaceValue
-                    && renderInterfaceValues(interfaceValue)}
-                </div>
-            </>;
-};
-
-renderInterfaceValues.propTypes = {
-    gateway_ip: propTypes.string.isRequired,
-    hardware_address: propTypes.string.isRequired,
-    ip_addresses: propTypes.arrayOf(propTypes.string).isRequired,
-};
-
-export default reduxForm({
-    form: FORM_NAME.DHCP_INTERFACES,
-})(Interfaces);
--- a/client/src/components/Settings/Dhcp/StaticLeases/Form.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Form.js
@@ -1,27 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
-import { Trans, useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
+import { Trans, withTranslation } from 'react-i18next';
+import flow from 'lodash/flow';
 import { renderInputField } from '../../../../helpers/form';
 import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators';
 import { FORM_NAME } from '../../../../helpers/constants';
-import { toggleLeaseModal } from '../../../../actions';

-const Form = ({
-    handleSubmit,
-    reset,
-    pristine,
-    submitting,
-    processingAdding,
-}) => {
-    const { t } = useTranslation();
-    const dispatch = useDispatch();
-
-    const onClick = () => {
-        reset();
-        dispatch(toggleLeaseModal());
-    };
+const Form = (props) => {
+    const {
+        t,
+        handleSubmit,
+        reset,
+        pristine,
+        submitting,
+        toggleLeaseModal,
+        processingAdding,
+    } = props;

    return (
        <form onSubmit={handleSubmit}>
@@ -66,7 +61,10 @@ const Form = ({
                        type="button"
                        className="btn btn-secondary btn-standard"
                        disabled={submitting}
-                        onClick={onClick}
+                        onClick={() => {
+                            reset();
+                            toggleLeaseModal();
+                        }}
                    >
                        <Trans>cancel_btn</Trans>
                    </button>
@@ -88,7 +86,12 @@ Form.propTypes = {
    handleSubmit: PropTypes.func.isRequired,
    reset: PropTypes.func.isRequired,
    submitting: PropTypes.bool.isRequired,
+    toggleLeaseModal: PropTypes.func.isRequired,
    processingAdding: PropTypes.bool.isRequired,
+    t: PropTypes.func.isRequired,
 };

-export default reduxForm({ form: FORM_NAME.LEASE })(Form);
+export default flow([
+    withTranslation(),
+    reduxForm({ form: FORM_NAME.LEASE }),
+])(Form);
--- a/client/src/components/Settings/Dhcp/StaticLeases/Modal.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Modal.js
@@ -2,37 +2,36 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
 import ReactModal from 'react-modal';
-import { useDispatch } from 'react-redux';
+
 import Form from './Form';
-import { toggleLeaseModal } from '../../../../actions';

-const Modal = ({
-    isModalOpen,
-    handleSubmit,
-    processingAdding,
-}) => {
-    const dispatch = useDispatch();
-
-    const toggleModal = () => dispatch(toggleLeaseModal());
+const Modal = (props) => {
+    const {
+        isModalOpen,
+        handleSubmit,
+        toggleLeaseModal,
+        processingAdding,
+    } = props;

    return (
        <ReactModal
            className="Modal__Bootstrap modal-dialog modal-dialog-centered modal-dialog--clients"
            closeTimeoutMS={0}
            isOpen={isModalOpen}
-            onRequestClose={toggleModal}
+            onRequestClose={() => toggleLeaseModal()}
        >
            <div className="modal-content">
                <div className="modal-header">
                    <h4 className="modal-title">
                        <Trans>dhcp_new_static_lease</Trans>
                    </h4>
-                    <button type="button" className="close" onClick={toggleModal}>
+                    <button type="button" className="close" onClick={() => toggleLeaseModal()}>
                        <span className="sr-only">Close</span>
                    </button>
                </div>
                <Form
                    onSubmit={handleSubmit}
+                    toggleLeaseModal={toggleLeaseModal}
                    processingAdding={processingAdding}
                />
            </div>
@@ -43,6 +42,7 @@ const Modal = ({
 Modal.propTypes = {
    isModalOpen: PropTypes.bool.isRequired,
    handleSubmit: PropTypes.func.isRequired,
+    toggleLeaseModal: PropTypes.func.isRequired,
    processingAdding: PropTypes.bool.isRequired,
 };

--- a/client/src/components/Settings/Dhcp/StaticLeases/index.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/index.js
@@ -1,116 +1,115 @@
-import React from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
-import { Trans, useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
+import { Trans, withTranslation } from 'react-i18next';
 import { LEASES_TABLE_DEFAULT_PAGE_SIZE } from '../../../../helpers/constants';
 import { sortIp } from '../../../../helpers/helpers';
 import Modal from './Modal';
-import { addStaticLease, removeStaticLease } from '../../../../actions';

-const cellWrap = ({ value }) => (
-    <div className="logs__row o-hidden">
+class StaticLeases extends Component {
+    cellWrap = ({ value }) => (
+        <div className="logs__row o-hidden">
            <span className="logs__text" title={value}>
                {value}
            </span>
-    </div>
-);
+        </div>
+    );

-const StaticLeases = ({
-    isModalOpen,
-    processingAdding,
-    processingDeleting,
-    staticLeases,
-}) => {
-    const [t] = useTranslation();
-    const dispatch = useDispatch();
-
-    const handleSubmit = (data) => {
-        dispatch(addStaticLease(data));
+    handleSubmit = (data) => {
+        this.props.addStaticLease(data);
    };

-    const handleDelete = (ip, mac, hostname = '') => {
+    handleDelete = (ip, mac, hostname = '') => {
        const name = hostname || ip;
        // eslint-disable-next-line no-alert
-        if (window.confirm(t('delete_confirm', { key: name }))) {
-            dispatch(removeStaticLease({
-                ip,
-                mac,
-                hostname,
-            }));
+        if (window.confirm(this.props.t('delete_confirm', { key: name }))) {
+            this.props.removeStaticLease({ ip, mac, hostname });
        }
    };

-    return (
-        <>
-            <ReactTable
-                data={staticLeases || []}
-                columns={[
-                    {
-                        Header: 'MAC',
-                        accessor: 'mac',
-                        Cell: cellWrap,
-                    },
-                    {
-                        Header: 'IP',
-                        accessor: 'ip',
-                        sortMethod: sortIp,
-                        Cell: cellWrap,
-                    },
-                    {
-                        Header: <Trans>dhcp_table_hostname</Trans>,
-                        accessor: 'hostname',
-                        Cell: cellWrap,
-                    },
-                    {
-                        Header: <Trans>actions_table_header</Trans>,
-                        accessor: 'actions',
-                        maxWidth: 150,
-                        // eslint-disable-next-line react/display-name
-                        Cell: (row) => {
-                            const { ip, mac, hostname } = row.original;
+    render() {
+        const {
+            isModalOpen,
+            toggleLeaseModal,
+            processingAdding,
+            processingDeleting,
+            staticLeases,
+            t,
+        } = this.props;
+        return (
+            <Fragment>
+                <ReactTable
+                    data={staticLeases || []}
+                    columns={[
+                        {
+                            Header: 'MAC',
+                            accessor: 'mac',
+                            Cell: this.cellWrap,
+                        },
+                        {
+                            Header: 'IP',
+                            accessor: 'ip',
+                            sortMethod: sortIp,
+                            Cell: this.cellWrap,
+                        },
+                        {
+                            Header: <Trans>dhcp_table_hostname</Trans>,
+                            accessor: 'hostname',
+                            Cell: this.cellWrap,
+                        },
+                        {
+                            Header: <Trans>actions_table_header</Trans>,
+                            accessor: 'actions',
+                            maxWidth: 150,
+                            Cell: (row) => {
+                                const { ip, mac, hostname } = row.original;

-                            return <div className="logs__row logs__row--center">
-                                <button
-                                        type="button"
-                                        className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
-                                        title={t('delete_table_action')}
-                                        disabled={processingDeleting}
-                                        onClick={() => handleDelete(ip, mac, hostname)}
+                                return (
+                                    <div className="logs__row logs__row--center">
+                                        <button
+                                            type="button"
+                                            className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
+                                            title={t('delete_table_action')}
+                                            disabled={processingDeleting}
+                                            onClick={() => this.handleDelete(ip, mac, hostname)
+                                            }
                                        >
                                            <svg className="icons">
                                                <use xlinkHref="#delete"/>
                                            </svg>
                                        </button>
-                                    </div>;
+                                    </div>
+                                );
+                            },
                        },
-                    },
-                ]}
-                pageSize={LEASES_TABLE_DEFAULT_PAGE_SIZE}
-                showPageSizeOptions={false}
-                showPagination={staticLeases.length > LEASES_TABLE_DEFAULT_PAGE_SIZE}
-                noDataText={t('dhcp_static_leases_not_found')}
-                className="-striped -highlight card-table-overflow"
-                minRows={6}
-            />
-            <Modal
-                isModalOpen={isModalOpen}
-                handleSubmit={handleSubmit}
-                processingAdding={processingAdding}
-            />
-        </>
-    );
-};
+                    ]}
+                    pageSize={LEASES_TABLE_DEFAULT_PAGE_SIZE}
+                    showPageSizeOptions={false}
+                    showPagination={staticLeases.length > LEASES_TABLE_DEFAULT_PAGE_SIZE}
+                    noDataText={t('dhcp_static_leases_not_found')}
+                    className="-striped -highlight card-table-overflow"
+                    minRows={6}
+                />
+                <Modal
+                    isModalOpen={isModalOpen}
+                    toggleLeaseModal={toggleLeaseModal}
+                    handleSubmit={this.handleSubmit}
+                    processingAdding={processingAdding}
+                />
+            </Fragment>
+        );
+    }
+}

 StaticLeases.propTypes = {
    staticLeases: PropTypes.array.isRequired,
    isModalOpen: PropTypes.bool.isRequired,
+    toggleLeaseModal: PropTypes.func.isRequired,
+    removeStaticLease: PropTypes.func.isRequired,
+    addStaticLease: PropTypes.func.isRequired,
    processingAdding: PropTypes.bool.isRequired,
    processingDeleting: PropTypes.bool.isRequired,
+    t: PropTypes.func.isRequired,
 };

-cellWrap.propTypes = {
-    value: PropTypes.string.isRequired,
-};
-
-export default StaticLeases;
+export default withTranslation()(StaticLeases);
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -1,277 +1,274 @@
-import React, { useEffect, useState } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { Trans, withTranslation } from 'react-i18next';

-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import classNames from 'classnames';
-import { destroy } from 'redux-form';
-import {
-    DHCP_DESCRIPTION_PLACEHOLDERS,
-    DHCP_FORM_NAMES,
-    STATUS_RESPONSE,
-    FORM_NAME,
-} from '../../../helpers/constants';
+import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants';
+import Form from './Form';
 import Leases from './Leases';
 import StaticLeases from './StaticLeases/index';
 import Card from '../../ui/Card';
+import Accordion from '../../ui/Accordion';
 import PageTitle from '../../ui/PageTitle';
 import Loading from '../../ui/Loading';
-import {
-    findActiveDhcp,
-    getDhcpInterfaces,
-    getDhcpStatus,
-    resetDhcp,
-    setDhcpConfig,
-    toggleDhcp,
-    toggleLeaseModal,
-} from '../../../actions';
-import FormDHCPv4 from './FormDHCPv4';
-import FormDHCPv6 from './FormDHCPv6';
-import Interfaces from './Interfaces';
-import {
-    calculateDhcpPlaceholdersIpv4,
-    calculateDhcpPlaceholdersIpv6,
-} from '../../../helpers/helpers';

-const Dhcp = () => {
-    const { t } = useTranslation();
-    const dispatch = useDispatch();
-    const {
-        processingStatus,
-        processingConfig,
-        processing,
-        processingInterfaces,
-        check,
-        leases,
-        staticLeases,
-        isModalOpen,
-        processingAdding,
-        processingDeleting,
-        processingDhcp,
-        v4,
-        v6,
-        interface_name: interfaceName,
-        enabled,
-        dhcp_available,
-        interfaces,
-    } = useSelector((state) => state.dhcp, shallowEqual);
+class Dhcp extends Component {
+    componentDidMount() {
+        this.props.getDhcpStatus();
+        this.props.getDhcpInterfaces();
+    }

-    const interface_name = useSelector(
-        (state) => state.form[FORM_NAME.DHCP_INTERFACES]?.values?.interface_name,
-    );
-
-    const [ipv4placeholders, setIpv4Placeholders] = useState(DHCP_DESCRIPTION_PLACEHOLDERS.ipv4);
-    const [ipv6placeholders, setIpv6Placeholders] = useState(DHCP_DESCRIPTION_PLACEHOLDERS.ipv6);
-
-    useEffect(() => {
-        dispatch(getDhcpStatus());
-        dispatch(getDhcpInterfaces());
-    }, []);
-
-    useEffect(() => {
-        const [ipv4] = interfaces?.[interface_name]?.ipv4_addresses ?? [];
-        const [ipv6] = interfaces?.[interface_name]?.ipv6_addresses ?? [];
-        const gateway_ip = interfaces?.[interface_name]?.gateway_ip;
-
-        const v4placeholders = ipv4
-            ? calculateDhcpPlaceholdersIpv4(ipv4, gateway_ip)
-            : DHCP_DESCRIPTION_PLACEHOLDERS.ipv4;
-
-        const v6placeholders = ipv6
-            ? calculateDhcpPlaceholdersIpv6()
-            : DHCP_DESCRIPTION_PLACEHOLDERS.ipv6;
-
-        setIpv4Placeholders(v4placeholders);
-        setIpv6Placeholders(v6placeholders);
-    }, [interface_name]);
-
-    const clear = () => {
-        // eslint-disable-next-line no-alert
-        if (window.confirm(t('dhcp_reset'))) {
-            Object.values(DHCP_FORM_NAMES)
-                .forEach((formName) => dispatch(destroy(formName)));
-            dispatch(resetDhcp());
+    handleFormSubmit = (values) => {
+        if (values.interface_name) {
+            this.props.setDhcpConfig(values);
        }
    };

-    const handleSubmit = (values) => {
-        dispatch(setDhcpConfig({
-            interface_name,
-            ...values,
-        }));
+    handleToggle = (config) => {
+        this.props.toggleDhcp(config);
    };

-    const enteredSomeV4Value = Object.values(v4)
-        .some(Boolean);
-    const enteredSomeV6Value = Object.values(v6)
-        .some(Boolean);
-    const enteredSomeValue = enteredSomeV4Value || enteredSomeV6Value || interfaceName;
+    getToggleDhcpButton = () => {
+        const {
+            config, check, processingDhcp, processingConfig,
+        } = this.props.dhcp;
+        const otherDhcpFound = check?.otherServer
+            && check.otherServer.found === DHCP_STATUS_RESPONSE.YES;
+        const filledConfig = Object.keys(config)
+            .every((key) => {
+                if (key === 'enabled' || key === 'icmp_timeout_msec') {
+                    return true;
+                }

-    const getToggleDhcpButton = () => {
-        const otherDhcpFound = check && (check.v4.other_server.found === STATUS_RESPONSE.YES
-                || check.v6.other_server.found === STATUS_RESPONSE.YES);
+                return config[key];
+            });

-        const filledConfig = interface_name && (Object.values(v4)
-            .every(Boolean) || Object.values(v6)
-            .every(Boolean));
+        if (config.enabled) {
+            return (
+                <button
+                    type="button"
+                    className="btn btn-standard mr-2 btn-gray"
+                    onClick={() => this.props.toggleDhcp(config)}
+                    disabled={processingDhcp || processingConfig}
+                >
+                    <Trans>dhcp_disable</Trans>
+                </button>
+            );
+        }

-        const className = classNames('btn btn-sm mr-2', {
-            'btn-gray': enabled,
-            'btn-outline-success': !enabled,
-        });
-
-        const onClickDisable = () => dispatch(toggleDhcp({ enabled }));
-        const onClickEnable = () => {
-            const values = {
-                enabled,
-                interface_name,
-                v4: enteredSomeV4Value ? v4 : {},
-                v6: enteredSomeV6Value ? v6 : {},
-            };
-            dispatch(toggleDhcp(values));
-        };
-
-        return <button
-            type="button"
-            className={className}
-            onClick={enabled ? onClickDisable : onClickEnable}
-            disabled={processingDhcp || processingConfig
-            || (!enabled && (!filledConfig || !check || otherDhcpFound))}
-        >
-            <Trans>{enabled ? 'dhcp_disable' : 'dhcp_enable'}</Trans>
-        </button>;
+        return (
+            <button
+                type="button"
+                className="btn btn-standard mr-2 btn-success"
+                onClick={() => this.handleToggle(config)}
+                disabled={
+                    !filledConfig || !check || otherDhcpFound || processingDhcp || processingConfig
+                }
+            >
+                <Trans>dhcp_enable</Trans>
+            </button>
+        );
    };

-    const statusButtonClass = classNames('btn btn-sm mx-2', {
-        'btn-loading btn-primary': processingStatus,
-        'btn-outline-primary': !processingStatus,
-    });
+    getActiveDhcpMessage = (t, check) => {
+        const { found } = check.otherServer;

-    const onClick = () => dispatch(findActiveDhcp(interface_name));
-
-    const toggleModal = () => dispatch(toggleLeaseModal());
-
-    const initialV4 = enteredSomeV4Value ? v4 : {};
-    const initialV6 = enteredSomeV6Value ? v6 : {};
-
-    if (processing || processingInterfaces) {
-        return <Loading />;
-    }
-
-    if (!processing && !dhcp_available) {
-        return <div className="text-center pt-5">
-            <h2>
-                <Trans>unavailable_dhcp</Trans>
-            </h2>
-            <h4>
-                <Trans>unavailable_dhcp_desc</Trans>
-            </h4>
-        </div>;
-    }
-
-    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>
+        if (found === DHCP_STATUS_RESPONSE.ERROR) {
+            return (
+                <div className="text-danger mb-2">
+                    <Trans>dhcp_error</Trans>
+                    <div className="mt-2 mb-2">
+                        <Accordion label={t('error_details')}>
+                            <span>{check.otherServer.error}</span>
+                        </Accordion>
+                    </div>
                </div>
+            );
+        }
+
+        return (
+            <div className="mb-2">
+                {found === DHCP_STATUS_RESPONSE.YES ? (
+                    <div className="text-danger">
+                        <Trans>dhcp_found</Trans>
+                    </div>
+                ) : (
+                    <div className="text-secondary">
+                        <Trans>dhcp_not_found</Trans>
+                    </div>
+                )}
            </div>
-        </PageTitle>
-        {!processing && !processingInterfaces
-        && <>
-            {!enabled
-            && check
-            && (check.v4.other_server.found !== STATUS_RESPONSE.NO
-                    || check.v6.other_server.found !== STATUS_RESPONSE.NO)
-            && <div className="mb-5">
-                <hr />
-                <div className="text-danger">
-                    <Trans>dhcp_warning</Trans>
-                </div>
-            </div>}
-            <Interfaces
-                initialValues={{ interface_name: interfaceName }}
-            />
-            <Card
-                title={t('dhcp_ipv4_settings')}
-                bodyType="card-body box-body--settings"
-            >
-                <div>
-                    <FormDHCPv4
-                        onSubmit={handleSubmit}
-                        initialValues={{ v4: initialV4 }}
-                        processingConfig={processingConfig}
-                        ipv4placeholders={ipv4placeholders}
-                    />
-                </div>
-            </Card>
-            <Card
-                title={t('dhcp_ipv6_settings')}
-                bodyType="card-body box-body--settings"
-            >
-                <div>
-                    <FormDHCPv6
-                        onSubmit={handleSubmit}
-                        initialValues={{ v6: initialV6 }}
-                        processingConfig={processingConfig}
-                        ipv6placeholders={ipv6placeholders}
-                    />
-                </div>
-            </Card>
-            {enabled
-            && <Card
-                title={t('dhcp_leases')}
-                bodyType="card-body box-body--settings"
-            >
-                <div className="row">
-                    <div className="col">
-                        <Leases leases={leases} />
+        );
+    };
+
+    getDhcpWarning = (check) => {
+        if (check.otherServer.found === DHCP_STATUS_RESPONSE.NO) {
+            return '';
+        }
+
+        return (
+            <div className="text-danger">
+                <Trans>dhcp_warning</Trans>
+            </div>
+        );
+    };
+
+    getStaticIpWarning = (t, check, interfaceName) => {
+        if (check.staticIP.static === DHCP_STATUS_RESPONSE.ERROR) {
+            return <>
+                <div className="text-danger mb-2">
+                    <Trans>dhcp_static_ip_error</Trans>
+                    <div className="mt-2 mb-2">
+                        <Accordion label={t('error_details')}>
+                            <span>{check.staticIP.error}</span>
+                        </Accordion>
                    </div>
                </div>
-            </Card>}
-            <Card
-                title={t('dhcp_static_leases')}
-                bodyType="card-body box-body--settings"
-            >
-                <div className="row">
-                    <div className="col-12">
-                        <StaticLeases
-                            staticLeases={staticLeases}
-                            isModalOpen={isModalOpen}
-                            processingAdding={processingAdding}
-                            processingDeleting={processingDeleting}
-                        />
-                    </div>
-                    <div className="col-12">
-                        <button
-                            type="button"
-                            className="btn btn-success btn-standard mt-3"
-                            onClick={toggleModal}
-                        >
-                            <Trans>dhcp_add_static_lease</Trans>
-                        </button>
-                    </div>
+                <hr className="mt-4 mb-4" />
+            </>;
+        }
+        if (check.staticIP.static === DHCP_STATUS_RESPONSE.NO
+            && check.staticIP.ip
+            && interfaceName) {
+            return <>
+                <div className="text-secondary mb-2">
+                    <Trans
+                        components={[<strong key="0">example</strong>]}
+                        values={{
+                            interfaceName,
+                            ipAddress: check.staticIP.ip,
+                        }}
+                    >
+                        dhcp_dynamic_ip_found
+                    </Trans>
                </div>
-            </Card>
-        </>}
-    </>;
+                <hr className="mt-4 mb-4" />
+            </>;
+        }
+
+        return '';
+    };
+
+    render() {
+        const {
+            t,
+            dhcp,
+            resetDhcp,
+            findActiveDhcp,
+            addStaticLease,
+            removeStaticLease,
+            toggleLeaseModal,
+        } = this.props;
+
+        const statusButtonClass = classnames({
+            'btn btn-primary btn-standard': true,
+            'btn btn-primary btn-standard btn-loading': dhcp.processingStatus,
+        });
+        const { enabled, interface_name, ...values } = dhcp.config;
+
+        return <>
+            <PageTitle title={t('dhcp_settings')} />
+            {(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
+            {!dhcp.processing && !dhcp.processingInterfaces && <>
+                <Card
+                    title={t('dhcp_title')}
+                    subtitle={t('dhcp_description')}
+                    bodyType="card-body box-body--settings"
+                >
+                    <div className="dhcp">
+                        <>
+                            <Form
+                                onSubmit={this.handleFormSubmit}
+                                initialValues={{
+                                    interface_name,
+                                    ...values,
+                                }}
+                                interfaces={dhcp.interfaces}
+                                processingConfig={dhcp.processingConfig}
+                                processingInterfaces={dhcp.processingInterfaces}
+                                enabled={enabled}
+                                resetDhcp={resetDhcp}
+                            />
+                            <hr />
+                            <div className="card-actions mb-3">
+                                {this.getToggleDhcpButton()}
+                                <button
+                                    type="button"
+                                    className={statusButtonClass}
+                                    onClick={() => findActiveDhcp(interface_name)}
+                                    disabled={
+                                        enabled || !interface_name || dhcp.processingConfig
+                                    }
+                                >
+                                    <Trans>check_dhcp_servers</Trans>
+                                </button>
+                            </div>
+                            {!enabled && dhcp.check && (
+                                <>
+                                    {this.getStaticIpWarning(t, dhcp.check, interface_name)}
+                                    {this.getActiveDhcpMessage(t, dhcp.check)}
+                                    {this.getDhcpWarning(dhcp.check)}
+                                </>
+                            )}
+                        </>
+                    </div>
+                </Card>
+                {dhcp.config.enabled && (
+                    <Card
+                        title={t('dhcp_leases')}
+                        bodyType="card-body box-body--settings"
+                    >
+                        <div className="row">
+                            <div className="col">
+                                <Leases leases={dhcp.leases} />
+                            </div>
+                        </div>
+                    </Card>
+                )}
+                <Card
+                    title={t('dhcp_static_leases')}
+                    bodyType="card-body box-body--settings"
+                >
+                    <div className="row">
+                        <div className="col-12">
+                            <StaticLeases
+                                staticLeases={dhcp.staticLeases}
+                                isModalOpen={dhcp.isModalOpen}
+                                addStaticLease={addStaticLease}
+                                removeStaticLease={removeStaticLease}
+                                toggleLeaseModal={toggleLeaseModal}
+                                processingAdding={dhcp.processingAdding}
+                                processingDeleting={dhcp.processingDeleting}
+                            />
+                        </div>
+                        <div className="col-12">
+                            <button
+                                type="button"
+                                className="btn btn-success btn-standard mt-3"
+                                onClick={() => toggleLeaseModal()}
+                            >
+                                <Trans>dhcp_add_static_lease</Trans>
+                            </button>
+                        </div>
+                    </div>
+                </Card>
+            </>}
+        </>;
+    }
+}
+
+Dhcp.propTypes = {
+    dhcp: PropTypes.object.isRequired,
+    toggleDhcp: PropTypes.func.isRequired,
+    getDhcpStatus: PropTypes.func.isRequired,
+    setDhcpConfig: PropTypes.func.isRequired,
+    findActiveDhcp: PropTypes.func.isRequired,
+    addStaticLease: PropTypes.func.isRequired,
+    removeStaticLease: PropTypes.func.isRequired,
+    toggleLeaseModal: PropTypes.func.isRequired,
+    getDhcpInterfaces: PropTypes.func.isRequired,
+    t: PropTypes.func.isRequired,
+    resetDhcp: PropTypes.func.isRequired,
 };

-export default Dhcp;
+export default withTranslation()(Dhcp);
--- a/client/src/components/Settings/Dns/Cache/Form.js
+++ b/client/src/components/Settings/Dns/Cache/Form.js
@@ -4,29 +4,32 @@ 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 { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
-import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';
+import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
+import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants';

-const INPUTS_FIELDS = [
-    {
-        name: CACHE_CONFIG_FIELDS.cache_size,
-        title: 'cache_size',
-        description: 'cache_size_desc',
-        placeholder: 'enter_cache_size',
-    },
-    {
-        name: CACHE_CONFIG_FIELDS.cache_ttl_min,
-        title: 'cache_ttl_min_override',
-        description: 'cache_ttl_min_override_desc',
-        placeholder: 'enter_cache_ttl_min_override',
-    },
-    {
-        name: CACHE_CONFIG_FIELDS.cache_ttl_max,
-        title: 'cache_ttl_max_override',
-        description: 'cache_ttl_max_override_desc',
-        placeholder: 'enter_cache_ttl_max_override',
-    },
-];
+const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR);
+
+const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{
+    name: 'cache_size',
+    title: 'cache_size',
+    description: 'cache_size_desc',
+    placeholder: 'enter_cache_size',
+    validate: validateRequiredValue,
+},
+{
+    name: 'cache_ttl_min',
+    title: 'cache_ttl_min_override',
+    description: 'cache_ttl_min_override_desc',
+    placeholder: 'enter_cache_ttl_min_override',
+    max: SECONDS_IN_HOUR,
+    validate: validateMaxValue3600,
+},
+{
+    name: 'cache_ttl_max',
+    title: 'cache_ttl_max_override',
+    description: 'cache_ttl_max_override_desc',
+    placeholder: 'enter_cache_ttl_max_override',
+}];

 const Form = ({
    handleSubmit, submitting, invalid,
@@ -40,34 +43,38 @@ const Form = ({

    const minExceedsMax = cache_ttl_min > cache_ttl_max;

+    const INPUTS_FIELDS = getInputFields({
+        validateRequiredValue,
+        validateMaxValue3600,
+    });
+
    return <form onSubmit={handleSubmit}>
        <div className="row">
            {INPUTS_FIELDS.map(({
-                name, title, description, placeholder, validate, min = 0, max = UINT32_RANGE.MAX,
+                name, title, description, placeholder, validate, 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}
-                                    className="form-control"
-                                    validate={validate}
-                                    normalizeOnBlur={replaceZeroWithEmptyString}
-                                    normalize={toNumber}
-                                    min={min}
-                                    max={max}
-                            />
-                        </div>
+                <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={[validateBiggerOrEqualZeroValue].concat(validate || [])}
+                            min={0}
+                            max={max}
+                        />
                    </div>
-                </div>)}
+                </div>
+            </div>)}
            {minExceedsMax
-            && <span className="text-danger pl-3 pb-3">{t('ttl_cache_validation')}</span>}
+            && <span className="text-danger pl-3 pb-3">{t('min_exceeds_max_value')}</span>}
        </div>
        <button
            type="submit"
--- a/client/src/components/Settings/Dns/Cache/index.js
+++ b/client/src/components/Settings/Dns/Cache/index.js
@@ -4,7 +4,7 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import Card from '../../../ui/Card';
 import Form from './Form';
 import { setDnsConfig } from '../../../../actions/dnsConfig';
-import { replaceEmptyStringsWithZeroes, replaceZeroWithEmptyString } from '../../../../helpers/helpers';
+import { selectCompletedFields } from '../../../../helpers/helpers';

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

    const handleFormSubmit = (values) => {
-        const completedFields = replaceEmptyStringsWithZeroes(values);
+        const completedFields = selectCompletedFields(values);
        dispatch(setDnsConfig(completedFields));
    };

@@ -28,9 +28,9 @@ const CacheConfig = () => {
            <div className="form">
                <Form
                    initialValues={{
-                        cache_size: replaceZeroWithEmptyString(cache_size),
-                        cache_ttl_max: replaceZeroWithEmptyString(cache_ttl_max),
-                        cache_ttl_min: replaceZeroWithEmptyString(cache_ttl_min),
+                        cache_size,
+                        cache_ttl_max,
+                        cache_ttl_min,
                    }}
                    onSubmit={handleFormSubmit}
                />
--- a/client/src/components/Settings/Dns/Config/Form.js
+++ b/client/src/components/Settings/Dns/Config/Form.js
@@ -6,15 +6,16 @@ import { Trans, useTranslation } from 'react-i18next';
 import {
    renderInputField,
    renderRadioField,
-    CheckboxField,
+    renderSelectField,
    toNumber,
 } from '../../../../helpers/form';
 import {
+    validateBiggerOrEqualZeroValue,
    validateIpv4,
    validateIpv6,
    validateRequiredValue,
 } from '../../../../helpers/validators';
-import { BLOCKING_MODES, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
+import { BLOCKING_MODES, FORM_NAME } from '../../../../helpers/constants';

 const checkboxes = [
    {
@@ -86,9 +87,7 @@ const Form = ({
                        className="form-control"
                        placeholder={t('form_enter_rate_limit')}
                        normalize={toNumber}
-                        validate={validateRequiredValue}
-                        min={UINT32_RANGE.MIN}
-                        max={UINT32_RANGE.MAX}
+                        validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]}
                    />
                </div>
            </div>
@@ -97,7 +96,7 @@ const Form = ({
                    <Field
                        name={name}
                        type="checkbox"
-                        component={CheckboxField}
+                        component={renderSelectField}
                        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,10 +1,25 @@
 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>
@@ -48,27 +63,6 @@ const Examples = (props) => (
                    </Trans>
                </span>
            </li>
-            <li>
-                <code>quic://dns-unfiltered.adguard.com:784</code> –&nbsp;
-                <span>
-                    <Trans
-                        components={[
-                            <a
-                                href="https://tools.ietf.org/html/draft-huitema-quic-dnsoquic-07"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                key="0"
-                            >
-                                DNS-over-QUIC
-                            </a>,
-                        ]}
-                    >
-                        example_upstream_doq
-                    </Trans>
-                    &nbsp;
-                    <span className="text-lowercase">(<Trans>experimental</Trans>)</span>
-                </span>
-            </li>
            <li>
                <code>tcp://9.9.9.9</code> – <Trans>example_upstream_tcp</Trans>
            </li>
@@ -126,12 +120,6 @@ 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,177 +1,94 @@
-import React, { useRef } from 'react';
+import React 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,
-    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';
+import { DNS_REQUEST_OPTIONS, FORM_NAME } from '../../../../helpers/constants';
+import { testUpstream } from '../../../../actions';
+import { removeEmptyLines } from '../../../../helpers/helpers';

-const UPSTREAM_DNS_NAME = 'upstream_dns';
-const UPSTREAM_MODE_NAME = 'upstream_mode';
-
-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 <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>;
-};
-
-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 = [
-    {
-        name: UPSTREAM_DNS_NAME,
-        type: 'text',
-        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,
-    },
-    {
-        name: UPSTREAM_MODE_NAME,
-        type: 'radio',
-        value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
-        component: renderRadioField,
-        subtitle: 'load_balancing_desc',
-        placeholder: 'load_balancing',
-    },
-    {
-        name: UPSTREAM_MODE_NAME,
-        type: 'radio',
-        value: DNS_REQUEST_OPTIONS.PARALLEL,
-        component: renderRadioField,
-        subtitle: 'upstream_parallel',
-        placeholder: 'parallel_requests',
-    },
-    {
-        name: UPSTREAM_MODE_NAME,
-        type: 'radio',
-        value: DNS_REQUEST_OPTIONS.FASTEST_ADDR,
-        component: renderRadioField,
-        subtitle: 'fastest_addr_desc',
-        placeholder: 'fastest_addr',
-    },
-];
+const getInputFields = () => [{
+    // eslint-disable-next-line react/display-name
+    getTitle: () => <label className="form__label" htmlFor="upstream_dns">
+        <Trans>upstream_dns</Trans>
+    </label>,
+    name: 'upstream_dns',
+    type: 'text',
+    component: renderTextareaField,
+    className: 'form-control form-control--textarea font-monospace',
+    placeholder: 'upstream_dns',
+    normalizeOnBlur: removeEmptyLines,
+},
+{
+    name: 'upstream_mode',
+    type: 'radio',
+    value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
+    component: renderRadioField,
+    subtitle: 'load_balancing_desc',
+    placeholder: 'load_balancing',
+},
+{
+    name: 'upstream_mode',
+    type: 'radio',
+    value: DNS_REQUEST_OPTIONS.PARALLEL,
+    component: renderRadioField,
+    subtitle: 'upstream_parallel',
+    placeholder: 'parallel_requests',
+},
+{
+    name: 'upstream_mode',
+    type: 'radio',
+    value: DNS_REQUEST_OPTIONS.FASTEST_ADDR,
+    component: renderRadioField,
+    subtitle: 'fastest_addr_desc',
+    placeholder: 'fastest_addr',
+}];

 const Form = ({
-    submitting, invalid, handleSubmit,
+    submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
 }) => {
    const dispatch = useDispatch();
    const { t } = useTranslation();
    const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
-    const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
-    const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);
+    const bootstrap_dns = useSelector(
+        (store) => store.form[FORM_NAME.UPSTREAM].values.bootstrap_dns,
+    );

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

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

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

-    return <form onSubmit={handleSubmit} className="form--upstream">
+    return <form onSubmit={handleSubmit}>
        <div className="row">
-            <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)}
+            {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>)}
            <div className="col-12">
                <Examples />
                <hr />
@@ -229,6 +146,8 @@ Form.propTypes = {
    initialValues: PropTypes.object,
    upstream_dns: PropTypes.string,
    bootstrap_dns: PropTypes.string,
+    processingTestUpstream: PropTypes.bool,
+    processingSetConfig: PropTypes.bool,
 };

 export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form);
--- a/client/src/components/Settings/Dns/Upstream/index.js
+++ b/client/src/components/Settings/Dns/Upstream/index.js
@@ -12,41 +12,31 @@ const Upstream = () => {
        upstream_dns,
        bootstrap_dns,
        upstream_mode,
+        processingSetConfig,
    } = useSelector((state) => state.dnsConfig, shallowEqual);

-    const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
+    const { processingTestUpstream } = useSelector((state) => state.settings, shallowEqual);

    const handleSubmit = (values) => {
-        const {
-            bootstrap_dns,
-            upstream_dns,
-            upstream_mode,
-        } = values;
-
-        const dnsConfig = {
-            bootstrap_dns,
-            upstream_mode,
-            ...(upstream_dns_file ? null : { upstream_dns }),
-        };
-
-        dispatch(setDnsConfig(dnsConfig));
+        dispatch(setDnsConfig(values));
    };

-    const upstreamDns = upstream_dns_file ? t('upstream_dns_configured_in_file', { path: upstream_dns_file }) : upstream_dns;
-
    return <Card
        title={t('upstream_dns')}
+        subtitle={t('upstream_dns_hint')}
        bodyType="card-body box-body--settings"
    >
        <div className="row">
            <div className="col">
                <Form
                    initialValues={{
-                        upstream_dns: upstreamDns,
+                        upstream_dns,
                        bootstrap_dns,
                        upstream_mode,
                    }}
                    onSubmit={handleSubmit}
+                    processingTestUpstream={processingTestUpstream}
+                    processingSetConfig={processingSetConfig}
                />
            </div>
        </div>
--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -7,19 +7,15 @@ import flow from 'lodash/flow';

 import {
    renderInputField,
-    CheckboxField,
+    renderSelectField,
    renderRadioField,
    toNumber,
 } from '../../../helpers/form';
-import {
-    validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
-} from '../../../helpers/validators';
+import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators';
 import i18n from '../../../i18n';
 import KeyStatus from './KeyStatus';
 import CertificateStatus from './CertificateStatus';
-import {
-    DNS_OVER_QUIC_PORT, DNS_OVER_TLS_PORT, FORM_NAME, STANDARD_HTTPS_PORT,
-} from '../../../helpers/constants';
+import { FORM_NAME } from '../../../helpers/constants';

 const validate = (values) => {
    const errors = {};
@@ -40,9 +36,8 @@ const clearFields = (change, setTlsConfig, t) => {
        certificate_chain: '',
        private_key_path: '',
        certificate_path: '',
-        port_https: STANDARD_HTTPS_PORT,
-        port_dns_over_tls: DNS_OVER_TLS_PORT,
-        port_dns_over_quic: DNS_OVER_QUIC_PORT,
+        port_https: 443,
+        port_dns_over_tls: 853,
        server_name: '',
        force_https: false,
        enabled: false,
@@ -101,7 +96,7 @@ let Form = (props) => {
                        <Field
                            name="enabled"
                            type="checkbox"
-                            component={CheckboxField}
+                            component={renderSelectField}
                            placeholder={t('encryption_enable')}
                            onChange={handleChange}
                        />
@@ -138,7 +133,7 @@ let Form = (props) => {
                        <Field
                            name="force_https"
                            type="checkbox"
-                            component={CheckboxField}
+                            component={renderSelectField}
                            placeholder={t('encryption_redirect')}
                            onChange={handleChange}
                            disabled={!isEnabled}
@@ -194,30 +189,6 @@ let Form = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="col-lg-6">
-                    <div className="form__group form__group--settings">
-                        <label className="form__label" htmlFor="port_dns_over_quic">
-                            <Trans>encryption_doq</Trans>
-                            &nbsp;
-                            <span className="text-lowercase">(<Trans>experimental</Trans>)</span>
-                        </label>
-                        <Field
-                                id="port_dns_over_quic"
-                                name="port_dns_over_quic"
-                                component={renderInputField}
-                                type="number"
-                                className="form-control"
-                                placeholder={t('encryption_doq')}
-                                validate={[validatePortQuic]}
-                                normalize={toNumber}
-                                onChange={handleChange}
-                                disabled={!isEnabled}
-                        />
-                        <div className="form__desc">
-                            <Trans>encryption_doq_desc</Trans>
-                        </div>
-                    </div>
-                </div>
            </div>
            <div className="row">
                <div className="col-12">
--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -66,7 +66,6 @@ class Encryption extends Component {
            force_https,
            port_https,
            port_dns_over_tls,
-            port_dns_over_quic,
            certificate_chain,
            private_key,
            certificate_path,
@@ -79,7 +78,6 @@ class Encryption extends Component {
            force_https,
            port_https,
            port_dns_over_tls,
-            port_dns_over_quic,
            certificate_chain,
            private_key,
            certificate_path,
--- a/Show More
+++ b/Show More