all: fix release script

all: prepare chlog
all: imp chlog
2021-12-29 19:20:26 +03:00 · 2021-12-29 16:22:14 +03:00 · 2021-12-29 16:16:40 +03:00 · 2021-12-29 16:09:01 +03:00 · 2021-12-29 16:03:34 +03:00 · 2021-12-29 16:03:23 +03:00
262 changed files with 13811 additions and 9051 deletions
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -5,6 +5,7 @@
 # Issues with these labels will never be considered stale.
 'exemptLabels':
 - 'bug'
+- 'documentation'
 - 'enhancement'
 - 'feature request'
 - 'localization'
--- a/.twosky.json
+++ b/.twosky.json
@@ -12,6 +12,7 @@
      "en": "English",
      "es": "Español",
      "fa": "فارسی",
+      "fi": "Suomi",
      "fr": "Français",
      "hr": "Hrvatski",
      "hu": "Magyar",
@@ -19,7 +20,7 @@
      "it": "Italiano",
      "ja": "日本語",
      "ko": "한국어",
-      "nl": "Dutch",
+      "nl": "Nederlands",
      "no": "Norsk",
      "pl": "Polski",
      "pt-br": "Português (BR)",
@@ -33,6 +34,7 @@
      "sv": "Svenska",
      "th": "ภาษาไทย",
      "tr": "Türkçe",
+      "uk": "Українська",
      "vi": "Tiếng Việt",
      "zh-cn": "简体中文",
      "zh-hk": "繁體中文（香港）",
--- a/AGHTechDoc.md
+++ b/AGHTechDoc.md
@@ -232,7 +232,7 @@ Deactivate DNSStubListener and update DNS server address.  Create a new file: `/
 	DNS=127.0.0.1
 	DNSStubListener=no

-Specifying "127.0.0.1" as DNS server address is necessry because otherwise the nameserver will be "127.0.0.53" which doesn't work without DNSStubListener.
+Specifying "127.0.0.1" as DNS server address is necessary because otherwise the nameserver will be "127.0.0.53" which doesn't work without DNSStubListener.

 Activate another resolv.conf file:

@@ -421,7 +421,8 @@ Enable DHCP server algorithm:

 DHCP leases are used in several ways by DNS module.

-* For "A" DNS reqeust we reply with an IP address leased by our DHCP server.
+* For "A" DNS request we reply with an IP address leased by our DHCP server.
+

 		< A bills-notebook.lan.
 		> A bills-notebook.lan. = 192.168.1.100
@@ -564,7 +565,7 @@ Request:
 		"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_end":"192.169.56.200", // Note: first 3 octets must match "range_start"
 		"lease_duration":60,
 	},
 	"v6":{
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,73 @@ and this project adheres to
 ## [Unreleased]

 <!--
-## [v0.107.0] - 2021-08-03 (APPROX.)
+## [v0.108.0] - 2021-06-01 (APPROX.)
 -->

 ### Added

+- `windows/arm64` support ([#3057]).
+
+### Deprecated
+
+<!--
+    TODO(a.garipov): Remove this deprecation, if v0.108.0 is released before
+    the Go 1.18 release.
+-->
+- Go 1.17 support.  v0.109.0 will require at least Go 1.18 to build.
+
+### Removed
+
+- Go 1.16 support.
+
+[#3057]: https://github.com/AdguardTeam/AdGuardHome/issues/3057
+
+
+
+<!--
+## [v0.107.2] - 2021-01-19 (APPROX.)
+-->
+
+
+
+## [v0.107.1] - 2021-12-29
+
+### Changed
+
+- The validation error message for duplicated allow- and blocklists in DNS
+  settings now shows the duplicated elements ([#3975]).
+
+### Fixed
+
+- `ipset` initialization bugs ([#4027]).
+- Legacy DNS rewrites from a wildcard pattern to a subdomain ([#4016]).
+- Service not being stopped before running the `uninstall` service action
+  ([#3868]).
+- Broken `reload` service action on FreeBSD.
+- Legacy DNS rewrites responding from upstream when a request other than `A` or
+  `AAAA` is received ([#4008]).
+- Panic on port availability check during installation ([#3987]).
+- Incorrect application of rules from the OS's hosts files ([#3998]).
+
+[#3868]: https://github.com/AdguardTeam/AdGuardHome/issues/3868
+[#3975]: https://github.com/AdguardTeam/AdGuardHome/issues/3975
+[#3987]: https://github.com/AdguardTeam/AdGuardHome/issues/3987
+[#3998]: https://github.com/AdguardTeam/AdGuardHome/issues/3998
+[#4008]: https://github.com/AdguardTeam/AdGuardHome/issues/4008
+[#4016]: https://github.com/AdguardTeam/AdGuardHome/issues/4016
+[#4027]: https://github.com/AdguardTeam/AdGuardHome/issues/4027
+
+
+
+## [v0.107.0] - 2021-12-21
+
+### Added
+
+- Upstream server information for responses from cache ([#3772]).  Note that old
+  log entries concerning cached responses won't include that information.
+- Finnish and Ukrainian translations.
+- Setting the timeout for IP address pinging in the "Fastest IP address" mode
+  through the new `fastest_timeout` field in the configuration file ([#1992]).
 - Static IP address detection on FreeBSD ([#3289]).
 - Optimistic cache ([#2145]).
 - New possible value of `6h` for `querylog_interval` setting ([#2504]).
@@ -27,7 +89,8 @@ and this project adheres to
 - Settable timeouts for querying the upstream servers ([#2280]).
 - Configuration file parameters to change group and user ID on startup on Unix
  ([#2763]).
- Experimental OpenBSD support for AMD64 and 64-bit ARM CPUs ([#2439]).
+- Experimental OpenBSD support for AMD64 and 64-bit ARM CPUs ([#2439], [#3225],
+  [#3226]).
 - Support for custom port in DNS-over-HTTPS profiles for Apple's devices
  ([#3172]).
 - `darwin/arm64` support ([#2443]).
@@ -43,6 +106,25 @@ and this project adheres to

 ### Changed

+- Port bindings are now checked for uniqueness ([#3835]).
+- The DNSSEC check now simply checks against the AD flag in the response
+  ([#3904]).
+- Client objects in the configuration file are now sorted ([#3933]).
+- Responses from cache are now labeled ([#3772]).
+- Better error message for ED25519 private keys, which are not widely supported
+  ([#3737]).
+- Cache now follows RFC more closely for negative answers ([#3707]).
+- `$dnsrewrite` rules and other DNS rewrites will now be applied even when the
+  protection is disabled ([#1558]).
+- DHCP gateway address, subnet mask, IP address range, and leases validations
+  ([#3529]).
+- The `systemd` service script will now create the `/var/log` directory when it
+  doesn't exist ([#3579]).
+- Items in allowed clients, disallowed clients, and blocked hosts lists are now
+  required to be unique ([#3419]).
+- The TLS private key previously saved as a string isn't shown in API responses
+  anymore ([#1898]).
+- Better OpenWrt detection ([#3435]).
 - DNS-over-HTTPS queries that come from HTTP proxies in the `trusted_proxies`
  list now use the real IP address of the client instead of the address of the
  proxy ([#2799]).
@@ -58,12 +140,79 @@ and this project adheres to
  file, together with the new `group` and `user` settings ([#2763]).
 - Permissions on filter files are now `0o644` instead of `0o600` ([#3198]).

+#### Configuration Changes
+
+In this release, the schema version has changed from 10 to 12.
+
+- Parameter `dns.querylog_interval`, which in schema versions 11 and earlier
+  used to be an integer number of days, is now a string with a human-readable
+  duration:
+
+  ```yaml
+  # BEFORE:
+  'dns':
+    # …
+    'querylog_interval': 90
+
+  # AFTER:
+  'dns':
+    # …
+    'querylog_interval': '2160h'
+  ```
+
+  To rollback this change, convert the parameter back into days and change the
+  `schema_version` back to `11`.
+
+- Parameter `rlimit_nofile`, which in schema versions 10 and earlier used to be
+  on the top level, is now moved to the new `os` object:
+
+  ```yaml
+  # BEFORE:
+  'rlimit_nofile': 42
+
+  # AFTER:
+  'os':
+    'group': ''
+    'rlimit_nofile': 42
+    'user': ''
+  ```
+
+  To rollback this change, move the parameter on the top level and change the
+  `schema_version` back to `10`.
+
 ### Deprecated

 - Go 1.16 support.  v0.108.0 will require at least Go 1.17 to build.

 ### Fixed

+- EDNS0 TCP keepalive option handling ([#3778]).
+- Rules with the `$denyallow` modifier applying to IP addresses when they
+  shouldn't ([#3175]).
+- The length of the EDNS0 client subnet option appearing too long for some
+  upstream servers ([#3887]).
+- Invalid redirection to the HTTPS web interface after saving enabled encryption
+  settings ([#3558]).
+- Incomplete propagation of the client's IP anonymization setting to the
+  statistics ([#3890]).
+- Incorrect `$dnsrewrite` results for entries from the operating system's hosts
+  file ([#3815]).
+- Matching against rules with `|` at the end of the domain name ([#3371]).
+- Incorrect assignment of explicitly configured DHCP options ([#3744]).
+- Occasional panic during shutdown ([#3655]).
+- Addition of IPs into only one as opposed to all matching ipsets on Linux
+  ([#3638]).
+- Removal of temporary filter files ([#3567]).
+- Panic when an upstream server responds with an empty question section
+  ([#3551]).
+- 9GAG blocking ([#3564]).
+- DHCP now follows RFCs more closely when it comes to response sending and
+  option selection ([#3443], [#3538]).
+- Occasional panics when reading old statistics databases ([#3506]).
+- `reload` service action on macOS and FreeBSD ([#3457]).
+- Inaccurate using of service actions in the installation script ([#3450]).
+- Client ID checking ([#3437]).
+- Discovering other DHCP servers on `darwin` and `freebsd` ([#3417]).
 - Switching listening address to unspecified one when bound to a single
  specified IPv4 address on Darwin (macOS) ([#2807]).
 - Incomplete HTTP response for static IP address.
@@ -88,7 +237,10 @@ and this project adheres to
 - Go 1.15 support.

 [#1381]: https://github.com/AdguardTeam/AdGuardHome/issues/1381
+[#1558]: https://github.com/AdguardTeam/AdGuardHome/issues/1558
 [#1691]: https://github.com/AdguardTeam/AdGuardHome/issues/1691
+[#1898]: https://github.com/AdguardTeam/AdGuardHome/issues/1898
+[#1992]: https://github.com/AdguardTeam/AdGuardHome/issues/1992
 [#2141]: https://github.com/AdguardTeam/AdGuardHome/issues/2141
 [#2145]: https://github.com/AdguardTeam/AdGuardHome/issues/2145
 [#2280]: https://github.com/AdguardTeam/AdGuardHome/issues/2280
@@ -106,19 +258,53 @@ and this project adheres to
 [#3162]: https://github.com/AdguardTeam/AdGuardHome/issues/3162
 [#3166]: https://github.com/AdguardTeam/AdGuardHome/issues/3166
 [#3172]: https://github.com/AdguardTeam/AdGuardHome/issues/3172
+[#3175]: https://github.com/AdguardTeam/AdGuardHome/issues/3175
 [#3184]: https://github.com/AdguardTeam/AdGuardHome/issues/3184
 [#3185]: https://github.com/AdguardTeam/AdGuardHome/issues/3185
 [#3186]: https://github.com/AdguardTeam/AdGuardHome/issues/3186
 [#3194]: https://github.com/AdguardTeam/AdGuardHome/issues/3194
 [#3198]: https://github.com/AdguardTeam/AdGuardHome/issues/3198
 [#3217]: https://github.com/AdguardTeam/AdGuardHome/issues/3217
+[#3225]: https://github.com/AdguardTeam/AdGuardHome/issues/3225
+[#3226]: https://github.com/AdguardTeam/AdGuardHome/issues/3226
 [#3256]: https://github.com/AdguardTeam/AdGuardHome/issues/3256
 [#3257]: https://github.com/AdguardTeam/AdGuardHome/issues/3257
 [#3289]: https://github.com/AdguardTeam/AdGuardHome/issues/3289
 [#3335]: https://github.com/AdguardTeam/AdGuardHome/issues/3335
 [#3343]: https://github.com/AdguardTeam/AdGuardHome/issues/3343
 [#3351]: https://github.com/AdguardTeam/AdGuardHome/issues/3351
+[#3371]: https://github.com/AdguardTeam/AdGuardHome/issues/3371
 [#3372]: https://github.com/AdguardTeam/AdGuardHome/issues/3372
+[#3417]: https://github.com/AdguardTeam/AdGuardHome/issues/3417
+[#3419]: https://github.com/AdguardTeam/AdGuardHome/issues/3419
+[#3435]: https://github.com/AdguardTeam/AdGuardHome/issues/3435
+[#3437]: https://github.com/AdguardTeam/AdGuardHome/issues/3437
+[#3443]: https://github.com/AdguardTeam/AdGuardHome/issues/3443
+[#3450]: https://github.com/AdguardTeam/AdGuardHome/issues/3450
+[#3457]: https://github.com/AdguardTeam/AdGuardHome/issues/3457
+[#3506]: https://github.com/AdguardTeam/AdGuardHome/issues/3506
+[#3529]: https://github.com/AdguardTeam/AdGuardHome/issues/3529
+[#3538]: https://github.com/AdguardTeam/AdGuardHome/issues/3538
+[#3551]: https://github.com/AdguardTeam/AdGuardHome/issues/3551
+[#3558]: https://github.com/AdguardTeam/AdGuardHome/issues/3558
+[#3564]: https://github.com/AdguardTeam/AdGuardHome/issues/3564
+[#3567]: https://github.com/AdguardTeam/AdGuardHome/issues/3567
+[#3568]: https://github.com/AdguardTeam/AdGuardHome/issues/3568
+[#3579]: https://github.com/AdguardTeam/AdGuardHome/issues/3579
+[#3607]: https://github.com/AdguardTeam/AdGuardHome/issues/3607
+[#3638]: https://github.com/AdguardTeam/AdGuardHome/issues/3638
+[#3655]: https://github.com/AdguardTeam/AdGuardHome/issues/3655
+[#3707]: https://github.com/AdguardTeam/AdGuardHome/issues/3707
+[#3737]: https://github.com/AdguardTeam/AdGuardHome/issues/3737
+[#3744]: https://github.com/AdguardTeam/AdGuardHome/issues/3744
+[#3772]: https://github.com/AdguardTeam/AdGuardHome/issues/3772
+[#3778]: https://github.com/AdguardTeam/AdGuardHome/issues/3778
+[#3815]: https://github.com/AdguardTeam/AdGuardHome/issues/3815
+[#3835]: https://github.com/AdguardTeam/AdGuardHome/issues/3835
+[#3887]: https://github.com/AdguardTeam/AdGuardHome/issues/3887
+[#3890]: https://github.com/AdguardTeam/AdGuardHome/issues/3890
+[#3904]: https://github.com/AdguardTeam/AdGuardHome/issues/3904
+[#3933]: https://github.com/AdguardTeam/AdGuardHome/pull/3933



@@ -322,7 +508,7 @@ and this project adheres to
 - The field `"range_start"` in the `GET /control/dhcp/status` HTTP API response
  is now correctly named again ([#2678]).
 - DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` settings aren't reset to
-  `false` on update any more ([#2653]).
+  `false` on update anymore ([#2653]).
 - The `Vary` header is now added along with `Access-Control-Allow-Origin` to
  prevent cache-related and other issues in browsers ([#2658]).
 - The request body size limit is now set for HTTPS requests as well.
@@ -482,11 +668,13 @@ and this project adheres to


 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.0...HEAD
-[v0.107.0]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.3...v0.107.0
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.2...HEAD
+[v0.107.2]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.1...v0.107.2
 -->

-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.3...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.1...HEAD
+[v0.107.1]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.0...v0.107.1
+[v0.107.0]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.3...v0.107.0
 [v0.106.3]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.2...v0.106.3
 [v0.106.2]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.1...v0.106.2
 [v0.106.1]:   https://github.com/AdguardTeam/AdGuardHome/compare/v0.106.0...v0.106.1
--- a/README.md
+++ b/README.md
@@ -280,29 +280,29 @@ Edge:
 curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c edge
 ```

-* Beta channel builds
-    * Linux: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_386.tar.gz)
-    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi), [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz)
-    * Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64le_softfloat.tar.gz)
-    * Windows: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_386.zip)
-    * macOS: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_386.zip)
-    * macOS ARM: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_arm64.zip)
-    * FreeBSD: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_386.tar.gz)
-    * FreeBSD ARM: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv5.tar.gz), [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv6.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv7.tar.gz)
-    * OpenBSD: (coming soon)
-    * OpenBSD ARM: (coming soon)
+ *  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)
+     *  Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi OS stable), [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz)
+     *  Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips64le_softfloat.tar.gz)
+     *  Windows: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_windows_386.zip)
+     *  macOS: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_386.zip)
+     *  macOS ARM: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_darwin_arm64.zip)
+     *  FreeBSD: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_386.tar.gz)
+     *  FreeBSD ARM: [64-bit](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv5.tar.gz), [32-bit ARMv6](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv6.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_armv7.tar.gz)
+     *  OpenBSD: (coming soon)
+     *  OpenBSD ARM: (coming soon)

-* Edge channel builds
-    * Linux: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_386.tar.gz)
-    * Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi), [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv7.tar.gz)
-    * Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64le_softfloat.tar.gz)
-    * Windows: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_386.zip)
-    * macOS: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_386.zip)
-    * macOS ARM: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_arm64.zip)
-    * FreeBSD: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_386.tar.gz)
-    * FreeBSD ARM: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_armv5.tar.gz), [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_armv6.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_armv7.tar.gz)
-    * OpenBSD: [64-bit (experimental)](https://static.adguard.com/adguardhome/edge/AdGuardHome_openbsd_amd64.tar.gz)
-    * OpenBSD ARM: [64-bit (experimental)](https://static.adguard.com/adguardhome/edge/AdGuardHome_openbsd_arm64.tar.gz)
+ *  Edge channel builds
+     *  Linux: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_386.tar.gz)
+     *  Linux ARM: [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv6.tar.gz) (recommended for Raspberry Pi OS stable), [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv5.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_armv7.tar.gz)
+     *  Linux MIPS: [32-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips_softfloat.tar.gz), [32-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mipsle_softfloat.tar.gz), [64-bit MIPS](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64_softfloat.tar.gz), [64-bit MIPSLE](https://static.adguard.com/adguardhome/edge/AdGuardHome_linux_mips64le_softfloat.tar.gz)
+     *  Windows: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_windows_386.zip)
+     *  macOS: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_amd64.zip), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_386.zip)
+     *  macOS ARM: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_darwin_arm64.zip)
+     *  FreeBSD: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_amd64.tar.gz), [32-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_386.tar.gz)
+     *  FreeBSD ARM: [64-bit](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_arm64.tar.gz), [32-bit ARMv5](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_armv5.tar.gz), [32-bit ARMv6](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_armv6.tar.gz), [32-bit ARMv7](https://static.adguard.com/adguardhome/edge/AdGuardHome_freebsd_armv7.tar.gz)
+     *  OpenBSD: [64-bit (experimental)](https://static.adguard.com/adguardhome/edge/AdGuardHome_openbsd_amd64.tar.gz)
+     *  OpenBSD ARM: [64-bit (experimental)](https://static.adguard.com/adguardhome/edge/AdGuardHome_openbsd_arm64.tar.gz)


 <a id="reporting-issues"></a>
@@ -322,10 +322,18 @@ Here is a link to AdGuard Home project: https://crowdin.com/project/adguard-appl

 Here's what you can also do to contribute:

-1. [Look for issues](https://github.com/AdguardTeam/AdGuardHome/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22+) marked as "help wanted".
-2. Actualize the list of *Blocked services*. It can be found in [filtering/blocked.go](https://github.com/AdguardTeam/AdGuardHome/blob/master/internal/filtering/blocked.go).
-3. Actualize the list of known *trackers*. It it can be found in [client/src/helpers/trackers/adguard.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/trackers/adguard.json).
-4. Actualize the list of vetted *blocklists*. It it can be found in [client/src/helpers/filters/filters.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/filters/filters.json).
+1. [Look for issues][helpissues] marked as "help wanted".
+2. Actualize the list of *Blocked services*. It can be found in
+   [filtering/blocked.go][blocked.go].
+3. Actualize the list of known *trackers*. It it can be found in [this repo]
+   [companiesdb].
+4. Actualize the list of vetted *blocklists*. It it can be found in
+   [client/src/helpers/filters/filters.json][filters.json].
+
+[helpissues]: https://github.com/AdguardTeam/AdGuardHome/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22+
+[blocked.go]: https://github.com/AdguardTeam/AdGuardHome/blob/master/internal/filtering/blocked.go
+[companiesdb]: https://github.com/AdguardTeam/companiesdb
+[filters.json]: https://github.com/AdguardTeam/AdGuardHome/blob/master/client/src/helpers/filters/filters.json

 <a id="uses"></a>
 ## Projects that use AdGuard Home
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
  'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:3.3'
+  'dockerGo': 'adguard/golang-ubuntu:3.8'

 'stages':
 - 'Make release':
@@ -266,14 +266,19 @@
    # need to build a few of these.
    'variables':
      'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:3.3'
+      'dockerGo': 'adguard/golang-ubuntu:3.8'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
+    # Disable integration branches for release branches.
+    'branch-config':
+      'integration':
+        'push-on-success': false
+        'merge-from': 'beta-v0.107'
    # Build final releases on release branches manually.
    'triggers': []
    # Set the default release channel on the final branch to release, as these
    # are the ones that actually get released.
    'variables':
      'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:3.3'
+      'dockerGo': 'adguard/golang-ubuntu:3.8'
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
  'key': 'AHBRTSPECS'
  'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:3.3'
+  'dockerGo': 'adguard/golang-ubuntu:3.8'

 'stages':
 - 'Tests':
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -70,15 +70,6 @@
            "ms": "^2.1.1"
          }
        },
-        "json5": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-          "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
        "ms": {
          "version": "2.1.2",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -1188,16 +1179,6 @@
        "regenerator-runtime": "^0.13.4"
      }
    },
-    "@babel/runtime-corejs3": {
-      "version": "7.9.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz",
-      "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==",
-      "dev": true,
-      "requires": {
-        "core-js-pure": "^3.0.0",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
    "@babel/template": {
      "version": "7.8.6",
      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
@@ -1909,11 +1890,6 @@
          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
          "dev": true
        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        },
        "micromatch": {
          "version": "4.0.2",
          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -2875,13 +2851,15 @@
      "dev": true
    },
    "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
+      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
      "dev": true,
      "requires": {
+        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
+        "es-abstract": "^1.18.0-next.2",
+        "get-intrinsic": "^1.1.1",
        "is-string": "^1.0.5"
      }
    },
@@ -2907,13 +2885,26 @@
      "dev": true
    },
    "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
      "dev": true,
      "requires": {
+        "call-bind": "^1.0.0",
        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.1"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
+      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1",
+        "function-bind": "^1.1.1"
      }
    },
    "arrify": {
@@ -3197,11 +3188,6 @@
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true
        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        },
        "supports-color": {
          "version": "7.1.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -3863,6 +3849,15 @@
        "unset-value": "^1.0.0"
      }
    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
    "caller-callsite": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -4325,12 +4320,6 @@
      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
      "dev": true
    },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true
-    },
    "content-disposition": {
      "version": "0.5.3",
      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -4550,12 +4539,6 @@
        }
      }
    },
-    "core-js-pure": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-      "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==",
-      "dev": true
-    },
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -5421,21 +5404,27 @@
      }
    },
    "es-abstract": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+      "version": "1.18.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
+      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
      "requires": {
+        "call-bind": "^1.0.2",
        "es-to-primitive": "^1.2.1",
        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.11.0",
        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
      }
    },
    "es-to-primitive": {
@@ -5658,22 +5647,38 @@
      }
    },
    "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
      "dev": true,
      "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
      },
      "dependencies": {
        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
          "dev": true,
          "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
          }
        }
      }
@@ -5741,15 +5746,6 @@
            "path-exists": "^4.0.0"
          }
        },
-        "json5": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-          "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
        "loader-utils": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
@@ -5837,44 +5833,53 @@
      }
    },
    "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz",
+      "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==",
      "dev": true,
      "requires": {
-        "debug": "^2.6.9",
+        "debug": "^3.2.7",
        "pkg-dir": "^2.0.0"
      },
      "dependencies": {
        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
          "dev": true,
          "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
        }
      }
    },
    "eslint-plugin-import": {
-      "version": "2.20.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz",
-      "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==",
+      "version": "2.24.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz",
+      "integrity": "sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ==",
      "dev": true,
      "requires": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "contains-path": "^0.1.0",
+        "array-includes": "^3.1.3",
+        "array.prototype.flat": "^1.2.4",
        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.1",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.6.2",
+        "find-up": "^2.0.0",
        "has": "^1.0.3",
+        "is-core-module": "^2.6.0",
        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.12.0"
+        "object.values": "^1.1.4",
+        "pkg-up": "^2.0.0",
+        "read-pkg-up": "^3.0.0",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.10.1"
      },
      "dependencies": {
        "debug": {
@@ -5887,20 +5892,23 @@
          }
        },
        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
          "dev": true,
          "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
+            "esutils": "^2.0.2"
          }
        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
        }
      }
    },
@@ -5930,22 +5938,23 @@
      }
    },
    "eslint-plugin-react": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz",
-      "integrity": "sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz",
+      "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==",
      "dev": true,
      "requires": {
-        "array-includes": "^3.1.1",
+        "array-includes": "^3.1.3",
+        "array.prototype.flatmap": "^1.2.4",
        "doctrine": "^2.1.0",
        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.2.3",
-        "object.entries": "^1.1.1",
-        "object.fromentries": "^2.0.2",
-        "object.values": "^1.1.1",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.0.4",
+        "object.entries": "^1.1.4",
+        "object.fromentries": "^2.0.4",
+        "object.values": "^1.1.4",
        "prop-types": "^15.7.2",
-        "resolve": "^1.15.1",
-        "string.prototype.matchall": "^4.0.2",
-        "xregexp": "^4.3.0"
+        "resolve": "^2.0.0-next.3",
+        "string.prototype.matchall": "^4.0.5"
      },
      "dependencies": {
        "doctrine": {
@@ -5957,6 +5966,16 @@
            "esutils": "^2.0.2"
          }
        },
+        "jsx-ast-utils": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
+          "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==",
+          "dev": true,
+          "requires": {
+            "array-includes": "^3.1.2",
+            "object.assign": "^4.1.2"
+          }
+        },
        "prop-types": {
          "version": "15.7.2",
          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
@@ -5967,6 +5986,16 @@
            "object-assign": "^4.1.1",
            "react-is": "^16.8.1"
          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.3",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
+          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
        }
      }
    },
@@ -6883,6 +6912,16 @@
      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
      "dev": true
    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
    "get-package-type": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
@@ -7191,15 +7230,28 @@
        "function-bind": "^1.1.1"
      }
    },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
+    },
    "has-flag": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
    },
    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
    },
    "has-value": {
      "version": "1.0.0",
@@ -7824,14 +7876,13 @@
      }
    },
    "internal-slot": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz",
-      "integrity": "sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==",
-      "dev": true,
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
      "requires": {
-        "es-abstract": "^1.17.0-next.1",
+        "get-intrinsic": "^1.1.0",
        "has": "^1.0.3",
-        "side-channel": "^1.0.2"
+        "side-channel": "^1.0.4"
      }
    },
    "interpret": {
@@ -7929,6 +7980,14 @@
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
    "is-binary-path": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -7938,6 +7997,15 @@
        "binary-extensions": "^1.0.0"
      }
    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
    "is-buffer": {
      "version": "1.1.6",
      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -7945,9 +8013,9 @@
      "dev": true
    },
    "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
    },
    "is-ci": {
      "version": "2.0.0",
@@ -7958,6 +8026,15 @@
        "ci-info": "^2.0.0"
      }
    },
+    "is-core-module": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
    "is-data-descriptor": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -8060,6 +8137,11 @@
      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
      "dev": true
    },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
+    },
    "is-number": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -8080,6 +8162,14 @@
        }
      }
    },
+    "is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
    "is-path-cwd": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -8131,11 +8221,12 @@
      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
    },
    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
      "requires": {
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
      }
    },
    "is-regexp": {
@@ -8150,10 +8241,12 @@
      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
    },
    "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
    },
    "is-symbol": {
      "version": "1.0.3",
@@ -10121,9 +10214,9 @@
      "dev": true
    },
    "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
      "dev": true,
      "requires": {
        "minimist": "^1.2.5"
@@ -10237,24 +10330,25 @@
      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
    },
    "load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
      "dev": true,
      "requires": {
        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
        "strip-bom": "^3.0.0"
      },
      "dependencies": {
        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
          "dev": true,
          "requires": {
-            "error-ex": "^1.2.0"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
          }
        }
      }
@@ -11327,9 +11421,9 @@
      "dev": true
    },
    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
    },
    "object-is": {
      "version": "1.1.2",
@@ -11355,37 +11449,36 @@
      }
    },
    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
      }
    },
    "object.entries": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz",
-      "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz",
+      "integrity": "sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==",
      "dev": true,
      "requires": {
+        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
+        "es-abstract": "^1.18.2"
      }
    },
    "object.fromentries": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
+      "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
      "dev": true,
      "requires": {
+        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
+        "es-abstract": "^1.18.0-next.2",
        "has": "^1.0.3"
      }
    },
@@ -11409,15 +11502,14 @@
      }
    },
    "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
      "dev": true,
      "requires": {
+        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
+        "es-abstract": "^1.18.2"
      }
    },
    "obuf": {
@@ -11791,9 +11883,9 @@
      "dev": true
    },
    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
      "dev": true
    },
    "pinkie": {
@@ -12718,35 +12810,35 @@
      }
    },
    "read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
      "dev": true,
      "requires": {
-        "load-json-file": "^2.0.0",
+        "load-json-file": "^4.0.0",
        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
+        "path-type": "^3.0.0"
      },
      "dependencies": {
        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
          "dev": true,
          "requires": {
-            "pify": "^2.0.0"
+            "pify": "^3.0.0"
          }
        }
      }
    },
    "read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
      "dev": true,
      "requires": {
        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
+        "read-pkg": "^3.0.0"
      }
    },
    "readable-stream": {
@@ -12894,12 +12986,12 @@
      }
    },
    "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
      }
    },
    "regexpp": {
@@ -13572,13 +13664,13 @@
      "optional": true
    },
    "side-channel": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz",
-      "integrity": "sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==",
-      "dev": true,
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
      "requires": {
-        "es-abstract": "^1.17.0-next.1",
-        "object-inspect": "^1.7.0"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
      }
    },
    "signal-exit": {
@@ -14101,6 +14193,15 @@
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
    "string-length": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
@@ -14163,64 +14264,37 @@
      }
    },
    "string.prototype.matchall": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz",
-      "integrity": "sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz",
+      "integrity": "sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==",
      "dev": true,
      "requires": {
+        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "has-symbols": "^1.0.1",
-        "internal-slot": "^1.0.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.2"
+        "es-abstract": "^1.18.2",
+        "get-intrinsic": "^1.1.1",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.3.1",
+        "side-channel": "^1.0.4"
      }
    },
    "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimstart": "^1.0.0"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimend": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
      }
    },
    "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
      }
    },
    "stringify-entities": {
@@ -15111,6 +15185,17 @@
      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
      "dev": true
    },
+    "tsconfig-paths": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
+      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
+      "dev": true,
+      "requires": {
+        "json5": "^2.2.0",
+        "minimist": "^1.2.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
    "tslib": {
      "version": "1.13.0",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
@@ -15194,6 +15279,17 @@
      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz",
      "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="
    },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
    "unherit": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
@@ -16247,6 +16343,18 @@
        "isexe": "^2.0.0"
      }
    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
    "which-module": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -16361,15 +16469,6 @@
      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
      "dev": true
    },
-    "xregexp": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz",
-      "integrity": "sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime-corejs3": "^7.8.3"
-      }
-    },
    "xtend": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
--- a/client/package.json
+++ b/client/package.json
@@ -64,9 +64,9 @@
        "eslint-config-airbnb": "^18.1.0",
        "eslint-import-resolver-webpack": "^0.12.1",
        "eslint-loader": "^4.0.2",
-        "eslint-plugin-import": "^2.20.2",
+        "eslint-plugin-import": "^2.22.1",
        "eslint-plugin-jsx-a11y": "^6.2.3",
-        "eslint-plugin-react": "^7.20.0",
+        "eslint-plugin-react": "^7.24.0",
        "eslint-plugin-react-hooks": "^2.5.0",
        "file-loader": "6.0.0",
        "html-webpack-plugin": "^4.3.0",
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -37,6 +37,9 @@
    "dhcp_ipv6_settings": "Налады DHCP IPv6",
    "form_error_required": "Абавязковае поле",
    "form_error_ip4_format": "Няслушны фармат IPv4",
+    "form_error_ip4_range_start_format": "Няслушны IPv4-адрас пачатку дыяпазону",
+    "form_error_ip4_range_end_format": "Няслушны IPv4-адрас канца дыяпазону",
+    "form_error_ip4_gateway_format": "Няслушны IPv4-адрас шлюза",
    "form_error_ip6_format": "Няслушны фармат IPv6",
    "form_error_ip_format": "Няслушны фармат IP-адраса",
    "form_error_mac_format": "Некарэктны фармат MAC",
@@ -44,8 +47,12 @@
    "form_error_server_name": "Няслушнае імя сервера",
    "form_error_subnet": "Падсетка «{{cidr}}» не ўтрымвае IP-адраса «{{ip}}»",
    "form_error_positive": "Павінна быць больш 0",
-    "form_error_negative": "Павінна быць не менш 0",
-    "range_end_error": "Павінен перавышаць пачатак дыяпазону",
+    "out_of_range_error": "Павінна быць па-за дыяпазонам «{{start}}»-«{{end}}»",
+    "lower_range_start_error": "Павінна быць менш за пачатак дыяпазону",
+    "greater_range_start_error": "Павінна быць больш за пачатак дыяпазону",
+    "greater_range_end_error": "Павінна быць больш за канец дыяпазону",
+    "subnet_error": "Адрасы павінны быць усярэдзіне адной падсеткі",
+    "gateway_or_subnet_invalid": "Некарэктная маска падсеткі",
    "dhcp_form_gateway_input": "IP-адрас шлюза",
    "dhcp_form_subnet_input": "Маска падсеціва",
    "dhcp_form_range_title": "Дыяпазон IP-адрасоў",
@@ -112,6 +119,8 @@
    "for_last_24_hours": "за 24 гадзіны",
    "for_last_days": "за апошні {{count}} дзень",
    "for_last_days_plural": "за апошнія {{count}} дзён",
+    "stats_disabled": "Статыстыка была адключаная. Вы можаце ўключыць яго <0>на старонцы налад </0>.",
+    "stats_disabled_short": "Статыстыка была адключаная",
    "no_domains_found": "Дамены не знойдзены",
    "requests_count": "Колькасць запытаў",
    "top_blocked_domains": "Часта блакаваныя дамены",
@@ -326,7 +335,7 @@
    "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_5": "Знайдзіце ў спісе пункт \"IP версіі 4 (TCP/IPv4)\", вылучыце яго і потым ізноў націсніце \"Уласцівасці\".",
    "install_devices_windows_list_6": "Абярыце \"Выкарыстаць наступныя адрасы DNS-сервераў\" і ўвядзіце адрас AdGuard Home.",
    "install_devices_macos_list_1": "Клікніце па абразку Apple і перайдзіце ў «Сістэмныя налады».",
    "install_devices_macos_list_2": "Клікніце па іконцы «Сеціва».",
@@ -497,10 +506,11 @@
    "statistics_configuration": "Канфігурацыя статыстыкі",
    "statistics_retention": "Захаванне статыстыкі",
    "statistics_retention_desc": "Калі вы зменшыце значэнне інтэрвалу, некаторыя дадзеныя могуць быць згублены",
-    "statistics_clear": " Ачысціць статыстыку",
+    "statistics_clear": "Ачысціць статыстыку",
    "statistics_clear_confirm": "Вы ўпэўнены, што хочаце ачысціць статыстыку?",
    "statistics_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання статыстыкі? Пры скарачэнні інтэрвалу дадзеныя могуць быць згублены",
    "statistics_cleared": "Статыстыка паспяхова вычышчана",
+    "statistics_enable": "Уключыць статыстыку",
    "interval_hours": "{{count}} гадзіна",
    "interval_hours_plural": "{{count}} гадзін",
    "filters_configuration": "Налада фільтраў",
@@ -595,6 +605,8 @@
    "cache_ttl_min_override_desc": "Перавызначыць TTL-значэнне (мінімальнае), атрыманае з upstream-сервера",
    "cache_ttl_max_override_desc": "Усталюйце максімальнае TTL-значэнне (секунды) для запісаў у кэшы DNS",
    "ttl_cache_validation": "Мінімальнае значэнне TTL кэша павінна быць менш ці роўна максімальнаму значэнню",
+    "cache_optimistic": "Аптымістычнае кэшаванне",
+    "cache_optimistic_desc": "Прымусьце AdGuard Home адказваць з кэша, нават калі тэрмін дзеяння запісаў скончыўся, а таксама паспрабуйце абнавіць іх.",
    "filter_category_general": "Галоўныя",
    "filter_category_security": "Бяспека",
    "filter_category_regional": "Рэгіянальныя",
@@ -608,6 +620,9 @@
    "click_to_view_queries": "Націсніце, каб прагледзець запыты",
    "port_53_faq_link": "Порт 53 часта заняты службамі \"DNSStubListener\" ці \"systemd-resolved\". Азнаёмцеся з <0>інструкцыяй</0> пра тое, як гэта дазволіць.",
    "adg_will_drop_dns_queries": "AdGuard Home скіне ўсе DNS-запыты ад гэтага кліента.",
-    "client_not_in_allowed_clients": "Кліент не дазволены, бо яго няма ў спісе \"Дазволеных кліентаў\".",
-    "experimental": "Эксперыментальны"
+    "filter_allowlist": "УВАГА: Гэта дзеянне таксама выключыць правіла «{{disallowed_rule}}» са спіса дазволеных кліентаў.",
+    "last_rule_in_allowlist": "Няможна заблакаваць гэтага кліента, бо вынятак правіла «{{disallowed_rule}}» АДКЛЮЧЫЦЬ рэжым белага спіса.",
+    "experimental": "Эксперыментальны",
+    "use_saved_key": "Скарыстаць захаваны раней ключ",
+    "parental_control": "Бацькоўскі кантроль"
 }
--- a/client/src/__locales/bg.json
+++ b/client/src/__locales/bg.json
@@ -10,7 +10,7 @@
    "dhcp_leases": "DHCP раздадени адреси",
    "dhcp_leases_not_found": "Няма намерени активни DHCP адреси",
    "form_error_required": "Задължително поле",
-    "form_error_ip_format": "Невалиден IPv4 адрес",
+    "form_error_ip_format": "Невалиден IP адрес",
    "form_error_positive": "Проверете дали е положително число",
    "dhcp_form_gateway_input": "IP шлюз",
    "dhcp_form_subnet_input": "Мрежова маска",
@@ -31,6 +31,7 @@
    "dashboard": "Табло",
    "settings": "Настройки",
    "filters": "Филтри",
+    "filter": "Филтър",
    "query_log": "История на заявките",
    "faq": "ЧЗВ",
    "version": "версия",
@@ -41,6 +42,7 @@
    "copyright": "Авторско право",
    "homepage": "Домашна страница",
    "report_an_issue": "Съобщи за проблем",
+    "privacy_policy": "Правила за поверителност",
    "enable_protection": "Разреши защита",
    "enabled_protection": "Защитата е разрешена",
    "disable_protection": "Забрани защита",
@@ -70,6 +72,7 @@
    "enforce_safe_search": "Включи Безопасно Търсене",
    "no_servers_specified": "Няма избрани услуги",
    "general_settings": "Общи настройки",
+    "custom_filtering_rules": "Местни правила за филтриране",
    "upstream_dns": "Главен DNS сървър",
    "test_upstream_btn": "Тествай главния DNS",
    "apply_btn": "Приложи",
@@ -86,6 +89,7 @@
    "rules_count_table_header": "Правила общо",
    "last_time_updated_table_header": "Последно обновен",
    "actions_table_header": "Действия",
+    "edit_table_action": "Редактирай",
    "delete_table_action": "Изтрий",
    "filters_and_hosts_hint": "AdGuard Home разбира adblock и host синтаксис.",
    "cancel_btn": "Откажи",
@@ -106,7 +110,6 @@
    "example_upstream_doh": "криптиран <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-върху-HTTPS</a>",
    "example_upstream_sdns": "може да ползвате <a href='https://dnscrypt.info/stamps/' target='_blank'>DNS Подписване</a> за <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> или <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-върху-HTTPS</a> сървъри",
    "example_upstream_tcp": "класически DNS (TCP протокол)",
-    "updated_upstream_dns_toast": "Глобалните DNS сървъри са обновени",
    "dns_test_ok_toast": "Въведените DNS сървъри работят коректно",
    "dns_test_not_ok_toast": "Сървър \"{{key}}\": не работи, моля проверете дали е въведен коректно",
    "unblock": "Отблокирай",
@@ -130,6 +133,9 @@
    "updated_custom_filtering_toast": "Обновени местни правила за филтриране",
    "rule_removed_from_custom_filtering_toast": "Премахнато от местни правила за филтриране: {{rule}}",
    "rule_added_to_custom_filtering_toast": "Добавено до местни правила за филтриране: {{rule}}",
+    "default": "По подразбиране",
+    "custom_ip": "Персонализиран IP",
+    "dns_over_quic": "DNS-over-QUIC",
    "plain_dns": "Обикновен DNS",
    "source_label": "Източник",
    "found_in_known_domain_db": "Намерен в списъците с домейни.",
@@ -217,7 +223,27 @@
    "form_error_password": "Паролата не съвпада",
    "reset_settings": "Изтрий всички настройки",
    "update_announcement": "Има нова AdGuard Home {{version}}! <0>Цъкни тук</0> за повече информация.",
-    "disable_ipv6": "Изключете IPv6 протокола",
+    "settings_custom": "Персонализиране",
+    "table_client": "Клиент",
+    "table_name": "Име",
+    "save_btn": "Запази",
+    "name": "Име",
+    "clients_not_found": "Нямa намерени адреси",
+    "check_updates_now": "Провери за актуализации",
+    "domain": "Домейн",
+    "disabled": "Деактивиран",
+    "username_label": "Потребител",
+    "username_placeholder": "Въведете потребител",
+    "password_label": "Парола",
+    "password_placeholder": "Въведете парола",
+    "network": "Мрежа",
+    "descr": "Описание",
    "show_blocked_responses": "Блокирано",
-    "port_53_faq_link": "Порт 53 често е зает от \"DNSStubListener\" или \"systemd-resolved\" услуги. Моля, прочетете <0>тази инструкция</0> как да решите това."
+    "show_whitelisted_responses": "В белия списък",
+    "show_processed_responses": "Обработен",
+    "allowed": "В белия списък",
+    "filter_category_general": "General",
+    "filter_category_security": "Сигурност",
+    "port_53_faq_link": "Порт 53 често е зает от \"DNSStubListener\" или \"systemd-resolved\" услуги. Моля, прочетете <0>тази инструкция</0> как да решите това.",
+    "parental_control": "Родителски контрол"
 }
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Neplatný formát IP",
-    "form_error_mac_format": "Neplatný formát MAC",
-    "form_error_client_id_format": "Neplatný formát ID klienta",
+    "form_error_ip4_format": "Neplatná adresa IPv4",
+    "form_error_ip4_range_start_format": "Neplatná adresa IPv4 na začátku rozsahu",
+    "form_error_ip4_range_end_format": "Neplatná adresa IPv4 na konci rozsahu",
+    "form_error_ip4_gateway_format": "Neplatná adresa IPv4 brány",
+    "form_error_ip6_format": "Neplatná adresa IPv6",
+    "form_error_ip_format": "Neplatná adresa IP",
+    "form_error_mac_format": "Neplatná adresa MAC",
+    "form_error_client_id_format": "Neplatné ID klienta",
    "form_error_server_name": "Neplatný název serveru",
    "form_error_subnet": "Podsíť \"{{cidr}}\" neobsahuje IP adresu \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Musí být mimo rozsah \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Musí být menší než začátek rozsahu",
+    "greater_range_start_error": "Musí být větší než začátek rozsahu",
+    "greater_range_end_error": "Musí být větší než konec rozsahu",
+    "subnet_error": "Adresy musí být v jedné podsíti",
+    "gateway_or_subnet_invalid": "Neplatná maska podsítě",
    "dhcp_form_gateway_input": "IP brána",
    "dhcp_form_subnet_input": "Maska podsítě",
    "dhcp_form_range_title": "Rozsah IP adres",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Neplatná URL nebo úplná cesta k seznamu",
    "custom_filter_rules": "Vlastní pravidla filtrování",
    "custom_filter_rules_hint": "Na každý řádek vložte jedno pravidlo. Můžete použít buď pravidla blokování reklam nebo syntaxe hostitelských souborů.",
+    "system_host_files": "Systémové soubory hostitelů",
    "examples_title": "Příklady",
    "example_meaning_filter_block": "zablokovat přístup k doméně example.org a všem jejím subdoménám",
    "example_meaning_filter_whitelist": "odblokovat přístup k doméně example.org a všem jejím subdoménám",
@@ -208,7 +216,7 @@
    "example_upstream_sdns": "můžete použít <0>DNS razítka</0> pro <1>DNSCrypt</1> nebo <2>DNS skrze 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í",
-    "updated_upstream_dns_toast": "Aktualizované upstream DNS servery",
+    "updated_upstream_dns_toast": "Odchozí servery byly úspěšně uloženy",
    "dns_test_ok_toast": "Specifikované DNS servery pracují správně",
    "dns_test_not_ok_toast": "Server \"{{key}}\": nemohl být použit, zkontrolujte, zda jste ho správně napsali",
    "unblock": "Odblokovat",
@@ -235,7 +243,7 @@
    "loading_table_status": "Načítání...",
    "page_table_footer_text": "Stránka",
    "rows_table_footer_text": "řádky",
-    "updated_custom_filtering_toast": "Aktualizovaná vlastní pravidla filtrování",
+    "updated_custom_filtering_toast": "Vlastní pravidla byla úspěšně uložena",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Budete muset nakonfigurovat Vaše zařízení nebo router, aby používali DNS server na následujících adresách:",
    "install_settings_all_interfaces": "Všechna rozhraní",
    "install_auth_title": "Ověřování",
-    "install_auth_desc": "Doporučujeme Vám nakonfigurovat v administrátorském webovém rozhraní AdGuard Home ověření Vaší identity heslem. I když je přístupné pouze ve Vaší lokální síti, je stále důležité chránit jej před neomezeným přístupem.",
+    "install_auth_desc": "V administrátorském webovém rozhraní AdGuard Home musí být nastaveno ověřovací heslo. I když je AdGuard Home přístupný pouze v místní síti, je důležité jej chránit před neomezeným přístupem.",
    "install_auth_username": "Uživatelské jméno",
    "install_auth_password": "Heslo",
    "install_auth_confirm": "Potvrďte heslo",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "Opravdu chcete vyčistit statistiky?",
    "statistics_retention_confirm": "Opravdu chcete změnit uchovávání statistik? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
    "statistics_cleared": "Statistiky úspěšně vyčištěny",
+    "statistics_enable": "Povolit statistiky",
    "interval_hours": "Hodiny: {{count}}",
    "interval_hours_plural": "Hodiny: {{count}}",
    "filters_configuration": "Konfigurace filtrů",
@@ -578,8 +587,8 @@
    "show_blocked_responses": "Zablokované",
    "show_whitelisted_responses": "Povolené",
    "show_processed_responses": "Zpracovaný",
-    "blocked_safebrowsing": "Blokované bezpečné prohlížení",
-    "blocked_adult_websites": "Blokované stránky pro dospělé",
+    "blocked_safebrowsing": "Blokováno modulem Bezpečné prohlížení",
+    "blocked_adult_websites": "Blokováno modulem Rodičovská kontrola",
    "blocked_threats": "Blokované hrozby",
    "allowed": "Povoleno",
    "filtered": "Filtrováno",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Prodlužte nejkratší hodnotu TTL (v sekundách) obdrženou z odchozího serveru při ukládání DNS odpovědí do mezipaměti",
    "cache_ttl_max_override_desc": "Nastavte maximální hodnotu TTL (v sekundách) pro položky v mezipaměti DNS",
    "ttl_cache_validation": "Minimální hodnota TTL mezipaměti musí být menší nebo rovna maximální hodnotě",
-    "cache_optimistic": "Optimistický režim",
+    "cache_optimistic": "Optimistické ukládání do mezipaměti",
    "cache_optimistic_desc": "Nechte AdGuard Home odpovědět z mezipaměti, i když už platnost položek skončila. Také se je pokuste obnovit.",
    "filter_category_general": "Obecné",
    "filter_category_security": "Bezpečnost",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Klikněte pro zobrazení dotazů",
    "port_53_faq_link": "Port 53 je často obsazen službami \"DNSStubListener\" nebo \"systemd-resolved\". Přečtěte si <0>tento návod</0> o tom, jak to vyřešit.",
    "adg_will_drop_dns_queries": "AdGuard Home zruší všechny DNS dotazy tohoto klienta.",
-    "client_not_in_allowed_clients": "Tento klient není povolen, protože není na seznamu \"Povolení klienti\".",
-    "experimental": "Experimentální"
+    "filter_allowlist": "VAROVÁNÍ: Tato akce také vyloučí pravidlo \"{{disallowed_rule}}\" ze seznamu povolených klientů.",
+    "last_rule_in_allowlist": "Nelze zakázat tohoto klienta, protože vyloučení pravidla \"{{disallowed_rule}}\" ZRUŠÍ seznam \"Povolených klientů\".",
+    "experimental": "Experimentální",
+    "use_saved_key": "Použít dříve uložený klíče",
+    "parental_control": "Rodičovská ochrana",
+    "safe_browsing": "Bezpečné prohlížení",
+    "served_from_cache": "{{value}} <i>(převzato z mezipaměti)</i>"
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Ugyldigt IP-format",
-    "form_error_mac_format": "Ugyldigt MAC-format",
-    "form_error_client_id_format": "Ugyldigt klient-ID format",
+    "form_error_ip4_format": "Ugyldig IPv4-adresse",
+    "form_error_ip4_range_start_format": "Ugyldig IPv4-adresse for områdestart",
+    "form_error_ip4_range_end_format": "Ugyldig IPv4-adresse for områdeafslutning",
+    "form_error_ip4_gateway_format": "Ugyldig IPv4-adresse for gateway",
+    "form_error_ip6_format": "Ugyldig IPv6-adresse",
+    "form_error_ip_format": "Ugyldig IP-adresse",
+    "form_error_mac_format": "Ugyldig MAC-adresse",
+    "form_error_client_id_format": "Ugyldigt klient-ID",
    "form_error_server_name": "Ugyldigt servernavn",
    "form_error_subnet": "Subnet \"{{cidr}}\" indeholder ikke IP-adressen \"{{ip}}\"",
    "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 på intervallet",
+    "out_of_range_error": "Skal være uden for området \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Skal være mindre end starten på området",
+    "greater_range_start_error": "Skal være større end starten på området",
+    "greater_range_end_error": "Skal være større end slutningen på området",
+    "subnet_error": "Adresser ska være i ét undernet",
+    "gateway_or_subnet_invalid": "Undernetmaske ugyldig",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Undernetmaske",
    "dhcp_form_range_title": "Interval af IP-adresser",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Ugyldig URL eller absolut listesti",
    "custom_filter_rules": "Tilpassede filtreringsregler",
    "custom_filter_rules_hint": "Angiv én regel pr. linje. Du kan bruge enten adblockingregler eller værtsfilsyntaks.",
+    "system_host_files": "System hosts-filer",
    "examples_title": "Eksempler",
    "example_meaning_filter_block": "blokér adgang til example.org-domænet samt alle underdomæner",
    "example_meaning_filter_whitelist": "afblokér adgang til example.ord-domænet samt alle underdomæner",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Opdaterede upstream DNS-serverene",
+    "updated_upstream_dns_toast": "Upstream-servere er gemt",
    "dns_test_ok_toast": "Angivne DNS-servere fungerer korrekt",
    "dns_test_not_ok_toast": "Server \"{{key}}\": Kunne ikke bruges. Tjek, at du har angivet den korrekt",
    "unblock": "Afblokering",
@@ -235,7 +243,7 @@
    "loading_table_status": "Indlæser...",
    "page_table_footer_text": "Side",
    "rows_table_footer_text": "rækker",
-    "updated_custom_filtering_toast": "Tilpassede filtreringsregler er nu opdateret",
+    "updated_custom_filtering_toast": "Tilpassede regler er gemt",
    "rule_removed_from_custom_filtering_toast": "Regel fjernet fra de tilpassede filtreringsregler: {{rule}}",
    "rule_added_to_custom_filtering_toast": "Regel føjet til de tilpassede filtreringsregler: {{rule}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Du skal opsætte dine enheder eller router til at bruge DNS-serveren på flg. adresser:",
    "install_settings_all_interfaces": "Alle grænseflader",
    "install_auth_title": "Godkendelse",
-    "install_auth_desc": "Det anbefales stærkt at opsætte adgangskodegodkendelse på din AdGuard Home admin webgrænseflade. Selvom den kun er tilgængelig på dit lokalnetværk, er det stadig vigtigt at få den beskyttet mod ubegrænset adgang.",
+    "install_auth_desc": "Adgangskodegodkendelse på din AdGuard Home admin-webflade skal opsættes. Selv hvis AdGuard Home kun er tilgængelig på lokalnetværket, er beskyttelse mod uautoriseret og ubegrænset adgang stadig vigtig.",
    "install_auth_username": "Brugernavn",
    "install_auth_password": "Adgangskode",
    "install_auth_confirm": "Bekræft adgangskode",
@@ -326,10 +334,10 @@
    "install_devices_router_list_4": "På visse routertyper kan en tilpasset DNS-server ikke opsættes. I så tilfælde kan det hjælpe, hvis du opsætter AdGuard Home som en <0>DHCP-server</0>. Ellers bør du tjekke i routermanualen, hvordan du tilpasser DNS-servere i din givne routermodel.",
    "install_devices_windows_list_1": "Åbn Kontrolpanel via menuen Start eller Windows-søgning.",
    "install_devices_windows_list_2": "Gå til kategorien Netværk og Internet og derefter til Netværks- og delingscenter.",
-    "install_devices_windows_list_3": "Til venstre finder du punktet Skift adapterindstillinger, klik på dette.",
+    "install_devices_windows_list_3": "Find punktet \"Skift adapterindstillinger\" til venstre på skærmen, klik på det.",
    "install_devices_windows_list_4": "Vælg din aktive forbindelse, højreklik på den og vælg Egenskaber.",
-    "install_devices_windows_list_5": "Find Internet Protocol Version 4 (TCP/IP) på listen, vælg den og klik derefter på Egenskaber igen.",
-    "install_devices_windows_list_6": "Vælg Brug følgende DNS-serveradresser og angiv dine AdGuard Home-serveradresser.",
+    "install_devices_windows_list_5": "Find \"Internet Protocol Version 4 (TCP/IPv4)\" (eller for IPv6, \"Internet Protocol Version 6 (TCP/IPv6)\") på listen, vælg den og klik derefter på Egenskaber igen.",
+    "install_devices_windows_list_6": "Vælg \"Brug følgende DNS-serveradresser og angiv dine AdGuard Home-serveradresser.",
    "install_devices_macos_list_1": "Klik på Apple-ikonet og gå til Systemindstillinger.",
    "install_devices_macos_list_2": "Klik på Netværk.",
    "install_devices_macos_list_3": "Vælg den første forbindelse på din liste, og klik på Avanceret.",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Statistikopsætning",
    "statistics_retention": "Statistikbevarelse",
    "statistics_retention_desc": "Mindskes intervalværdien, vil nogle data gå tabt",
-    "statistics_clear": " Ryd statistikker",
+    "statistics_clear": "Ryd statistikker",
    "statistics_clear_confirm": "Sikker på, at du vil slette statistikkerne?",
    "statistics_retention_confirm": "Sikker på, at du vil ændre på statistikbevaring? Mindskes intervalværdien, vil nogle data gå tabt",
    "statistics_cleared": "Statistikkerne er ryddet",
+    "statistics_enable": "Aktivér statistikker",
    "interval_hours": "{{count}} time",
    "interval_hours_plural": "{{count}} timer",
    "filters_configuration": "Filteropsætninger",
@@ -578,8 +587,8 @@
    "show_blocked_responses": "Blokeret",
    "show_whitelisted_responses": "Hvidlistet",
    "show_processed_responses": "Behandlet",
-    "blocked_safebrowsing": "Blokeret af Safebrowsing",
-    "blocked_adult_websites": "Blokerede Voksen Websteder",
+    "blocked_safebrowsing": "Blokeret af Safe Browsing",
+    "blocked_adult_websites": "Blokeret af Forælderkontrol",
    "blocked_threats": "Blokerede Trusler",
    "allowed": "Tilladt",
    "filtered": "Filtreret",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Forlæng korte time-to-live værdier (sekunder) modtaget fra upstream-serveren, når DNS-svar cachelagres",
    "cache_ttl_max_override_desc": "Indstil en maksimal time-to-live (sekunder) for registreringer i DNS-cachen",
    "ttl_cache_validation": "Minimum cache TTL-værdi skal være mindre end eller lig med den maksimale værdi",
-    "cache_optimistic": "Optimistisk",
+    "cache_optimistic": "Optimistisk caching",
    "cache_optimistic_desc": "Får AdGuard Home til at svare fra cachen, selv når posterne er udløbet, og prøver også at opdatere dem.",
    "filter_category_general": "Generelt",
    "filter_category_security": "Sikkerhed",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Klik for at se forespørgsler",
    "port_53_faq_link": "Port 53 optages ofte af \"DNSStubListener\" eller \"systemd-resolved\" tjenester. Læs <0>denne instruktion</0> om, hvordan du løser dette.",
    "adg_will_drop_dns_queries": "AdGuard Home vil afbryde alle DNS-forespørgsler fra denne klient.",
-    "client_not_in_allowed_clients": "Klienten er ikke tilladt, fordi den ikke er på listen \"Tilladte klienter\".",
-    "experimental": "Eksperimentel"
+    "filter_allowlist": "ADVARSEL: Denne handling udelukker også reglen \"{{disallowed_rule}}\" fra listen over tilladte klienter.",
+    "last_rule_in_allowlist": "Kan ikke afvise denne klient, da udelukkelse af reglen \"{{disallowed_rule}}\" DEAKTIVERER listen \"Tilladte klienter\".",
+    "experimental": "Eksperimentel",
+    "use_saved_key": "Brug den tidligere gemte nøgle",
+    "parental_control": "Forældrekontrol",
+    "safe_browsing": "Sikker Browsing",
+    "served_from_cache": "{{value}} <i>(leveret fra cache)</i>"
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -2,21 +2,21 @@
    "client_settings": "Client-Einstellungen",
    "example_upstream_reserved": "Sie können DNS-Upstream <0>für bestimmte Domain(s)</0> angeben",
    "example_upstream_comment": "Sie können den Kommentar angeben",
-    "upstream_parallel": "Parallele Abfragen verwenden, um die Lösung zu beschleunigen, indem Sie alle Upstream-Server gleichzeitig abfragen",
-    "parallel_requests": "Parallele Abfragen",
+    "upstream_parallel": "Parallele Abfragen verwenden, um das Auflösen zu beschleunigen, indem alle Upstream-Server gleichzeitig abgefragt werden.",
+    "parallel_requests": "Paralleles Abfragen",
    "load_balancing": "Lastverteilung",
    "load_balancing_desc": "Einen Server nach dem anderen abfragen. AdGuard Home verwendet den gewichteten Zufallsalgorithmus, um den Server so auszuwählen, dass der schnellste Server häufiger verwendet wird.",
    "bootstrap_dns": "Bootstrap DNS-Server starten",
    "bootstrap_dns_desc": "Bootstrap-DNS-Server werden verwendet, um IP-Adressen der DoH/DoT-Resolver aufzulösen, die Sie als Upstreams angeben.",
-    "local_ptr_title": "Eigene DNS-Server",
-    "local_ptr_desc": "Die DNS-Server, die AdGuard Home für lokale PTR-Abfragen verwendet. Diese Server werden verwendet, um die Hostnamen von Clients mit privaten IP-Adressen, z. B. „192.168.12.34“, mithilfe von rDNS aufzulösen. Wenn nicht festgelegt, verwendet AdGuard Home die Adressen der standardmäßigen DNS-Resolver Ihres Betriebssystems, mit Ausnahme der Adressen von AdGuard Home selbst.",
+    "local_ptr_title": "Private inverse DNS-Server",
+    "local_ptr_desc": "Die DNS-Server, die AdGuard Home für lokale PTR-Abfragen verwendet. Diese Server werden verwendet, um die Hostnamen von Clients mit privaten IP-Adressen, z. B. „192.168.12.34“, per inverse DNS-Anfragen aufzulösen. Wenn nicht festgelegt, verwendet AdGuard Home die Adressen der Standard-DNS-Auflöser Ihres Betriebssystems mit Ausnahme der Adressen von AdGuard Home selbst.",
    "local_ptr_default_resolver": "Standardmäßig verwendet AdGuard Home die folgenden Invers-DNS-Resolver: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home konnte keine geeigneten privaten Invers-DNS-Resolver für dieses System ermitteln.",
    "local_ptr_placeholder": "Eine Serveradresse pro Zeile eingeben",
    "resolve_clients_title": "Hostnamenauflösung der Clients aktivieren",
-    "resolve_clients_desc": "Lösen Sie die IP-Adressen der Clients umgekehrt in ihre Hostnamen auf, indem Sie PTR-Anfragen an entsprechende Resolver senden (private DNS-Server für lokale Clients, Upstream-Server für Clients mit öffentlichen IP-Adressen).",
+    "resolve_clients_desc": "Inverses Auflösen der IP-Adressen der Clients in ihre Hostnamen durch Senden von PTR-Anfragen an die entsprechenden Resolver (private DNS-Server für lokale Kunden, Upstream-Server für Kunden mit öffentlichen IP-Adressen).",
    "use_private_ptr_resolvers_title": "Private Reverse-DNS-Resolver verwenden",
-    "use_private_ptr_resolvers_desc": "Führen Sie mithilfe dieser Upstream-Server Reverse DNS-Lookups für lokal bereitgestellte Adressen durch. Wenn diese Option deaktiviert ist, antwortet AdGuard Home mit NXDOMAIN auf alle derartigen PTR-Anfragen mit Ausnahme von Clients, die von DHCP, /etc/hosts usw. bekannt sind.",
+    "use_private_ptr_resolvers_desc": "Führt inverse DNS-Abfragen für lokal bereitgestellte Adressen mit diesen Upstream-Servern durch. Wenn deaktiviert, antwortet AdGuard Home mit NXDOMAIN auf alle solchen PTR-Anfragen, außer für Clients, die über DHCP, /etc/hosts usw. bekannt sind.",
    "check_dhcp_servers": "Auf DHCP-Server prüfen",
    "save_config": "Konfiguration speichern",
    "enabled_dhcp": "DHCP-Server aktiviert",
@@ -27,54 +27,61 @@
    "dhcp_description": "Wenn Ihr Router keine DHCP-Einstellungen bietet, können Sie den integrierten DHCP-Server von AdGuard verwenden.",
    "dhcp_enable": "DHCP-Server aktivieren",
    "dhcp_disable": "DHCP-Server deaktivieren",
-    "dhcp_not_found": "Keine aktiven DHCP-Server im Netzwerk gefunden. Es ist sicher, den integrierten DHCP-Server zu aktivieren.",
-    "dhcp_found": "Einige aktive DHCP-Server im Netzwerk gefunden. Es ist nicht sicher, den integrierten DHCP-Server zu aktivieren.",
-    "dhcp_leases": "DHCP-Leasingverträge",
-    "dhcp_static_leases": "DHCP statische Leases",
-    "dhcp_leases_not_found": "Keine DHCP-Leasingverträge gefunden\n",
+    "dhcp_not_found": "Es ist sicherer, den integrierten DHCP-Server zu aktivieren, da AdGuard Home keine aktiven DHCP-Server im Netzwerk vorgefunden hat. Sie sollten dies jedoch noch einmal manuell überprüfen, da die automatische Überprüfung derzeit keine 100%ige Garantie bietet.",
+    "dhcp_found": "Es wurde ein aktiver DHCP-Server im Netzwerk gefunden. Es wird nicht empfohlen, den integrierten DHCP-Server zu aktivieren.",
+    "dhcp_leases": "DHCP-Zuweisungen",
+    "dhcp_static_leases": "DHCP statische Zuweisungen",
+    "dhcp_leases_not_found": "Keine DHCP-Zuweisungen gefunden",
    "dhcp_config_saved": "DHCP-Konfiguration erfolgreich gespeichert",
    "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",
-    "form_error_ip_format": "Ungültiges IPv4-Format",
-    "form_error_mac_format": "Ungültiges MAC-Format",
-    "form_error_client_id_format": "Ungültiges Client-ID-Format",
+    "form_error_ip4_format": "Ungültige IPv4-Adresse",
+    "form_error_ip4_range_start_format": "Ungültiger Bereichsbeginn der IPv4-Adresse",
+    "form_error_ip4_range_end_format": "Ungültiges Bereichsende der IPv4-Adresse",
+    "form_error_ip4_gateway_format": "Ungültiges Gateway-IPv4-Adresse",
+    "form_error_ip6_format": "Ungültige IPv6-Adresse",
+    "form_error_ip_format": "Ungültige IP-Adresse",
+    "form_error_mac_format": "Ungültige MAC-Adresse",
+    "form_error_client_id_format": "Ungültiges Client-ID",
    "form_error_server_name": "Ungültiger Servername",
-    "form_error_subnet": "Subnetz „{{cidr}}” enthält nicht die IP-Adresse „{{ip}}”",
-    "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",
+    "form_error_subnet": "Subnetz „{{cidr}}“ enthält nicht die IP-Adresse „{{ip}}“",
+    "form_error_positive": "Muss größer als 0 (Null) sein",
+    "out_of_range_error": "Muss außerhalb des Bereichs „{{start}}“-„{{end}}“ liegen",
+    "lower_range_start_error": "Muss niedriger als der Bereichsbeginn sein",
+    "greater_range_start_error": "Muss größer als der Bereichsbeginn sein",
+    "greater_range_end_error": "Muss größer als das Bereichsende sein",
+    "subnet_error": "Die Adressen müssen innerhalb eines Subnetzes liegen",
+    "gateway_or_subnet_invalid": "Ungültige Subnetzmaske",
    "dhcp_form_gateway_input": "Gateway-IP",
    "dhcp_form_subnet_input": "Subnetz-Maske",
    "dhcp_form_range_title": "Bereich von IP-Adressen",
-    "dhcp_form_range_start": "Bereichsanfang",
+    "dhcp_form_range_start": "Bereichsbeginn",
    "dhcp_form_range_end": "Bereichsende",
-    "dhcp_form_lease_title": "DHCP-Leasingdauer (in Sekunden)",
-    "dhcp_form_lease_input": "Leasingdauer",
+    "dhcp_form_lease_title": "DHCP-Zuweisungs-Dauer (in Sekunden)",
+    "dhcp_form_lease_input": "Dauer der Zuweisung",
    "dhcp_interface_select": "DHCP-Benutzeroberfläche auswählen",
    "dhcp_hardware_address": "Hardware-Adresse",
    "dhcp_ip_addresses": "IP-Adressen",
    "ip": "IP",
    "dhcp_table_hostname": "Hostname",
-    "dhcp_table_expires": "Läuft ab",
+    "dhcp_table_expires": "Gültig bis",
    "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_error": "AdGuard Home konnte nicht ermitteln, ob es einen anderen aktiven 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-Server 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",
-    "dhcp_static_leases_not_found": "Keine statischen DHCP-Leases gefunden",
-    "dhcp_add_static_lease": "Statischen Lease hinzufügen",
-    "dhcp_reset_leases": "Setzen Sie alle Leases zurück",
-    "dhcp_reset_leases_confirm": "Möchten Sie wirklich alle Leases zurücksetzen?",
-    "dhcp_reset_leases_success": "DHCP-Leases erfolgreich zurückgesetzt",
+    "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-Server aktivieren“ klicken.",
+    "dhcp_lease_added": "Statischer Zuweisung „{{key}}“ erfolgreich hinzugefügt",
+    "dhcp_lease_deleted": "Statische Zuweisung „{{key}}“ erfolgreich entfernt",
+    "dhcp_new_static_lease": "Neuer statischer Zuweisung",
+    "dhcp_static_leases_not_found": "Keine statischen DHCP-Zuweisungen gefunden",
+    "dhcp_add_static_lease": "Statische Zuweisung hinzufügen",
+    "dhcp_reset_leases": "Alle Zuweisungen zurücksetzen",
+    "dhcp_reset_leases_confirm": "Möchten Sie wirklich alle Zuweisungen zurücksetzen?",
+    "dhcp_reset_leases_success": "DHCP-Zuweisungen erfolgreich zurückgesetzt",
    "dhcp_reset": "Möchten Sie die DHCP-Konfiguration wirklich zurücksetzen?",
    "country": "Land",
    "city": "Stadt",
-    "delete_confirm": "Möchten Sie „{{key}}” wirklich löschen?",
+    "delete_confirm": "Möchten Sie „{{key}}“ wirklich löschen?",
    "form_enter_hostname": "Gerätenamen eingeben",
    "error_details": "Fehlerdetails",
    "response_details": "Einzelheiten der Antwort",
@@ -96,7 +103,7 @@
    "on": "AN",
    "off": "AUS",
    "copyright": "Urheberrecht",
-    "homepage": "Homepage",
+    "homepage": "Startseite",
    "report_an_issue": "Fehlerbericht senden",
    "privacy_policy": "Datenschutzerklärung",
    "enable_protection": "Schutz aktivieren",
@@ -106,8 +113,8 @@
    "refresh_statics": "Statistiken aktualisieren",
    "dns_query": "DNS-Anfragen",
    "blocked_by": "<0>Durch Filter gesperrt</0>",
-    "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Webseiten",
-    "stats_adult": "Gesperrte jugendgefährdende Webseiten",
+    "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Websites",
+    "stats_adult": "Gesperrte jugendgefährdende Websites",
    "stats_query_domain": "Am häufigsten angefragte Domains",
    "for_last_24_hours": "für die letzten 24 Stunden",
    "for_last_days": "am letzten {{count}} Tag",
@@ -124,8 +131,8 @@
    "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-Sperrlisten abgelehnte 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_adult": "Anzahl der gesperrten Webseiten mit jugendgefährdenden Inhalten",
+    "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_adult": "Anzahl der gesperrten Websites mit jugendgefährdenden Inhalten",
    "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",
@@ -165,7 +172,7 @@
    "enabled_table_header": "Aktiviert",
    "name_table_header": "Name",
    "list_url_table_header": "Adressliste",
-    "rules_count_table_header": "Anzahl Regeln",
+    "rules_count_table_header": "Regeln total",
    "last_time_updated_table_header": "Letztes Update",
    "actions_table_header": "Aktionen",
    "request_table_header": "Anfrage",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Ungültige URL oder absoluter Pfad der Liste",
    "custom_filter_rules": "Benutzerdefinierte Filterregeln",
    "custom_filter_rules_hint": "Geben Sie pro Zeile eine Regel ein. Sie können entweder Werbefilterregeln oder Host-Datei-Syntax verwenden.",
+    "system_host_files": "Hosts-Datei des Systems",
    "examples_title": "Beispiele",
    "example_meaning_filter_block": "blockiert den Zugang zur Domain example.org und all ihren Subdomains",
    "example_meaning_filter_whitelist": "entblockt den Zugang zur Domain example.org und all ihren Subdomains",
@@ -200,7 +208,7 @@
    "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 sperren, die dem <0>angegebenen 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>",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Upstream-DNS-Server wurden aktualisiert",
+    "updated_upstream_dns_toast": "Upstream-Server erfolgreich gespeichert",
    "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",
@@ -235,7 +243,7 @@
    "loading_table_status": "Wird geladen …",
    "page_table_footer_text": "Seite",
    "rows_table_footer_text": "Reihen",
-    "updated_custom_filtering_toast": "Die benutzerdefinierten Filterregeln wurden aktualisiert",
+    "updated_custom_filtering_toast": "Benutzerdefinierten Filterregeln erfolgreich gespeichert",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Sie müssen Ihre Geräte oder Ihren Router so konfigurieren, dass er den DNS-Server unter den folgenden Adressen verwendet:",
    "install_settings_all_interfaces": "Alle Schnittstellen",
    "install_auth_title": "Authentifizierung",
-    "install_auth_desc": "Es wird dringend empfohlen, die Passwortauthentifizierung für Ihre AdGuard Home Administrator-Weboberfläche zu konfigurieren. Auch wenn es nur in Ihrem lokalen Netzwerk zugänglich ist, ist es dennoch wichtig, es vor unbefugtem Zugriff zu schützen.",
+    "install_auth_desc": "Die Passwort-Authentifizierung für Ihre AdGuard Home Admin-Web-Oberfläche muss konfiguriert werden. Auch wenn AdGuard Home nur in Ihrem lokalen Netzwerk zugänglich ist, ist es dennoch wichtig, es vor unberechtigtem Zugriff zu schützen.",
    "install_auth_username": "Benutzername",
    "install_auth_password": "Passwort",
    "install_auth_confirm": "Passwort bestätigen",
@@ -315,7 +323,7 @@
    "install_step": "Schritt",
    "install_devices_title": "Konfigurieren Sie Ihre Geräte",
    "install_devices_desc": "Um AdGuard Home nutzen zu können, müssen Sie Ihre Geräte so konfigurieren, dass sie es auch wirklich nutzen.",
-    "install_submit_title": "Herzlichen Glückwunsch!",
+    "install_submit_title": "Gratulation!",
    "install_submit_desc": "Die Einrichtung ist abgeschlossen und Sie können mit der Verwendung von AdGuard Home beginnen.",
    "install_devices_router": "Router",
    "install_devices_router_desc": "Diese Einrichtung deckt automatisch alle an Ihren Heimrouter angeschlossenen Geräte ab, und Sie müssen nicht jedes einzelne davon manuell konfigurieren.",
@@ -325,22 +333,22 @@
    "install_devices_router_list_3": "Geben Sie dort Ihre AdGuard Home Server-Adressen ein.",
    "install_devices_router_list_4": "Bei einigen Routertypen kann kein eigener DNS-Server eingerichtet werden. In diesem Fall kann es helfen, AdGuard Home als <0>DHCP-Server</0> einzurichten. Andernfalls sollten Sie im Handbuch des Routers nachsehen, wie Sie DNS-Server auf Ihrem konkreten Router-Modell anpassen können.",
    "install_devices_windows_list_1": "Öffnen Sie die Systemsteuerung über das Startmenü oder die Windows-Suche.",
-    "install_devices_windows_list_2": "Öffnen Sie die Kategorie „Netzwerk und Internet” und dann „Netzwerk- und Freigabecenter”.",
-    "install_devices_windows_list_3": "Suchen Sie auf der linken Seite des Bildschirms nach „Adaptereinstellungen ändern” und klicken Sie darauf.",
-    "install_devices_windows_list_4": "Wählen Sie Ihre aktive Verbindung aus, klicken Sie mit der rechten Maustaste darauf und wählen Sie „Eigenschaften”.",
-    "install_devices_windows_list_5": "Suchen Sie in der Liste nach „Internet Protokoll Version 4 (TCP/IP)” (oder, für IPv6, „Internet Protocol Version 6 (TCP/IPv6)“), markieren Sie diese und klicken Sie dann erneut auf „Eigenschaften”.",
-    "install_devices_windows_list_6": "Wählen Sie „Folgende DNS-Serveradressen verwenden” und geben Sie Ihre AdGuard Home-Serveradressen ein.",
-    "install_devices_macos_list_1": "Klicken Sie auf das Apple-Symbol (oben links in der Menüzeile) und wählen den Eintrag „Systemeinstellungen”.",
-    "install_devices_macos_list_2": "Klicken Sie dort auf „Netzwerk”",
-    "install_devices_macos_list_3": "Wählen Sie die erste Verbindung in Ihrer Liste aus und klicken Sie auf „Weitere Optionen”.",
-    "install_devices_macos_list_4": "Wählen Sie den Tab „DNS” und geben Sie dort Ihre AdGuard Home-Serveradressen ein.",
-    "install_devices_android_list_1": "Tippen Sie auf dem Startbildschirm des Android-Menüs auf „Einstellungen”.",
-    "install_devices_android_list_2": "Tippen Sie im Menü auf „WLAN”. Der Bildschirm mit allen verfügbaren Netzwerken wird angezeigt (es ist nicht möglich, einen benutzerdefinierten DNS für die mobile Verbindung einzustellen).",
-    "install_devices_android_list_3": "Drücken Sie lange auf das Netzwerk, mit dem Sie verbunden sind, und tippen Sie auf „Netzwerk ändern”.",
-    "install_devices_android_list_4": "Bei einigen Geräten müssen Sie möglicherweise das Kontrollkästchen für „Erweitert” aktivieren, um weitere Einstellungen anzuzeigen. Um Ihre Android-DNS-Einstellungen anzupassen, müssen Sie die IP-Einstellungen von „DHCP” auf „Statisch” umstellen.",
-    "install_devices_android_list_5": "Ändern Sie die Werte für „DNS 1” und „DNS 2” auf Ihre AdGuard Home-Serveradressen.",
-    "install_devices_ios_list_1": "Tippen Sie auf dem Startbildschirm auf „Einstellungen”.",
-    "install_devices_ios_list_2": "Wählen Sie „WLAN” im linken Menü (es ist nicht möglich, DNS für mobile Netzwerke zu konfigurieren).",
+    "install_devices_windows_list_2": "Öffnen Sie die Kategorie „Netzwerk und Internet“ und dann „Netzwerk- und Freigabecenter“.",
+    "install_devices_windows_list_3": "Suchen Sie auf der linken Seite des Bildschirms nach „Adaptereinstellungen ändern“ und klicken Sie darauf.",
+    "install_devices_windows_list_4": "Wählen Sie Ihre aktive Verbindung aus, klicken Sie mit der rechten Maustaste darauf und wählen Sie „Eigenschaften“.",
+    "install_devices_windows_list_5": "Suchen Sie in der Liste nach „Internet Protokoll Version 4 (TCP/IP)“ (oder, für IPv6, „Internet Protocol Version 6 (TCP/IPv6)“), markieren Sie diese und klicken Sie dann erneut auf „Eigenschaften“.",
+    "install_devices_windows_list_6": "Wählen Sie „Folgende DNS-Serveradressen verwenden“ und geben Sie Ihre AdGuard Home-Serveradressen ein.",
+    "install_devices_macos_list_1": "Klicken Sie auf das Apple-Symbol (oben links in der Menüzeile) und wählen den Eintrag „Systemeinstellungen“.",
+    "install_devices_macos_list_2": "Klicken Sie dort auf „Netzwerk“",
+    "install_devices_macos_list_3": "Wählen Sie die erste Verbindung in Ihrer Liste aus und klicken Sie auf „Weitere Optionen“.",
+    "install_devices_macos_list_4": "Wählen Sie den Tab „DNS“ und geben Sie dort Ihre AdGuard Home-Serveradressen ein.",
+    "install_devices_android_list_1": "Tippen Sie auf dem Startbildschirm des Android-Menüs auf „Einstellungen“.",
+    "install_devices_android_list_2": "Tippen Sie im Menü auf „WLAN“. Der Bildschirm mit allen verfügbaren Netzwerken wird angezeigt (es ist nicht möglich, einen benutzerdefinierten DNS für die mobile Verbindung einzustellen).",
+    "install_devices_android_list_3": "Drücken Sie lange auf das Netzwerk, mit dem Sie verbunden sind, und tippen Sie auf „Netzwerk ändern“.",
+    "install_devices_android_list_4": "Bei einigen Geräten müssen Sie möglicherweise das Kontrollkästchen für „Erweitert“ aktivieren, um weitere Einstellungen anzuzeigen. Um Ihre Android-DNS-Einstellungen anzupassen, müssen Sie die IP-Einstellungen von „DHCP“ auf „Statisch“ umstellen.",
+    "install_devices_android_list_5": "Ändern Sie die Werte für „DNS 1“ und „DNS 2“ auf Ihre AdGuard Home-Serveradressen.",
+    "install_devices_ios_list_1": "Tippen Sie auf dem Startbildschirm auf „Einstellungen“.",
+    "install_devices_ios_list_2": "Wählen Sie „WLAN“ im linken Menü (es ist nicht möglich, DNS für mobile Netzwerke zu konfigurieren).",
    "install_devices_ios_list_3": "Tippen Sie auf den Namen des aktuell aktiven Netzwerks.",
    "install_devices_ios_list_4": "Geben Sie im DNS-Feld Ihre AdGuard Home-Serveradressen ein.",
    "get_started": "Anfangen",
@@ -356,7 +364,7 @@
    "encryption_redirect": "Automatisch auf HTTPS umleiten",
    "encryption_redirect_desc": "Wenn aktiviert, leitet AdGuard Home Sie automatisch von HTTP- auf HTTPS-Adressen um.",
    "encryption_https": "HTTPS-Port",
-    "encryption_https_desc": "Wenn der HTTPS-Port konfiguriert ist, ist die AdGuard Home-Administrationsschnittstelle über HTTPS zugänglich und bietet auch DNS-over-HTTPS am Server „/dns-query”.",
+    "encryption_https_desc": "Wenn der HTTPS-Port konfiguriert ist, ist die AdGuard Home-Administrationsschnittstelle über HTTPS zugänglich und bietet auch DNS-over-HTTPS 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",
@@ -410,18 +418,18 @@
    "ip_address": "IP-Adresse",
    "client_identifier_desc": "Clients können durch die IP-Adresse, CIDR, MAC-Adresse oder eine spezielle Client-ID (können für DoT/DoH/DoQ verwendet werden) identifiziert werden. <0>Hier</0> erfahren Sie mehr darüber, wie Sie Kunden identifizieren.",
    "form_enter_ip": "IP-Adresse eingeben",
-    "form_enter_subnet_ip": "IP-Adresse zum Subnetz „{{cidr}}” hinzufügen",
+    "form_enter_subnet_ip": "IP-Adresse zum Subnetz „{{cidr}}“ hinzufügen",
    "form_enter_mac": "MAC-Adresse eingeben",
    "form_enter_id": "Kennung eingeben",
    "form_add_id": "Kennung hinzufügen",
    "form_client_name": "Clientnamen eingeben",
    "name": "Name",
    "client_global_settings": "Allgemeine Einstellungen nutzen",
-    "client_deleted": "Client „{{key}}” erfolgreich entfernt",
-    "client_added": "Client „{{key}}” erfolgreich hinzugefügt",
-    "client_updated": "Client „{{key}}” erfolgreich aktualisiert",
+    "client_deleted": "Client „{{key}}“ erfolgreich entfernt",
+    "client_added": "Client „{{key}}“ erfolgreich hinzugefügt",
+    "client_updated": "Client „{{key}}“ erfolgreich aktualisiert",
    "clients_not_found": "Keine Clients gefunden",
-    "client_confirm_delete": "Möchten Sie den Client „{{key}}” wirklich löschen?",
+    "client_confirm_delete": "Möchten Sie den Client „{{key}}“ wirklich löschen?",
    "list_confirm_delete": "Möchten Sie diese Liste wirklich löschen?",
    "auto_clients_title": "Clients (Laufzeit)",
    "auto_clients_desc": "Daten zu den Clients, die AdGuard Home verwenden, aber nicht in der Konfiguration gespeichert sind",
@@ -441,25 +449,25 @@
    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
    "setup_dns_privacy_3": "<0>Hier ist eine Liste von Software, die Sie verwenden können.</0>",
-    "setup_dns_privacy_4": "Auf einem iOS 14 oder macOS Big Sur-Gerät können Sie eine spezielle Datei „.mobileconfig” herunterladen, die Server für <highlight>DNS-über-HTTPS</highlight> oder <highlight>DNS-über-TLS</highlight> zu den DNS-Einstellungen hinzufügt.",
-    "setup_dns_privacy_android_1": "Android 9 unterstützt DNS-over-TLS nativ. Um es zu konfigurieren, gehen Sie zu „Einstellungen” → „Netzwerk & Internet” → „Erweitert” → „Privater DNS” und geben Sie dort Ihren Domainnamen ein.",
+    "setup_dns_privacy_4": "Auf einem iOS 14 oder macOS Big Sur-Gerät können Sie eine spezielle Datei „.mobileconfig“ herunterladen, die Server für <highlight>DNS-über-HTTPS</highlight> oder <highlight>DNS-über-TLS</highlight> zu den DNS-Einstellungen hinzufügt.",
+    "setup_dns_privacy_android_1": "Android 9 unterstützt DNS-over-TLS nativ. Um es zu konfigurieren, gehen Sie zu „Einstellungen“ → „Netzwerk & Internet“ → „Erweitert“ → „Privater DNS“ und geben Sie dort Ihren Domainnamen ein.",
    "setup_dns_privacy_android_2": "<0>AdGuard für Android</0> unterstützt <1>DNS-over-HTTTPS</1> und <1>DNS-over-TLS</1>.",
-    "setup_dns_privacy_android_3": "„<0>Intra</0>” fügt <1>DNS-over-HTTPS</1>-Unterstützung zu Android hinzu.",
-    "setup_dns_privacy_ios_1": "„<0>DNSCloak</0>” unterstützt <1>DNS-over-HTTPS</1>, aber um es so zu konfigurieren, dass es Ihren eigenen Server verwendet, müssen Sie einen <2>DNS-Stempel</2> dafür generieren.",
+    "setup_dns_privacy_android_3": "„<0>Intra</0>“ fügt <1>DNS-over-HTTPS</1>-Unterstützung zu Android hinzu.",
+    "setup_dns_privacy_ios_1": "„<0>DNSCloak</0>“ unterstützt <1>DNS-over-HTTPS</1>, aber um es so zu konfigurieren, dass es Ihren eigenen Server verwendet, müssen Sie einen <2>DNS-Stempel</2> dafür generieren.",
    "setup_dns_privacy_ios_2": "<0>AdGuard für iOS</0> unterstützt die Einrichtung von <1>DNS-over-HTTTPS</1> und <1>DNS-over-TLS</1>.",
-    "setup_dns_privacy_other_title": "Weitere Umsetzungen",
+    "setup_dns_privacy_other_title": "Weitere Implementierungen",
    "setup_dns_privacy_other_1": "AdGuard Home selbst kann ein sicherer DNS-Client auf jeder Plattform sein.",
    "setup_dns_privacy_other_2": "<0>dnsproxy</0> unterstützt alle bekannten sicheren DNS-Protokolle.",
    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> unterstützt <1>DNS-over-HTTPS</1>.",
    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> unterstützt <1>DNS-over-HTTPS</1>.",
-    "setup_dns_privacy_other_5": "Weitere Umsetzungen finden Sie <0>hier</0> und <1>hier</1>.",
+    "setup_dns_privacy_other_5": "Weitere Implementierungen finden Sie <0>hier</0> und <1>hier</1>.",
    "setup_dns_privacy_ioc_mac": "Konfiguration für iOS und macOS",
    "setup_dns_notice": "Um <1>DNS-over-HTTTPS</1> oder <1>DNS-over-TLS</1> verwenden zu können, müssen Sie in den AdGuard Home Einstellungen die <0>Verschlüsselung konfigurieren</0>.",
-    "rewrite_added": "DNS-Umschreibung für „{{key}}” erfolgreich hinzugefügt",
-    "rewrite_deleted": "DNS-Umschreibung für „{{key}}” erfolgreich entfernt",
+    "rewrite_added": "DNS-Umschreibung für „{{key}}“ erfolgreich hinzugefügt",
+    "rewrite_deleted": "DNS-Umschreibung für „{{key}}“ erfolgreich entfernt",
    "rewrite_add": "DNS-Umschreibung hinzufügen",
    "rewrite_not_found": "Keine DNS-Umschreibungen gefunden",
-    "rewrite_confirm_delete": "Möchten Sie die DNS-Umschreibung für „{{key}}” wirklich entfernen?",
+    "rewrite_confirm_delete": "Möchten Sie die DNS-Umschreibung für „{{key}}“ wirklich entfernen?",
    "rewrite_desc": "Ermöglicht die einfache Konfiguration der benutzerdefinierten DNS-Antwort für einen bestimmten Domainnamen.",
    "rewrite_applied": "Umschreibungsregel ist angewendet",
    "rewrite_hosts_applied": "Von Hostdatei-Regel umgeschrieben",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Statistikkonfiguration",
    "statistics_retention": "Statistiken speichern",
    "statistics_retention_desc": "Wenn Sie den Zeitraum verringern, werden einige Daten verloren gehen",
-    "statistics_clear": " Statistiken leeren",
+    "statistics_clear": "Statistiken leeren",
    "statistics_clear_confirm": "Möchten Sie die Statistiken wirklich löschen?",
    "statistics_retention_confirm": "Möchten Sie wirklich die Aufbewahrung der Statistiken ändern? Wenn Sie den Zeitabstand verringern, gehen einige Daten verloren.",
    "statistics_cleared": "Statistiken wurden erfolgreich gelöscht",
+    "statistics_enable": "Statistiken aktivieren",
    "interval_hours": "{{count}} Stunde",
    "interval_hours_plural": "{{count}} Stunden",
    "filters_configuration": "Filterkonfiguration",
@@ -538,7 +547,7 @@
    "disable_ipv6_desc": "Löschen Sie alle DNS-Abfragen für IPv6-Adressen (Typ AAAA).",
    "fastest_addr": "Schnellste IP-Adresse",
    "fastest_addr_desc": "Fragen Sie alle DNS-Server ab und geben Sie die schnellste IP-Adresse unter allen Antworten zurück. Dies verlangsamt DNS-Abfragen, da AdGuard Home auf Antworten von allen DNS-Servern warten muss, verbessert jedoch die Gesamtkonnektivität.",
-    "autofix_warning_text": "Wenn Sie auf „Beheben” klicken, konfiguriert AdGuardHome Ihr System für die Verwendung des AdGuardHome-DNS-Servers.",
+    "autofix_warning_text": "Wenn Sie auf „Beheben“ klicken, konfiguriert AdGuardHome Ihr System für die Verwendung des AdGuardHome-DNS-Servers.",
    "autofix_warning_list": "Es werden folgende Aufgaben ausgeführt: <0>Deaktivieren des DNSStubListener-Systems</0> <0>Festlegen der DNS-Server-Adresse auf 127.0.0.1</0> <0>Ersetzen des symbolischen Linkziels von /etc/resolv.conf auf /run/systemd/resolve/resolv.conf</0> <0>Anhalten des DNSStubListener (systemseitig aufgelöster Dienst wird nachladen)</0>",
    "autofix_warning_result": "Als Folge daraus werden alle DNS-Anforderungen von Ihrem System standardmäßig von AdGuardHome verarbeitet.",
    "tags_title": "Schlagwörter",
@@ -558,10 +567,10 @@
    "check_service": "Dienstname: {{service}}",
    "service_name": "Name des Dienstes",
    "check_not_found": "Nicht in Ihren Filterlisten enthalten",
-    "client_confirm_block": "Möchten Sie den Client „{{ip}}” wirklich sperren?",
-    "client_confirm_unblock": "Möchten Sie den Client „{{ip}}” wirklich entsperren?",
-    "client_blocked": "Client „{{ip}}” erfolgreich gesperrt",
-    "client_unblocked": "Client „{{ip}}” erfolgreich entsperrt",
+    "client_confirm_block": "Möchten Sie den Client „{{ip}}“ wirklich sperren?",
+    "client_confirm_unblock": "Möchten Sie den Client „{{ip}}“ wirklich entsperren?",
+    "client_blocked": "Client „{{ip}}“ erfolgreich gesperrt",
+    "client_unblocked": "Client „{{ip}}“ erfolgreich entsperrt",
    "static_ip": "Feste IP-Adresse",
    "static_ip_desc": "AdGuard Home ist ein Server und benötigt daher eine feste IP-Adresse, um ordnungsgemäß zu funktionieren. Andernfalls weist Ihr Router diesem Gerät möglicherweise irgendwann eine andere IP-Adresse zu.",
    "set_static_ip": "Feste IP-Adresse festlegen",
@@ -578,8 +587,8 @@
    "show_blocked_responses": "Gesperrt",
    "show_whitelisted_responses": "Auf der Positivliste",
    "show_processed_responses": "Verarbeitet",
-    "blocked_safebrowsing": "Durch Internetsicherheit gesperrt",
-    "blocked_adult_websites": "Gesperrte jugendgefährdende Webseiten",
+    "blocked_safebrowsing": "Gesperrt durch Internetsicherheit",
+    "blocked_adult_websites": "Gesperrt durch Kindersicherung",
    "blocked_threats": "Gesperrte Bedrohungen",
    "allowed": "Zugelassen",
    "filtered": "Gefiltert",
@@ -597,7 +606,7 @@
    "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_max_override_desc": "Überschreibt den TLL-Maximalwert, der vom vorgeschalteten Server empfangen wurde.",
    "ttl_cache_validation": "Der minimale Cache des TTL-Wertes muss kleiner oder gleich dem maximalen Wert sein",
-    "cache_optimistic": "Optimistisch",
+    "cache_optimistic": "Optimistisches Zwischenspeichern",
    "cache_optimistic_desc": "Sorgt dafür, dass AdGuard Home auch dann aus dem Zwischenspeicher antwortet, wenn die Einträge abgelaufen sind, und versucht zudem, diese zu aktualisieren.",
    "filter_category_general": "Allgemein",
    "filter_category_security": "Sicherheit",
@@ -610,8 +619,13 @@
    "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.",
+    "port_53_faq_link": "Port 53 wird oft von Diensten wie „DNSStubListener“ oder „systemresolved“ belegt. Bitte lesen Sie <0>diese Anweisung</0>, wie dies behoben werden kann.",
    "adg_will_drop_dns_queries": "AdGuard Home wird alle DNS-Abfragen von diesem Client verwerfen.",
-    "client_not_in_allowed_clients": "Dieser Client ist nicht zugelassen, da dieser nicht in der Liste „Erlaubte Clients” aufgeführt ist.",
-    "experimental": "Experimentell"
+    "filter_allowlist": "Warnhinweis: Durch diese Aktion wird außerdem die Regel „{{disallowed_rule}}“ aus der Liste der zugelassenen Clients ausgeschlossen.",
+    "last_rule_in_allowlist": "Dieser Client kann nicht gesperrt werden, da das Ausschließen der Regel „{{disallowed_rule}}“ die Liste „Zugelassene Clients“ deaktivieren würde.",
+    "experimental": "Experimentell",
+    "use_saved_key": "Zuvor gespeicherten Schlüssel verwenden",
+    "parental_control": "Kindersicherung",
+    "safe_browsing": "Sicheres Surfen",
+    "served_from_cache": "{{value}} <i>(aus dem Zwischenspeicher abgerufen)</i>"
 }
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Invalid IP format",
-    "form_error_mac_format": "Invalid MAC format",
-    "form_error_client_id_format": "Invalid client ID format",
+    "form_error_ip4_format": "Invalid IPv4 address",
+    "form_error_ip4_range_start_format": "Invalid IPv4 address of the range start",
+    "form_error_ip4_range_end_format": "Invalid IPv4 address of the range end",
+    "form_error_ip4_gateway_format": "Invalid IPv4 address of the gateway",
+    "form_error_ip6_format": "Invalid IPv6 address",
+    "form_error_ip_format": "Invalid IP address",
+    "form_error_mac_format": "Invalid MAC address",
+    "form_error_client_id_format": "Invalid client ID",
    "form_error_server_name": "Invalid server name",
    "form_error_subnet": "Subnet \"{{cidr}}\" does not contain the IP address \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Must be out of range \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Must be lower than range start",
+    "greater_range_start_error": "Must be greater than range start",
+    "greater_range_end_error": "Must be greater than range end",
+    "subnet_error": "Addresses must be in one subnet",
+    "gateway_or_subnet_invalid": "Subnet mask invalid",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Range of IP addresses",
@@ -98,7 +105,7 @@
    "copyright": "Copyright",
    "homepage": "Homepage",
    "report_an_issue": "Report an issue",
-    "privacy_policy": "Privacy policy",
+    "privacy_policy": "Privacy Policy",
    "enable_protection": "Enable protection",
    "enabled_protection": "Enabled protection",
    "disable_protection": "Disable protection",
@@ -156,8 +163,8 @@
    "apply_btn": "Apply",
    "disabled_filtering_toast": "Disabled filtering",
    "enabled_filtering_toast": "Enabled filtering",
-    "disabled_safe_browsing_toast": "Disabled safebrowsing",
-    "enabled_safe_browsing_toast": "Enabled safebrowsing",
+    "disabled_safe_browsing_toast": "Disabled Safe Browsing",
+    "enabled_safe_browsing_toast": "Enabled Safe Browsing",
    "disabled_parental_toast": "Disabled parental control",
    "enabled_parental_toast": "Enabled parental control",
    "disabled_safe_search_toast": "Disabled safe search",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Invalid URL or absolute path of the list",
    "custom_filter_rules": "Custom filtering rules",
    "custom_filter_rules_hint": "Enter one rule on a line. You can use either adblock rules or hosts files syntax.",
+    "system_host_files": "System hosts files",
    "examples_title": "Examples",
    "example_meaning_filter_block": "block access to the example.org domain and all its subdomains",
    "example_meaning_filter_whitelist": "unblock access to the example.org domain and all its subdomains",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Updated the upstream DNS servers",
+    "updated_upstream_dns_toast": "Upstream servers successfully saved",
    "dns_test_ok_toast": "Specified DNS servers are working correctly",
    "dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly",
    "unblock": "Unblock",
@@ -235,7 +243,7 @@
    "loading_table_status": "Loading...",
    "page_table_footer_text": "Page",
    "rows_table_footer_text": "rows",
-    "updated_custom_filtering_toast": "Updated the custom filtering rules",
+    "updated_custom_filtering_toast": "Custom rules successfully saved",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server on the following addresses:",
    "install_settings_all_interfaces": "All interfaces",
    "install_auth_title": "Authentication",
-    "install_auth_desc": "It is highly recommended to configure password authentication to your AdGuard Home admin web interface. Even if it is accessible only in your local network, it is still important to protect it from unrestricted access.",
+    "install_auth_desc": "Password authentication to your AdGuard Home admin web interface must be configured. Even if AdGuard Home is accessible only in your local network, it is still important to protect it from unrestricted access.",
    "install_auth_username": "Username",
    "install_auth_password": "Password",
    "install_auth_confirm": "Confirm password",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Statistics configuration",
    "statistics_retention": "Statistics retention",
    "statistics_retention_desc": "If you decrease the interval value, some data will be lost",
-    "statistics_clear": " Clear statistics",
+    "statistics_clear": "Clear statistics",
    "statistics_clear_confirm": "Are you sure you want to clear statistics?",
    "statistics_retention_confirm": "Are you sure you want to change statistics retention? If you decrease the interval value, some data will be lost",
    "statistics_cleared": "Statistics successfully cleared",
+    "statistics_enable": "Enable statistics",
    "interval_hours": "{{count}} hour",
    "interval_hours_plural": "{{count}} hours",
    "filters_configuration": "Filters configuration",
@@ -578,8 +587,8 @@
    "show_blocked_responses": "Blocked",
    "show_whitelisted_responses": "Allowed",
    "show_processed_responses": "Processed",
-    "blocked_safebrowsing": "Blocked by Safebrowsing",
-    "blocked_adult_websites": "Blocked Adult Websites",
+    "blocked_safebrowsing": "Blocked by Safe Browsing",
+    "blocked_adult_websites": "Blocked by Parental Control",
    "blocked_threats": "Blocked Threats",
    "allowed": "Allowed",
    "filtered": "Filtered",
@@ -597,7 +606,7 @@
    "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",
-    "cache_optimistic": "Optimistic",
+    "cache_optimistic": "Optimistic caching",
    "cache_optimistic_desc": "Make AdGuard Home respond from the cache even when the entries are expired and also try to refresh them.",
    "filter_category_general": "General",
    "filter_category_security": "Security",
@@ -612,6 +621,11 @@
    "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"
+    "filter_allowlist": "WARNING: This action also will exclude the rule \"{{disallowed_rule}}\" from the list of allowed clients.",
+    "last_rule_in_allowlist": "Cannot disallow this client because excluding the rule \"{{disallowed_rule}}\" will DISABLE \"Allowed clients\" list.",
+    "experimental": "Experimental",
+    "use_saved_key": "Use the previously saved key",
+    "parental_control": "Parental Control",
+    "safe_browsing": "Safe Browsing",
+    "served_from_cache": "{{value}} <i>(served from cache)</i>"
 }
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Formato IP no válido",
-    "form_error_mac_format": "Formato MAC no válido",
-    "form_error_client_id_format": "Formato de ID de cliente no válido",
+    "form_error_ip4_format": "Dirección IPv4 no válida",
+    "form_error_ip4_range_start_format": "Dirección IPv4 no válida del inicio de rango",
+    "form_error_ip4_range_end_format": "Dirección IPv4 no válida del final de rango",
+    "form_error_ip4_gateway_format": "Dirección IPv4 no válida de la puerta de enlace",
+    "form_error_ip6_format": "Dirección IPv6 no válida",
+    "form_error_ip_format": "Dirección IP no válida",
+    "form_error_mac_format": "Dirección MAC no válida",
+    "form_error_client_id_format": "ID de cliente no válido",
    "form_error_server_name": "Nombre de servidor no válido",
    "form_error_subnet": "La subred \"{{cidr}}\" no contiene la dirección IP \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Debe estar fuera del rango \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Debe ser inferior que el inicio de rango",
+    "greater_range_start_error": "Debe ser mayor que el inicio de rango",
+    "greater_range_end_error": "Debe ser mayor que el final de rango",
+    "subnet_error": "Las direcciones deben estar en una subred",
+    "gateway_or_subnet_invalid": "Máscara de subred no válida",
    "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",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "URL o ruta absoluta no válida para la lista",
    "custom_filter_rules": "Reglas de filtrado personalizado",
    "custom_filter_rules_hint": "Ingresa una regla por línea. Puedes utilizar reglas de bloqueo o la sintaxis de los archivos hosts.",
+    "system_host_files": "Archivos hosts del sistema",
    "examples_title": "Ejemplos",
    "example_meaning_filter_block": "bloquea el acceso al dominio ejemplo.org y a todos sus subdominios",
    "example_meaning_filter_whitelist": "desbloquea el acceso al dominio ejemplo.org y a todos sus subdominios",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Servidores DNS de subida actualizados",
+    "updated_upstream_dns_toast": "Servidores DNS de subida guardados correctamente",
    "dns_test_ok_toast": "Los servidores DNS especificados funcionan correctamente",
    "dns_test_not_ok_toast": "Servidor \"{{key}}\": no se puede utilizar, por favor revisa si lo has escrito correctamente",
    "unblock": "Desbloquear",
@@ -235,7 +243,7 @@
    "loading_table_status": "Cargando...",
    "page_table_footer_text": "Página",
    "rows_table_footer_text": "filas",
-    "updated_custom_filtering_toast": "Reglas de filtrado personalizado actualizadas",
+    "updated_custom_filtering_toast": "Reglas personalizadas guardadas correctamente",
    "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}}",
    "query_log_response_status": "Estado: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Deberás configurar tus dispositivos o router para usar el servidor DNS en las siguientes direcciones:",
    "install_settings_all_interfaces": "Todas las interfaces",
    "install_auth_title": "Autenticación",
-    "install_auth_desc": "Se recomienda encarecidamente configurar la autenticación por contraseña para la interfaz web de administración de AdGuard Home. Incluso si solo es accesible en tu red local, es importante que estés protegido contra el acceso no autorizado.",
+    "install_auth_desc": "Debe configurarse la autenticación por contraseña para la interfaz web de administración de AdGuard Home. Incluso si AdGuard Home es accesible solo en tu red local, es importante protegerlo del acceso no autorizado.",
    "install_auth_username": "Usuario",
    "install_auth_password": "Contraseña",
    "install_auth_confirm": "Confirmar contraseña",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "¿Estás seguro de que deseas borrar las estadísticas?",
    "statistics_retention_confirm": "¿Estás seguro de que deseas cambiar la retención de estadísticas? Si disminuye el valor del intervalo, se perderán algunos datos",
    "statistics_cleared": "Estadísticas borradas correctamente",
+    "statistics_enable": "Habilitar estadísticas",
    "interval_hours": "{{count}} hora",
    "interval_hours_plural": "{{count}} horas",
    "filters_configuration": "Configuración de filtros",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "Permitido",
    "show_processed_responses": "Procesado",
    "blocked_safebrowsing": "Bloqueado por navegación segura",
-    "blocked_adult_websites": "Sitios web para adultos bloqueado",
+    "blocked_adult_websites": "Bloqueado por control parental",
    "blocked_threats": "Amenazas bloqueadas",
    "allowed": "Permitido",
    "filtered": "Filtrado",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Amplia el corto tiempo de vida de los valores recibidos del servidor DNS de subida al almacenar en caché las respuestas DNS",
    "cache_ttl_max_override_desc": "Establece un valor de tiempo de vida máximo para las entradas en la caché DNS",
    "ttl_cache_validation": "El valor TTL mínimo de la caché debe ser menor o igual al valor máximo",
-    "cache_optimistic": "Optimista",
+    "cache_optimistic": "Caché optimista",
    "cache_optimistic_desc": "Haz que AdGuard Home responda desde la caché incluso cuando las entradas estén expiradas y también intente actualizarlas.",
    "filter_category_general": "General",
    "filter_category_security": "Seguridad",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Clic para ver las consultas",
    "port_53_faq_link": "El puerto 53 suele estar ocupado por los servicios \"DNSStubListener\" o \"systemd-resolved\". Por favor lee <0>esta instrucción</0> sobre cómo resolver esto.",
    "adg_will_drop_dns_queries": "AdGuard Home descartará todas las consultas DNS de este cliente.",
-    "client_not_in_allowed_clients": "El cliente no está permitido porque no está en la lista de \"Clientes permitidos\".",
-    "experimental": "experimental"
+    "filter_allowlist": "ADVERTENCIA: Esta acción también excluirá la regla \"{{disallowed_rule}}\" de la lista de clientes permitidos.",
+    "last_rule_in_allowlist": "No se puede desautorizar a este cliente porque al excluir la regla \"{{disallowed_rule}}\" DESHABILITARÁ la lista de \"Clientes permitidos\".",
+    "experimental": "experimental",
+    "use_saved_key": "Usar la clave guardada previamente",
+    "parental_control": "Control parental",
+    "safe_browsing": "Navegación segura",
+    "served_from_cache": "{{value}} <i>(servido desde la caché)</i>"
 }
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -21,7 +21,6 @@
    "form_error_mac_format": "فرمت مَک نامعتبر است",
    "form_error_client_id_format": "فرمت شناسه کلاینت نامعتبر است",
    "form_error_positive": "باید بزرگتر از 0 باشد",
-    "form_error_negative": "باید برابر با 0 یا بزرگتر باشد",
    "dhcp_form_gateway_input": "آی پی دروازه",
    "dhcp_form_subnet_input": "ماسک زیر شبکه",
    "dhcp_form_range_title": "دامنه آدرس های آی پی",
@@ -160,7 +159,6 @@
    "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> resolvers استفاده کنید",
    "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}}\": نمیتواند مورد استفاده قرار گیرد،لطفا بررسی کنید آن را بدرستی نوشته اید",
    "unblock": "رفع انسداد",
@@ -206,8 +204,10 @@
    "custom_ip": "آی پی دستی",
    "blocking_ipv4": "مسدودسازی IPv4",
    "blocking_ipv6": "مسدودسازی IPv6",
+    "dnscrypt": "DNSCrypt",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
    "form_enter_rate_limit": "میزان محدودیت را وارد کنید",
    "rate_limit": "میزان محدودیت",
    "edns_enable": "فعالسازی زیرشبکه کلاینت EDNS",
@@ -399,6 +399,7 @@
    "encryption_key_source_content": "چسباندن محتوای کلید خصوصی",
    "stats_params": "پیکربندی آمار",
    "config_successfully_saved": "پیکربندی با موفقیت ذخیره شد",
+    "interval_6_hour": "6 ساعت",
    "interval_24_hour": "24 ساعت",
    "interval_days": "{{value}} روز",
    "interval_days_plural": "{{count}} روز",
@@ -409,7 +410,7 @@
    "statistics_configuration": "پیکربندی آمارها",
    "statistics_retention": "مدت حفظ آمارها",
    "statistics_retention_desc": "اگر مقدار فاصله را کاهش دهید،برخی داده ها از بین خواهد رفت",
-    "statistics_clear": " پاکسازی آمار",
+    "statistics_clear": "بازنشانی آمار",
    "statistics_clear_confirm": "آیا واقعا میخواهید آمار را پاک کنید؟",
    "statistics_retention_confirm": "آیا واقعا میخواهید مدت حفظ آمار را تغییر دهید؟ اگر فاصله را کاهش دهید، برخی داده ها حذف میشود",
    "statistics_cleared": "آمارها با موفقیت حذف شد",
@@ -439,8 +440,6 @@
    "domain_desc": "نامه دامنه یا علامت تطبیقی را برای بازنویسی وارد کنید.",
    "example_rewrite_domain": "فقط بازنویسی پاسخ برای این دامنه.",
    "example_rewrite_wildcard": "بازنویسی پاسخ ها برای همه زیردامنه های <0>example.org</0>.",
-    "disable_ipv6": "غیرفعالسازی IPv6",
-    "disable_ipv6_desc": "اگر این ویژگی فعال شده، همه جستارهای DNS برای آدرس های IPv6 (نوع AAAA) رها میشود.",
    "fastest_addr": "سریعترین آدرس آی پی",
    "autofix_warning_text": "اگر روی \"تعمیر\" کلیک کنید، AdGuardHome سیستم شما را برای استفاده از DNS سرور AdGuardHome پیکربندی می کند.",
    "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>",
@@ -478,12 +477,16 @@
    "show_whitelisted_responses": "لیست سفید",
    "show_processed_responses": "پردازش شده",
    "blocked_safebrowsing": "بستن وب گردی اَمن",
-    "blocked_adult_websites": "وبسایت غیراخلاقی مسدود شده",
+    "blocked_adult_websites": "مسدود شده با نظارت والدین",
    "blocked_threats": "تهدیدات مسدود شده",
    "allowed": "اجازه داده شده",
    "filtered": "فیلتر شده",
    "rewritten": "بازنویسی شده",
    "safe_search": "جستجوی اَمن",
    "blocklist": "لیست سیاه",
-    "milliseconds_abbreviation": "هـ ثـ"
+    "milliseconds_abbreviation": "هـ ثـ",
+    "filter_category_general": "General",
+    "filter_category_security": "مسدودسازی بدافزار و فیشینگ",
+    "filter_category_other": "ساير",
+    "parental_control": "نظارت والدین"
 }
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -0,0 +1,631 @@
+{
+    "client_settings": "Päätelaiteasetukset",
+    "example_upstream_reserved": "voit määrittää DNS-ylävirran <0>tietyille verkkotunnuksille</0>",
+    "example_upstream_comment": "voit määrittää kommentin",
+    "upstream_parallel": "Käytä rinnakkaisia pyyntöjä ja nopeuta selvitystä käyttämällä kaikkia ylävirran palvelimia samanaikaisesti.",
+    "parallel_requests": "Rinnakkaiset pyynnöt",
+    "load_balancing": "Kuormantasaus",
+    "load_balancing_desc": "Lähetä pyyntö yhdelle ylävirran palvelimelle kerrallaan. AdGuard Home pyrkii valitsemaan nopeimman palvelimen painotetun satunnaisalgoritminsa avulla.",
+    "bootstrap_dns": "Bootstrap DNS-palvelimet",
+    "bootstrap_dns_desc": "Bootstrap DNS-palvelimia käytetään ylävirroiksi määritettyjen DoH/DoT-resolvereiden IP-osoitteiden selvitykseen.",
+    "local_ptr_title": "Yksityiset käänteiset DNS-palvelimet",
+    "local_ptr_desc": "DNS-palvelimet, joita AdGuard Home käyttää paikallisille PTR-pyynnöille. Näitä palvelimia käytetään yksityistä IP-osoitetta käyttävien päätelaitteiden osoitteiden, kuten \"192.168.12.34\", selvitykseen käänteisen DNS:n avulla. Jos ei käytössä, käyttää AdGuard Home käyttöjärjestelmän oletusarvoisia DNS-resolvereita, poislukien AdGuard Homen omat osoitteet.",
+    "local_ptr_default_resolver": "Oletusarvoisesti AdGuard Home käyttää seuraavia käänteisiä DNS-resolvereita: {{ip}}.",
+    "local_ptr_no_default_resolver": "AdGuard Home ei voinut määrittää tälle järjestelmälle sopivaa yksityistä käänteistä DNS-resolveria.",
+    "local_ptr_placeholder": "Syötä yksi palvelimen osoite per rivi",
+    "resolve_clients_title": "Käytä päätelaitteiden IP-osoitteille käänteistä selvitystä",
+    "resolve_clients_desc": "Selvitä päätelaitteiden IP-osoitteiden isäntänimet käänteisesti lähettämällä PTR-kyselyt sopiville resolvereille (yksityiset DNS-palvelimet paikallisille päätelaitteille, lähtevät palvelimet päätelaitteille, joilla on julkiset IP-osoitteet).",
+    "use_private_ptr_resolvers_title": "Käytä yksityisiä käänteisiä DNS-resolvereita",
+    "use_private_ptr_resolvers_desc": "Suorita käänteiset DNS-selvitykset paikallisesti tarjotuille osoitteille käyttäen näitä ylävirran palvelimia. Jos ei käytössä, vastaa AdGuard Home kaikkiin sen tyyppisiin PTR-pyyntöihin NXDOMAIN-arvolla, pois lukien DHCP, /etc/hosts, yms. -tiedoista tunnistettut päätelaitteet.",
+    "check_dhcp_servers": "Etsi DHCP-palvelimia",
+    "save_config": "Tallenna asetukset",
+    "enabled_dhcp": "DHCP-palvelin otettiin käyttöön",
+    "disabled_dhcp": "DHCP-palvelin poistettiin käytöstä",
+    "unavailable_dhcp": "DHCP ei ole käytettävissä",
+    "unavailable_dhcp_desc": "AdGuard Home ei voi suorittaa DHCP-palvelinta käyttöjärjestelmässäsi",
+    "dhcp_title": "DHCP-palvelin (kokeellinen!)",
+    "dhcp_description": "Jos reitittimessäsi ei ole DHCP-asetuksia, voit käyttää AdGuard Homen omaa sisäänrakennettua DHCP-palvelinta.",
+    "dhcp_enable": "Ota DHCP-palvelin käyttöön",
+    "dhcp_disable": "Poista DHCP-palvelin käytöstä",
+    "dhcp_not_found": "On turvallista ottaa sisäänrakennettu DHCP-palvelin käyttöön, koska AdGuard Home ei havainnut verkossa muita aktiivisia DHCP-palvelimia. Suosittelemme, että varmistat tämän vielä itse, koska automaattinen tunnistus ei ole 100% varma.",
+    "dhcp_found": "Verkossa havaittiin aktiivinen DHCP-palvelin. Sisäänrakennetun DHCP-palvelimen käyttöönotto ei ole turvallista.",
+    "dhcp_leases": "DHCP-lainat",
+    "dhcp_static_leases": "Kiinteät DHCP-lainat",
+    "dhcp_leases_not_found": "DHCP-lainoja ei löytynyt",
+    "dhcp_config_saved": "DHCP-asetukset tallennettiin",
+    "dhcp_ipv4_settings": "DHCP:n IPv4-asetukset",
+    "dhcp_ipv6_settings": "DHCP:n IPv6-asetukset",
+    "form_error_required": "Vaaditaan",
+    "form_error_ip4_format": "Virheellinen IPv4-osoite",
+    "form_error_ip4_range_start_format": "Virheellinen IPv4-osoitealueen aloitusosoite",
+    "form_error_ip4_range_end_format": "Virheellinen IPv4-osoitealueen päätösosoite",
+    "form_error_ip4_gateway_format": "Virheellinen yhdyskäytävän IPv4-osoite",
+    "form_error_ip6_format": "Virheellinen IPv6-osoite",
+    "form_error_ip_format": "Virheellinen IP-osoite",
+    "form_error_mac_format": "Virheellinen MAC-osoite",
+    "form_error_client_id_format": "Virheellinen päätelaitteen ID",
+    "form_error_server_name": "Virheellinen palvelimen nimi",
+    "form_error_subnet": "Aliverkko \"{{cidr}}\" ei sisällä IP-osoitetta \"{{ip}}\"",
+    "form_error_positive": "Oltava suurempi kuin 0",
+    "out_of_range_error": "Oltava alueen \"{{start}}\"-\"{{end}}\" ulkopuolella",
+    "lower_range_start_error": "Oltava alueen aloitusarvoa pienempi",
+    "greater_range_start_error": "Oltava alueen aloitusarvoa suurempi",
+    "greater_range_end_error": "Oltava alueen päätösarvoa pienempi",
+    "subnet_error": "Osoitteiden tulee olla yhdessä aliverkossa",
+    "gateway_or_subnet_invalid": "Virheellinen aliverkon peite",
+    "dhcp_form_gateway_input": "Yhdyskäytävän IP-osoite",
+    "dhcp_form_subnet_input": "Aliverkon peite",
+    "dhcp_form_range_title": "IP-osoitealue",
+    "dhcp_form_range_start": "Alueen aloitus",
+    "dhcp_form_range_end": "Alueen päätös",
+    "dhcp_form_lease_title": "DHCP-lainan kesto (sekunteina)",
+    "dhcp_form_lease_input": "Lainan kesto",
+    "dhcp_interface_select": "Valitse DHCP:lle käytettävä verkkosovitin",
+    "dhcp_hardware_address": "Laiteosoite (MAC)",
+    "dhcp_ip_addresses": "IP-osoitteet",
+    "ip": "IP",
+    "dhcp_table_hostname": "Isäntänimi",
+    "dhcp_table_expires": "Erääntyy",
+    "dhcp_warning": "Jos tahdot kuitenkin ottaa DHCP-palvelimen käyttöön, varmista, ettei verkossasi ole muita aktiivisia DHCP-palvelimia, koska tämä voi rikkoa Internet-yhteyden muilta verkon laitteilta!",
+    "dhcp_error": "AdGuard Home ei voinut tunnistaa, onko verkossa toista aktiivista DHCP-palvelinta.",
+    "dhcp_static_ip_error": "Jotta DHCP-palvelinta voidaan käyttää, on määritettävä kiinteä IP-osoite. AdGuard Home ei voinut tunnistaa, onko tälle verkkosovittimelle määritetty IP-osoite kiinteä. Määritä kiinteä IP-osoite itse.",
+    "dhcp_dynamic_ip_found": "Järjestelmäsi käyttää verkkosovittimelle <0>{{interfaceName}}</0> dynaamista IP-osoitetta. Jotta voit käyttää DHCP-palvelinta, on sovittimelle määritettävä kiinteä IP-osoite. Nykyinen IP-osoitteesi on <0>{{ipAddress}}</0>. Tämä osoite määritetään automaattisesti kiinteäksi, jos painat \"Ota DHCP-palvelin käyttöön\" -painiketta.",
+    "dhcp_lease_added": "Kiinteä laina \"{{key}}\" on lisätty",
+    "dhcp_lease_deleted": "Kiinteä laina \"{{key}}\" poistettiin",
+    "dhcp_new_static_lease": "Uusi kiinteä laina",
+    "dhcp_static_leases_not_found": "Kiinteitä DHCP-lainoja ei löytynyt",
+    "dhcp_add_static_lease": "Lisää kiinteä laina",
+    "dhcp_reset_leases": "Tyhjennä kaikki lainat",
+    "dhcp_reset_leases_confirm": "Haluatko varmasti tyhjentää kaikki lainat?",
+    "dhcp_reset_leases_success": "DHCP-lainat tyhjennettiin",
+    "dhcp_reset": "Haluatko varmasti palauttaa DHCP-asetukset?",
+    "country": "Maa",
+    "city": "Kaupunki",
+    "delete_confirm": "Haluatko varmasti poistaa kohteen \"{{key}}\"?",
+    "form_enter_hostname": "Syötä isäntänimi",
+    "error_details": "Virheen tiedot",
+    "response_details": "Vastauksen tiedot",
+    "request_details": "Pyynnön tiedot",
+    "client_details": "Päätelaitteen tiedot",
+    "details": "Tiedot",
+    "back": "Takaisin",
+    "dashboard": "Tila",
+    "settings": "Asetukset",
+    "filters": "Suodattimet",
+    "filter": "Suodatin",
+    "query_log": "Pyyntöhistoria",
+    "compact": "Tiivis",
+    "nothing_found": "Ei tuloksia",
+    "faq": "UKK",
+    "version": "Versio",
+    "address": "Osoite",
+    "protocol": "Protokolla",
+    "on": "Käytössä",
+    "off": "Ei käytössä",
+    "copyright": "Tekijänoikeus",
+    "homepage": "Verkkosivusto",
+    "report_an_issue": "Ilmoita ongelmasta",
+    "privacy_policy": "Tietosuojakäytäntö",
+    "enable_protection": "Ota suojaus käyttöön",
+    "enabled_protection": "Suojaus otettiin käyttöön",
+    "disable_protection": "Poista suojaus käytöstä",
+    "disabled_protection": "Suojaus poistettiin käytöstä",
+    "refresh_statics": "Päivitä tilastot",
+    "dns_query": "DNS-pyyntöä",
+    "blocked_by": "<0>Suodatinten estämää</0>",
+    "stats_malware_phishing": "Estetyt haittaohjelmat/tietojenkalastelut",
+    "stats_adult": "Estetyt aikuisille tarkoitetut sivustot",
+    "stats_query_domain": "Kysytyimmät verkkotunnukset",
+    "for_last_24_hours": "viimeisten 24 tunnin ajalta",
+    "for_last_days": "viimeisen {{count}} päivän ajalta",
+    "for_last_days_plural": "viimeisten {{count}} päivän ajalta",
+    "stats_disabled": "Tilastointi ei ole käytössä. Voit ottaa sen käyttöön <0>asetuksista</0>.",
+    "stats_disabled_short": "Tilastointi ei ole käytössä",
+    "no_domains_found": "Verkkotunnuksia ei löytynyt",
+    "requests_count": "Pyyntöjen määrä",
+    "top_blocked_domains": "Estetyimmät verkkotunnukset",
+    "top_clients": "Käytetyimmät päätelaitteet",
+    "no_clients_found": "Päätelaitteita ei löytynyt",
+    "general_statistics": "Yleiset tilastot",
+    "number_of_dns_query_days": "Käsiteltyjen DNS-pyyntöjen määrä viimeisen {{count}} päivän ajalta",
+    "number_of_dns_query_days_plural": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten {{count}} päivän ajalta",
+    "number_of_dns_query_24_hours": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten 24 tunnin ajalta",
+    "number_of_dns_query_blocked_24_hours": "Mainoseston suodattimien ja hosts-estolistojen estämien DNS-pyyntöjen määrä",
+    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuardin Turvallinen selaus -moduulin estämien DNS-pyyntöjen määrä",
+    "number_of_dns_query_blocked_24_hours_adult": "Estettyjen aikuisille tarkoitettujen sivustojen määrä",
+    "enforced_save_search": "Turvallinen haku pakotettiin",
+    "number_of_dns_query_to_safe_search": "DNS-pyyntöjen määrä, joille turvallinen haku pakotettiin käyttöön",
+    "average_processing_time": "Keskimääräinen käsittelyaika",
+    "average_processing_time_hint": "Keskimääräinen DNS-pyynnön käsittelyyn kulutettu aika millisekunteina",
+    "block_domain_use_filters_and_hosts": "Estä verkkotunnuksia suodattimilla ja hosts-tiedostoilla",
+    "filters_block_toggle_hint": "Voit määrittää estosääntöjä <a>suodatinasetuksissa</a>.",
+    "use_adguard_browsing_sec": "Käytä AdGuardin turvallisen selauksen palvelua",
+    "use_adguard_browsing_sec_hint": "AdGuard Home tarkistaa onko verkkotunnus turvallisen selauksen verkkopalvelun estämä. Se käyttää tarkastukseen tietosuojapainotteista rajapintaa: palvelimelle lähetetään vain pieni osa verkkotunnuksen SHA256-hajautusarvosta.",
+    "use_adguard_parental": "Käytä AdGuardin lapsilukko-palvelua",
+    "use_adguard_parental_hint": "AdGuard Home tarkistaa, sisältääkö verkkotunnus aikuisille tarkoitettua sisältöä. Se käyttää samaa tietosuojapainotteista rajapintaa, kuin turvallisen selauksen palvelu.",
+    "enforce_safe_search": "Pakota turvallinen haku",
+    "enforce_save_search_hint": "AdGuard Home voi pakottaa turvallisen haun käyttöön seuraavissa hakukoneissa: Google, YouTube, Bing, DuckDuckGo, Yandex, Pixabay.",
+    "no_servers_specified": "Palvelimia ei ole määritetty",
+    "general_settings": "Yleiset asetukset",
+    "dns_settings": "DNS-asetukset",
+    "dns_blocklists": "DNS-estolistat",
+    "dns_allowlists": "DNS-sallittujen listat",
+    "dns_blocklists_desc": "AdGuard Home estää estolistalla olevat verkkotunnukset.",
+    "dns_allowlists_desc": "DNS-sallittujen listalla olevat verkkotunnukset sallitaan myös silloin, jos ne ovat jollain muulla estolistalla.",
+    "custom_filtering_rules": "Omat suodatussäännöt",
+    "encryption_settings": "Salausasetukset",
+    "dhcp_settings": "DHCP-asetukset",
+    "upstream_dns": "Ylävirran DNS-palvelimet",
+    "upstream_dns_help": "Syötä yksi palvelinosoite per rivi. <a>Lue lisää</a> ylävirran DNS-palvelinten määrityksestä.",
+    "upstream_dns_configured_in_file": "Määritetty tiedostossa {{path}}",
+    "test_upstream_btn": "Testaa ylävirtoja",
+    "upstreams": "Ylävirrat",
+    "apply_btn": "Käytä",
+    "disabled_filtering_toast": "Suodatus poistettiin käytöstä",
+    "enabled_filtering_toast": "Suodatus otettiin käyttöön",
+    "disabled_safe_browsing_toast": "Turvallinen selaus poistettiin käytöstä",
+    "enabled_safe_browsing_toast": "Turvallinen selaus otettiin käyttöön",
+    "disabled_parental_toast": "Lapsilukko poistettiin käytöstä",
+    "enabled_parental_toast": "Lapsilukko otettiin käyttöön",
+    "disabled_safe_search_toast": "Turvallinen haku poistettiin käytöstä",
+    "enabled_save_search_toast": "Turvallinen haku otettiin käyttöön",
+    "enabled_table_header": "Käytössä",
+    "name_table_header": "Nimi",
+    "list_url_table_header": "Listan URL",
+    "rules_count_table_header": "Sääntöjä",
+    "last_time_updated_table_header": "Viimeisin päivitys",
+    "actions_table_header": "Toiminnot",
+    "request_table_header": "Pyyntö",
+    "edit_table_action": "Muokkaa",
+    "delete_table_action": "Poista",
+    "elapsed": "Kesto",
+    "filters_and_hosts_hint": "AdGuard Home ymmärtää mainoseston perussääntöjen sekä hosts-tiedostojen syntakseja.",
+    "no_blocklist_added": "Estolistoja ei ole lisätty",
+    "no_whitelist_added": "Sallittujen listoja ei ole lisätty",
+    "add_blocklist": "Lisää estolista",
+    "add_allowlist": "Lisää sallittujen lista",
+    "cancel_btn": "Peruuta",
+    "enter_name_hint": "Syötä nimi",
+    "enter_url_or_path_hint": "Syötä listan URL-osoite tai tarkka tiedostosijainti",
+    "check_updates_btn": "Tarkista päivitykset",
+    "new_blocklist": "Uusi estolista",
+    "new_allowlist": "Uusi sallittujen lista",
+    "edit_blocklist": "Muokkaa estolistaa",
+    "edit_allowlist": "Muokkaa sallittujen listaa",
+    "choose_blocklist": "Valitse estolistat",
+    "choose_allowlist": "Valitse sallittujen listat",
+    "enter_valid_blocklist": "Syötä estolistan URL-osoite.",
+    "enter_valid_allowlist": "Syötä sallittujen listan URL-osoite.",
+    "form_error_url_format": "Virheellinen URL-osoitteen muoto",
+    "form_error_url_or_path_format": "Syötä listan URL-osoite tai tarkka tiedostosijainti",
+    "custom_filter_rules": "Omat suodatussäännöt",
+    "custom_filter_rules_hint": "Syötä yksi sääntö per rivi. Voit käyttää mainoseston sääntöjen tai hosts-tiedostojen syntakseja.",
+    "system_host_files": "Järjestelmän hosts-tiedostot",
+    "examples_title": "Esimerkkejä",
+    "example_meaning_filter_block": "estä pääsy verkkotunnukseen example.org ja sen aliverkkotunnuksiin",
+    "example_meaning_filter_whitelist": "salli pääsy verkkotunnukseen example.org ja sen aliverkkotunnuksiin",
+    "example_meaning_host_block": "AdGuard Home palauttaa verkkotunnukselle example.org osoitteen 127.0.0.1 (muttei sen aliverkkotunnuksille)",
+    "example_comment": "! Tähän tulee kommentti",
+    "example_comment_meaning": "voit määrittää kommentin",
+    "example_comment_hash": "# Myös tämä on kommentti",
+    "example_regex_meaning": "estä pääsy säännöllistä lauseketta vastaaviin verkkotunnuksiin",
+    "example_upstream_regular": "tavallinen DNS (UDP)",
+    "example_upstream_dot": "salattu <0>DNS-over-TLS</0>",
+    "example_upstream_doh": "salattu <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "salattu <0>DNS-over-QUIC</0>",
+    "example_upstream_sdns": "voit käyttää <0>DNS Stamp</0> -merkintöjä <1>DNSCrypt</1> tai <2>DNS-over-HTTPS</2> -resolvereille",
+    "example_upstream_tcp": "tavallinen DNS (TCP)",
+    "all_lists_up_to_date_toast": "Kaikki listat ovat ajan tasalla",
+    "updated_upstream_dns_toast": "Ylävirtojen palvelimet tallennettiin",
+    "dns_test_ok_toast": "Määritetyt DNS-palvelimet toimivat oikein",
+    "dns_test_not_ok_toast": "Palvelin \"{{key}}\": ei voitu käyttää, tarkista sen oikeinkirjoitus",
+    "unblock": "Salli",
+    "block": "Estä",
+    "disallow_this_client": "Estä tämä päätelaite",
+    "allow_this_client": "Salli tämä päätelaite",
+    "block_for_this_client_only": "Estä vain tältä päätelaitteelta",
+    "unblock_for_this_client_only": "Salli vain tälle päätelaitteelle",
+    "time_table_header": "Aika",
+    "date": "Päiväys",
+    "domain_name_table_header": "Verkkotunnus",
+    "domain_or_client": "Verkkotunnus tai päätelaite",
+    "type_table_header": "Tyyppi",
+    "response_table_header": "Vastaus",
+    "response_code": "Vastauksen koodi",
+    "client_table_header": "Asiakas",
+    "empty_response_status": "Tyhjä",
+    "show_all_filter_type": "Näytä kaikki",
+    "show_filtered_type": "Näytä suodatetut",
+    "no_logs_found": "Historiatietoja ei ole",
+    "refresh_btn": "Päivitä",
+    "previous_btn": "Edellinen",
+    "next_btn": "Seuraava",
+    "loading_table_status": "Ladataan...",
+    "page_table_footer_text": "Sivu",
+    "rows_table_footer_text": "riviä",
+    "updated_custom_filtering_toast": "Omat suodatussäännöt päivitettiin",
+    "rule_removed_from_custom_filtering_toast": "Sääntö poistettiin omista suodatussäännöistä: {{rule}}",
+    "rule_added_to_custom_filtering_toast": "Sääntö lisättiin omiin suodatussääntöihin: {{rule}}",
+    "query_log_response_status": "Tila: {{value}}",
+    "query_log_filtered": "Suodattanut {{filter}}",
+    "query_log_confirm_clear": "Haluatko varmasti tyhjentää pyyntöhistorian?",
+    "query_log_cleared": "Pyyntöhistoria tyhjennettiin",
+    "query_log_updated": "Pyyntöhistoria päivitettiin",
+    "query_log_clear": "Tyhjennä pyyntöhistoria",
+    "query_log_retention": "Pyyntöhistorian säilytys",
+    "query_log_enable": "Käytä historiaa",
+    "query_log_configuration": "Historian määritys",
+    "query_log_disabled": "Pyyntöhistoria ei ole käytössä. Voit ottaa sen käyttöön <0>asetuksissa</0>",
+    "query_log_strict_search": "Käytä tarkalle haulle lainausmerkkejä",
+    "query_log_retention_confirm": "Haluatko varmasti muuttaa pyyntöhistoriasi säilytysaikaa? Jos lyhennät aikaa, joitakin tietoja menetetään",
+    "anonymize_client_ip": "Piilota päätelaitteen IP-osoite",
+    "anonymize_client_ip_desc": "Älä tallenna päätelaitteen täydellistä IP-osoitetta historiaan ja tilastoihin",
+    "dns_config": "DNS-palvelimen määritys",
+    "dns_cache_config": "DNS-välimuistin määritys",
+    "dns_cache_config_desc": "Täällä voit määrittää DNS-välimuistin asetukset",
+    "blocking_mode": "Estotila",
+    "default": "Oletus",
+    "nxdomain": "NXDOMAIN",
+    "refused": "REFUSED",
+    "null_ip": "Tyhjä IP",
+    "custom_ip": "Oma IP",
+    "blocking_ipv4": "IPv4-esto",
+    "blocking_ipv6": "IPv6-esto",
+    "dnscrypt": "DNSCrypt",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
+    "client_id": "Päätelaitteen ID",
+    "client_id_placeholder": "Syötä päätelaitteen ID",
+    "client_id_desc": "Eri päätelaitteet voidaan tunnistaa erityisillä tunnisteilla. <a>Täältä</a> löydät lisätietoja päätelaitteiden tunnistuksesta.",
+    "download_mobileconfig_doh": "Lataa .mobileconfig-tiedosto DNS-over-HTTPS -käytölle",
+    "download_mobileconfig_dot": "Lataa .mobileconfig-tiedosto DNS-over-TLS -käytölle",
+    "download_mobileconfig": "Lataa asetustiedosto",
+    "plain_dns": "Tavallinen DNS",
+    "form_enter_rate_limit": "Syötä rajoitus",
+    "rate_limit": "Pyyntöjen ajoitus",
+    "edns_enable": "Käytä EDNS-päätelaitealivekkoa",
+    "edns_cs_desc": "Lähetä päätelaitteiden aliverkot DNS-palvelimille.",
+    "rate_limit_desc": "Päätelaitteelle sallittu pyyntöjen enimmäismäärä sekunnissa. Arvo 0 tarkoittaa rajatonta.",
+    "blocking_ipv4_desc": "Estettyyn A-pyyntöön palautettava IP-osoite",
+    "blocking_ipv6_desc": "Estettyyn AAAA-pyyntöön palautettava IP-osoite",
+    "blocking_mode_default": "Oletus: Vastaa IP-nollaosoitteella (0.0.0.0 korvaa A; :: korvaa AAAA) kun estetään mainoseston säännöllä; vastaa säännön määrittämällä IP-osoitteella kun estetään /etc/hosts-tyyppisellä säännöllä",
+    "blocking_mode_refused": "REFUSED: Vastaa REFUSED-koodilla",
+    "blocking_mode_nxdomain": "NXDOMAIN: Vastaa NXDOMAIN-koodilla",
+    "blocking_mode_null_ip": "Tyhjä IP: Vastaa IP-nollaosoitteella (0.0.0.0 korvaa A; :: korvaa AAAA)",
+    "blocking_mode_custom_ip": "Oma IP: Vastaa itse määritetyllä IP-osoitteella",
+    "upstream_dns_client_desc": "Jos tämä on tyhjä, käyttää AdGuard Home <0>DNS-asetuksissa</0> määritettyjä palvelimia.",
+    "tracker_source": "Seurannan lähde",
+    "source_label": "Lähde",
+    "found_in_known_domain_db": "Löytyi tunnettujen verkkotunnusten tietokannasta.",
+    "category_label": "Luokitus",
+    "rule_label": "Säännöt",
+    "list_label": "Lista",
+    "unknown_filter": "Tuntematon suodatin {{filterId}}",
+    "known_tracker": "Tunnettu seuranta",
+    "install_welcome_title": "Tervetuloa AdGuard Homeen!",
+    "install_welcome_desc": "AdGuard Home on verkonlaajuinen mainoksia ja seurantoja estävä DNS-palvelin. Sen tarkoitus on mahdollistaa verkon sekä siihen liitettyjen laitteiden hallinta ja valvonta, eikä se vaadi asiakasohjelmistojen asennusta päätelaitteille.",
+    "install_settings_title": "Hallintapaneeli",
+    "install_settings_listen": "Käytettävä verkkosovitin",
+    "install_settings_port": "Portti",
+    "install_settings_interface_link": "AdGuard Home -asennuksesi hallintapaneeli on käytettävissä seuraavilla osoitteilla:",
+    "form_error_port": "Syötä oikea portin numero",
+    "install_settings_dns": "DNS-palvelin",
+    "install_settings_dns_desc": "Sinun on määritettävä laitteesi tai reitittimesi käyttämään DNS-palvelinta seuraavissa osoitteissa:",
+    "install_settings_all_interfaces": "Kaikki verkkosovittimet",
+    "install_auth_title": "Tunnistautuminen",
+    "install_auth_desc": "AdGuard Homen hallinnalle on määritettävä salasanasuojaus. Vaikka se olisikin tavoitettavissa vain lähiverkon välityksellä, on silti tärkeää suojata se luvattomalta käytöltä.",
+    "install_auth_username": "Käyttäjätunnus",
+    "install_auth_password": "Salasana",
+    "install_auth_confirm": "Vahvista salasana",
+    "install_auth_username_enter": "Syötä käyttäjätunnus",
+    "install_auth_password_enter": "Syötä salasana",
+    "install_step": "Vaihe",
+    "install_devices_title": "Määritä laitteet",
+    "install_devices_desc": "AdGuard Homen käytön aloittamiseksi, on laitteet määritettävä käyttämään sitä.",
+    "install_submit_title": "Onnittelut!",
+    "install_submit_desc": "Asennus on valmis ja AdGuard Home on valmis käyttöön.",
+    "install_devices_router": "Reititin",
+    "install_devices_router_desc": "Asennus kattaa kaikki reitittimeen liitetyt laitteet, eikä niitä tarvitse määrittää erikseen yksitellen.",
+    "install_devices_address": "AdGuard Homen DNS-palvelin kuuntelee seuraavissa osoitteissa",
+    "install_devices_router_list_1": "Avaa reitittimesi hallinta. Yleensä se avautuu selaimen kautta, URL-osoitteella, kuten http://192.168.0.1 tai http://192.168.1.1. Saatat joutua syöttämään käyttäjätunnuksen ja salasanan. Jos et muista tai tiedä sitä, voit yleensä palauttaa salasanan (ja kaikki muut!) reitittimen asetukset oletusarvoihin painamalla laitteessa olevaa reset-painiketta muutaman sekunnin ajan. Jos reitittimen määritys vaatii erillisen sovelluksen käyttöä, asenna se mobiililaitteelle tai tietokoneelle ja käytä reitittimen hallintaa sen kautta. Tutustu reitittimen käyttöoppaaseen.",
+    "install_devices_router_list_2": "Etsi DHCP/DNS-asetukset. Etsi kirjainyhdistelmää DNS sellaisen kenttien vierestä, joihin voidaan syöttää kaksi tai kolme numerosarjaa, joista jokainen on eroteltu neljään ryhmään, joista jokainen sisältää yhdestä kolmeen numeroa.",
+    "install_devices_router_list_3": "Syötä sinne AdGuard Home -palvelimesi osoitteet.",
+    "install_devices_router_list_4": "Joissakin reitittimissä ei ole mahdollista määrittää omaa DNS-palvelinta. Tällöin AdGuard Homen määritys <0>DHCP-palvelimeksi</0> voi auttaa. Muutoin on selvitettävä reitittimen käyttöohjeesta, miten sen DNS-palvelinasetukset muutetaan.",
+    "install_devices_windows_list_1": "Avaa \"Ohjauspaneeli\" Käynnistä-valikon tai Windowsin haun kautta.",
+    "install_devices_windows_list_2": "Avaa \"Verkko ja Internet\" -ryhmä ja sitten \"Verkko ja jakamiskeskus\".",
+    "install_devices_windows_list_3": "Etsi ikkunan vasemmasta laidasta \"Muuta sovittimen asetuksia\" ja paina sitä.",
+    "install_devices_windows_list_4": "Valitse aktiivinen yhteytesi, paina sitä hiiren kakkospainikkeella ja valitse valikosta \"Ominaisuudet\".",
+    "install_devices_windows_list_5": "Etsi listasta \"Internet protokolla versio 4 (TCP/IP)\", valitse se ja paina jälleen \"Ominaisuudet\".",
+    "install_devices_windows_list_6": "Valitse \"Käytä seuraavia DNS-palvelinten osoitteita\" ja syötä AdGuard Home -palvelimesi osoitteet.",
+    "install_devices_macos_list_1": "Avaa Omenavalikko ja valitse \"Järjestelmäasetukset \".",
+    "install_devices_macos_list_2": "Paina \"Verkko\".",
+    "install_devices_macos_list_3": "Valitse listan ensimmäinen yhteys ja paina \"Lisävalinnat\".",
+    "install_devices_macos_list_4": "Valitse DNS-välilehti ja syötä AdGuard Home -palvelimesi osoitteet.",
+    "install_devices_android_list_1": "Napauta Android-laitteesi aloitusnäytöstä tai sovellusvalikosta \"Asetukset\".",
+    "install_devices_android_list_2": "Napauta \"Yhteydet\" ja sitten \"Wi-Fi\". Näytetään kaikki käytettävissä olevat langattomat verkot (mobiiliverkolle ei ole mahdollista määrittää omaa DNS-palvelinta).",
+    "install_devices_android_list_3": "Napauta yhdistetyn verkon vieressä olevaa asetuskuvaketta tai paina verkkoa pitkään ja valitse \"Muokkaa verkkoa\".",
+    "install_devices_android_list_4": "Saatat joutua napauttamaan \"Lisäasetukset\" nähdäksesi lisää valintoja. Muuttaaksesi DNS-asetuksia, on \"IP-asetukset\" -kohdan \"DHCP\" -valinta vaihdettava \"Staattinen\" -valintaan.",
+    "install_devices_android_list_5": "Syötä \"DNS 1\" ja \"DNS 2\" -kenttiin AdGuard Home -palvelimesi osoitteet.",
+    "install_devices_ios_list_1": "Napauta aloitusnäytöstä \"Asetukset\".",
+    "install_devices_ios_list_2": "Valitse vasemmalta \"Wi-Fi\" (mobiiliverkolle ei ole mahdollista määrittää omaa DNS-palvelinta).",
+    "install_devices_ios_list_3": "Valitse yhdistetty verkko.",
+    "install_devices_ios_list_4": "Syötä \"DNS\" -kenttään AdGuard Home -palvelimesi osoitteet.",
+    "get_started": "Aloita",
+    "next": "Seuraava",
+    "open_dashboard": "Avaa hallintapaneeli",
+    "install_saved": "Tallenus onnistui",
+    "encryption_title": "Salaus",
+    "encryption_desc": "Salaus (HTTPS/TLS) DNS-palvelimelle ja selaimen hallintasivulle",
+    "encryption_config_saved": "Salausasetukset tallennettiin",
+    "encryption_server": "Palvelimen nimi",
+    "encryption_server_enter": "Syötä verkkotunnuksesi",
+    "encryption_server_desc": "HTTPS-yhteyden käyttöä varten, on syötettävä SSL- tai jokerivarmennetta vastaava palvelimen nimi. Jos kenttä on tyhjä, sallitaan kaikkien verkkotunnusten TLS-yhteydet.",
+    "encryption_redirect": "Automaattinen HTTPS-ohjaus",
+    "encryption_redirect_desc": "Jos käytössä, AdGuard Home ohjaa HTTP-osoitteet automaattisesti HTTPS-osoitteisiin.",
+    "encryption_https": "HTTPS-portti",
+    "encryption_https_desc": "Jos HTTPS-portti on määritetty, on AdGuard Homen hallintapaneeli käytettävissä HTTPS-yhteydellä ja lisäksi tämä mahdollistaa myös DNS-over-HTTPS -yhteyden '/dns-query' -kohteessa.",
+    "encryption_dot": "DNS-over-TLS -portti",
+    "encryption_dot_desc": "Jos portti on määritetty, AdGuard Home suorittaa DNS-over-TLS -palvelimen tässä portissa.",
+    "encryption_doq": "DNS-over-QUIC -portti",
+    "encryption_doq_desc": "Jos portti on määritetty, AdGuard Home suorittaa DNS-over-QUIC -palvelimen tässä portissa. Ominaisuus on kokeellinen, eikä välttämättä luotettava. Lisäksi tätä tukevia päätelaitteita ei vielä ole kovin paljon.",
+    "encryption_certificates": "Varmenteet",
+    "encryption_certificates_desc": "Salauksen käyttämiseksi, on syötettävä verkkotunnuksellesi myönnetty, aito SSL-varmenneketju. Voit hankkia ilmaisen varmenteen osoitteesta <0>{{link}}</0> tai ostaa sellaisen joltakin luotetulta varmentajalta.",
+    "encryption_certificates_input": "Kopioi/liitä PEM-koodatut varmenteesi tähän.",
+    "encryption_status": "Tila",
+    "encryption_expire": "Erääntyy",
+    "encryption_key": "Yksityinen avain",
+    "encryption_key_input": "Kopioi/liitä tähän varmenteesi PEM-koodattu yksityinen avain.",
+    "encryption_enable": "Käytä salausta (HTTPS, DNS-over-HTTPS ja DNS-over-TLS)",
+    "encryption_enable_desc": "Jos salaus on käytössä, AdGuard Homen hallinta on käytettävissä HTTPS-yhteydellä ja DNS-palvelin kuuntelee pyyntöjä DNS-over-HTTPS ja DNS-over-TLS -yhteyksillä.",
+    "encryption_chain_valid": "Varmenneketju on pätevä",
+    "encryption_chain_invalid": "Varmenneketju ei kelpaa",
+    "encryption_key_valid": "Yksityinen {{type}}-avain on pätevä",
+    "encryption_key_invalid": "Yksityinen {{type}}-avain ei kelpaa",
+    "encryption_subject": "Aihe",
+    "encryption_issuer": "Toimittaja",
+    "encryption_hostnames": "Isäntänimet",
+    "encryption_reset": "Haluatko varmasti palauttaa salausasetukset?",
+    "topline_expiring_certificate": "SSL-varmenteesi on erääntymässä. Päivitä <0>Salausasetukset</0>.",
+    "topline_expired_certificate": "SSL-varmenteesi on erääntynyt. Päivitä <0>Salausasetukset</0>.",
+    "form_error_port_range": "Syötä portti väliltä 80-65535",
+    "form_error_port_unsafe": "Tämä portti ei ole turvallinen",
+    "form_error_equal": "Ei voi olla sama",
+    "form_error_password": "Salasanat eivät täsmää",
+    "reset_settings": "Tyhjennä asetukset",
+    "update_announcement": "AdGuard Home {{version}} on nyt saatavilla! <0>Paina tästä</0> saadaksesi lisätietoja.",
+    "setup_guide": "Asennusopas",
+    "dns_addresses": "DNS-osoitteet",
+    "dns_start": "DNS-palvelin käynnistyy",
+    "dns_status_error": "Virhe tarkistettaessa DNS-palvelimen tilaa",
+    "down": "yhteydetön",
+    "fix": "Korjaa",
+    "dns_providers": "Katso <0>luettelo tunnetuista DNS-palveluista</0>, joista valita.",
+    "update_now": "Päivitä nyt",
+    "update_failed": "Automaattinen päivitys epäonnistui. Seuraa <a>näitä ohjeita</a> päivittääksesi manuaalisesti.",
+    "processing_update": "Odota kun AdGuard Home päivittyy",
+    "clients_title": "Päätelaitteet",
+    "clients_desc": "Määritä AdGuard Homeen yhdistetyt päätelaitteet",
+    "settings_global": "Yleinen",
+    "settings_custom": "Oma",
+    "table_client": "Päätelaite",
+    "table_name": "Nimi",
+    "save_btn": "Tallenna",
+    "client_add": "Lisää päätelaite",
+    "client_new": "Uusi päätelaite",
+    "client_edit": "Muokkaa päätelaitetta",
+    "client_identifier": "Tunniste",
+    "ip_address": "IP-osoite",
+    "client_identifier_desc": "Päätelaitteet voidaan tunnistaa IP-osoitteista, CIDR-merkinnöistä, MAC-osoitteista tai erityisistä päätelaitteen ID-tunnisteista (voidaan käyttää DoT/DoH/DoQ kanssa). <0>Täältä</0> voit lukea lisää päätelaitteiden tunnistuksesta.",
+    "form_enter_ip": "Syötä IP-osoite",
+    "form_enter_subnet_ip": "Syötä IP-osoite aliverkkoon \"{{cidr}}\"",
+    "form_enter_mac": "Syötä MAC-osoite",
+    "form_enter_id": "Muokkaa tunnistetta",
+    "form_add_id": "Lisää tunniste",
+    "form_client_name": "Syötä päätelaitteen nimi",
+    "name": "Nimi",
+    "client_global_settings": "Käytä yleisiä asetuksia",
+    "client_deleted": "Päätelaite \"{{key}}\" poistettiin",
+    "client_added": "Päätelaite \"{{key}}\" lisättiin",
+    "client_updated": "Päätelaite \"{{key}}\" päivitettiin",
+    "clients_not_found": "Päätelaitteita ei löytynyt",
+    "client_confirm_delete": "Haluatko varmasti poistaa päätelaitteen \"{{key}}\"?",
+    "list_confirm_delete": "Haluatko varmasti poistaa tämän listan?",
+    "auto_clients_title": "Päätelaitteet (määrittämättömät)",
+    "auto_clients_desc": "Tiedot niistä AdGuard Homea käyttävistä päätelaitteista, joita ei ole määritetty asetuksissa",
+    "access_title": "Käytön asetukset",
+    "access_desc": "Tässä voidaan määrittää AdGuard Homen DNS-palvelimen käyttöoikeussääntöjä.",
+    "access_allowed_title": "Sallitut päätelaitteet",
+    "access_allowed_desc": "Lista CIDR-merkinnöistä, IP-osoitteista tai päätelaitteiden ID-tunnisteista. Jos määritetty, hyväksyy AdGuard Home pyyntöjä vain näiltä päätelaitteilta.",
+    "access_disallowed_title": "Kielletyt päätelaitteet",
+    "access_disallowed_desc": "Lista CIDR-merkinnöistä, IP-osoitteista tai päätelaitteiden ID-tunnisteista. Jos määritetty, hylkää AdGuard Home näiden päätelaitteiden pyynnöt. Tätä kenttää ei huomioida, jos sallittuja päätelaitteita on määritetty.",
+    "access_blocked_title": "Kielletyt verkkotunnukset",
+    "access_blocked_desc": "Ei pidä sekoittaa suodattimiin. AdGuard Home hylkää näiden verkkotunnusten DNS-pyynnöt, eivätkä nämä pyynnöt näy edes pyyntöhistoriassa. Tähän voidaan syöttää tarkkoja verkkotunnuksia, jokerimerkkejä tai URL-suodatussääntöjä, kuten \"example.org\", \"*.example.org\" tai \"||example.org^\".",
+    "access_settings_saved": "Käytön asetukset tallennettiin",
+    "updates_checked": "Päivitykset tarkastettiin",
+    "updates_version_equal": "AdGuard Home on ajan tasalla",
+    "check_updates_now": "Tarkista päivitykset nyt",
+    "dns_privacy": "DNS-tietosuoja",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Käytä merkkijonoa <1>{{address}}</1>.",
+    "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Käytä merkkijonoa <1>{{address}}</1>.",
+    "setup_dns_privacy_3": "<0>Tässä on lista ohjelmistoista, joita voit käyttää.</0>",
+    "setup_dns_privacy_4": "iOS 14 ja macOS Big Sur -laitteille voidaan ladata erityinen '.mobileconfig' -tiedosto, joka lisää DNS-asetuksiin <highlight>DNS-over-HTTPS</highlight> tai <highlight>DNS-over-TLS</highlight> -palvelimet.",
+    "setup_dns_privacy_android_1": "Android 9 tukee DNS-over-TLS -toteutusta natiivisti. Se määritetään syöttämällä oma verkkotunnus kohtaan \"Asetukset\" → \"Yhteydet\" → \"Lisää yhteysasetuksia\" → \"Yksityinen DNS\".",
+    "setup_dns_privacy_android_2": "<0>AdGuard Androidille</0> tukee <1>DNS-over-HTTPS</1> ja <1>DNS-over-TLS</1> -toteutuksia.",
+    "setup_dns_privacy_android_3": "<0>Intra</0> lisää <1>DNS-over-HTTPS</1> tuen Androidiin.",
+    "setup_dns_privacy_ios_1": "<0>DNSCloak</0> tukee <1>DNS-over-HTTPS</1>, mutta oman palvelimen käyttö' varten sille on luotava <2>DNS Stamp</2> -merkintä.",
+    "setup_dns_privacy_ios_2": "<0>AdGuard iOS:lle</0> tukee <1>DNS-over-HTTPS</1> ja <1>DNS-over-TLS</1> -toteutuksia.",
+    "setup_dns_privacy_other_title": "Muita toteutuksia",
+    "setup_dns_privacy_other_1": "AdGuard Home voi itse olla turvallinen DNS-päätelaite millä tahansa alustalla.",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> tukee kaikkia tunnettuja turvallisia DNS-protokollia.",
+    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> tukee <1>DNS-over-HTTPS</1> -protokollaa.",
+    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> tukee <1>DNS-over-HTTPS</1>-toteutusta.",
+    "setup_dns_privacy_other_5": "Löydät lisää toteutuksia <0>täältä</0> ja <1>täältä</1>.",
+    "setup_dns_privacy_ioc_mac": "iOS ja macOS -asetukset",
+    "setup_dns_notice": "<1>DNS-over-HTTPS</1> tai <1>DNS-over-TLS</1> -toteutuksia varten, on AdGuard Homen <0>Salausasetukset</0> määritettävä.",
+    "rewrite_added": "Kohteen \"{{key}}\" DNS-uudelleenohjaus lisättiin",
+    "rewrite_deleted": "Kohteen \"{{key}}\" DNS-uudelleenohjaus poistettiin",
+    "rewrite_add": "Lisää DNS-uudelleenohjaus",
+    "rewrite_not_found": "DNS-uudelleenohjauksia ei löytynyt",
+    "rewrite_confirm_delete": "Haluatko varmasti poistaa DNS-uudelleenohjauksen kohteelle \"{{key}}\"?",
+    "rewrite_desc": "Mahdollistaa oman DNS-vastauksen helpon määrityksen tietylle verkkotunnukselle.",
+    "rewrite_applied": "Uudelleenohjattu säännöllä",
+    "rewrite_hosts_applied": "Hosts-tiedoston säännön korvaama",
+    "dns_rewrites": "DNS-uudelleenohjaukset",
+    "form_domain": "Syötä verkkotunnus tai jokerimerkki",
+    "form_answer": "Syötä IP-osoite tai verkkotunnus",
+    "form_error_domain_format": "Virheellinen verkkotunnuksen muoto",
+    "form_error_answer_format": "Virheellinen vastauksen muoto",
+    "configure": "Määritä",
+    "main_settings": "Pääasetukset",
+    "block_services": "Estä tietyt palvelut",
+    "blocked_services": "Estetyt palvelut",
+    "blocked_services_desc": "Mahdollistaa suosittujen sivustojen ja palveluiden nopean eston.",
+    "blocked_services_saved": "Estetyt palvelut tallennettiin",
+    "blocked_services_global": "Käytä yleisiä estettyjä palveluita",
+    "blocked_service": "Estetty palvelu",
+    "block_all": "Estä kaikki",
+    "unblock_all": "Salli kaikki",
+    "encryption_certificate_path": "Varmenteen sijainti",
+    "encryption_private_key_path": "Yksityisen avaimen sijainti",
+    "encryption_certificates_source_path": "Määritä varmennetiedoston sijainti",
+    "encryption_certificates_source_content": "Liitä varmenteen sisältö",
+    "encryption_key_source_path": "Määritä yksityisen avaimen tiedosto",
+    "encryption_key_source_content": "Liitä yksityisen avaimen sisältö",
+    "stats_params": "Tilastoinnin määritys",
+    "config_successfully_saved": "Asetukset tallennettiin",
+    "interval_6_hour": "6 tuntia",
+    "interval_24_hour": "24 tuntia",
+    "interval_days": "{{count}} päivä",
+    "interval_days_plural": "{{count}} päivää",
+    "domain": "Verkkotunnus",
+    "punycode": "Punycode",
+    "answer": "Vastaus",
+    "filter_added_successfully": "Lista lisättiin",
+    "filter_removed_successfully": "Lista poistettiin",
+    "filter_updated": "Listan päivitettiin",
+    "statistics_configuration": "Tilastoinnin määritys",
+    "statistics_retention": "Tilastojen säilytys",
+    "statistics_retention_desc": "Jos aikaa lyhennetään, joitakin tietoja menetetään.",
+    "statistics_clear": "Tyhjennä tilastot",
+    "statistics_clear_confirm": "Haluatko varmasti tyhjentää tilastot?",
+    "statistics_retention_confirm": "Haluatko varmasti muuttaa tilastojen säilytysaikaa? Jos aikaa lyhennetään, joitakin tietoja menetetään.",
+    "statistics_cleared": "Tilastot tyhjennettiin",
+    "statistics_enable": "Ota tilastointi käyttöön",
+    "interval_hours": "{{count}} tunti",
+    "interval_hours_plural": "{{count}} tuntia",
+    "filters_configuration": "Suodatinten määritys",
+    "filters_enable": "Ota suodattimet käyttöön",
+    "filters_interval": "Suodatinpäivitysten tiheys",
+    "disabled": "Ei käytössä",
+    "username_label": "Käyttäjätunnus",
+    "username_placeholder": "Syötä käyttäjätunnus",
+    "password_label": "Salasana",
+    "password_placeholder": "Syötä salasana",
+    "sign_in": "Kirjaudu",
+    "sign_out": "Kirjaudu ulos",
+    "forgot_password": "Salasana unohtunut?",
+    "forgot_password_desc": "Luo käyttäjätilillesi uusi salasana seuraamalla <0>näitä ohjeita</0>.",
+    "location": "Sijainti",
+    "orgname": "Organisaation nimi",
+    "netname": "Verkon nimi",
+    "network": "Verkko",
+    "descr": "Kuvaus",
+    "whois": "Whois",
+    "filtering_rules_learn_more": "<0>Lue lisää</0> omien hosts-listojesi luonnista.",
+    "blocked_by_response": "Vastauksen sisältämän CNAME:n tai IP:n estämä",
+    "blocked_by_cname_or_ip": "CNAME:n tai IP:n estämä",
+    "try_again": "Yritä uudelleen",
+    "domain_desc": "Syötä korvattava verkkotunnus tai jokerimerkki.",
+    "example_rewrite_domain": "korvaa vain tämän verkkotunnuksen vastaukset",
+    "example_rewrite_wildcard": "korvaa verkkotunnuksen <0>example.org</0> kaikkien aliverkkotunnusten vastaukset",
+    "rewrite_ip_address": "IP-osoite: käytä tätä IP-osoitetta A tai AAAA -vastauksessa.",
+    "rewrite_domain_name": "Verkkotunnus: lisää CNAME-tietue.",
+    "rewrite_A": "<0>A</0>: erityinen arvo, säilytä ylävirran <0>A</0>-tiedot",
+    "rewrite_AAAA": "<0>AAAA</0>: erityinen arvo, säilytä ylävirran <0>AAAA</0>-tiedot",
+    "disable_ipv6": "Älä selvitä IPv6-osoitteita",
+    "disable_ipv6_desc": "Hylkää kaikki IPv6-osoitteiden DNS-pyynnöt (tyyppi AAAA).",
+    "fastest_addr": "Nopein IP-osoite",
+    "fastest_addr_desc": "Lähetä pyynnöt kaikille DNS-palvelimille ja valitse vastauksista nopein IP-osoite. Tämä parantaa yleistä liitettävyyttä, joskin hidastaa DNS-pyyntöjä, koska AdGuard Homen on odotettava kaikkien DNS-palvelinten vastauksia.",
+    "autofix_warning_text": "Jos painat \"Korjaa\", AdGuard Home määrittää järjestelmäsi käyttämään AdGuard Homen DNS-palvelinta.",
+    "autofix_warning_list": "Suorittaa toiminnot: <0>Poistaa käytöstä järjestelmän DNSStubListener-palvelun</0> <0>Määrittää DNS-palvelimen osoitteeksi 127.0.0.1</0> <0>Muuttaa sijainnnin /etc/resolv.conf symbolisen linkin kohteeksi /run/systemd/resolve/resolv.conf</0> <0>Pysäyttää DNSStubListener-palvelun (uudelleenlataa systemd-resolved -palvelu)</0>",
+    "autofix_warning_result": "Tämän jälkeen järjestelmäsi kaikki DNS-pyynnöt käsittelee oletusarvoisesti AdGuard Home.",
+    "tags_title": "Tunnisteet",
+    "tags_desc": "Voit valita päätelaitteeseen viittaavia tunnisteita. Tunnisteet voidaan sisällyttää suodatussääntöihin ja näin voit kohdistaa niitä tarkemmin. <0>Lue lisää</0>",
+    "form_select_tags": "Valitse päätelaitteen tunnisteet",
+    "check_title": "Tarkasta suodatus",
+    "check_desc": "Tarkasta suodatetaanko isäntänimeä",
+    "check": "Tarkasta",
+    "form_enter_host": "Syötä osoite",
+    "filtered_custom_rules": "Suodatettu omilla suodatussäännöillä",
+    "choose_from_list": "Valitse listalta",
+    "add_custom_list": "Lisää oma lista",
+    "host_whitelisted": "Isäntä on sallittu",
+    "check_ip": "IP-osoitteet: {{ip}}",
+    "check_cname": "CNAME: {{cname}}",
+    "check_reason": "Syy: {{reason}}",
+    "check_service": "Palvelun nimi: {{service}}",
+    "service_name": "Palvelun nimi",
+    "check_not_found": "Ei löytynyt suodatinlistoilta",
+    "client_confirm_block": "Haluatko varmasti estää päätelaitteen \"{{ip}}\"?",
+    "client_confirm_unblock": "Haluatko varmasti sallia päätelaitteen \"{{ip}}\"?",
+    "client_blocked": "Päätelaite \"{{ip}}\" estettiin",
+    "client_unblocked": "Päätelaite \"{{ip}}\" sallittiin",
+    "static_ip": "Kiiteä IP-osoite",
+    "static_ip_desc": "AdGuard Home on palvelin, joten se tarvitsee kiinteän IP-osoitteen toimiakseen oikein. Muutoin reitittimesi saattaa määrittää sille jossakin vaiheessa uuden, dynaamisen IP-osoitteen.",
+    "set_static_ip": "Määritä kiinteä IP-osoite",
+    "install_static_ok": "Hyviä uutisia! Kiinteä IP-osoite on jo määritetty.",
+    "install_static_error": "AdGuard Home ei voi määrittää sitä tälle verkkosovittimelle automaattisesti. Etsi ohjeita tämän suorittamiseksi itse.",
+    "install_static_configure": "AdGuard Home havaitsi, että käytössä on dynaaminen IP-osoitteen <0>{{ip}}</0>. Haluatko määrittää sen kiinteäksi osoitteeksi?",
+    "confirm_static_ip": "AdGuard Home määrittää IP-osoitteen {{ip}} kiinteäksi. Haluatko jatkaa?",
+    "list_updated": "{{count}} lista päivitettiin",
+    "list_updated_plural": "{{count}} listaa päivitettiin",
+    "dnssec_enable": "Ota DNSSEC käyttöön",
+    "dnssec_enable_desc": "Määritä DNSSEC-lippu ulos lähteville DNS-pyynnöille ja tarkasta tulos (vaatii DNSSEC-yhteensopivan resolverin).",
+    "validated_with_dnssec": "DNSSEC-vahvistettu",
+    "all_queries": "Kaikki pyynnöt",
+    "show_blocked_responses": "Estetyt",
+    "show_whitelisted_responses": "Sallitut",
+    "show_processed_responses": "Käsitelty",
+    "blocked_safebrowsing": "Turvallisen selauksen estämät",
+    "blocked_adult_websites": "Lapsilukon estämät",
+    "blocked_threats": "Estetyt uhat",
+    "allowed": "Sallitut",
+    "filtered": "Suodatetut",
+    "rewritten": "Uudelleenohjatut",
+    "safe_search": "Turvallinen haku",
+    "blocklist": "Estolista",
+    "milliseconds_abbreviation": "ms",
+    "cache_size": "Välimuistin koko",
+    "cache_size_desc": "DNS-välimuistin koko (tavuina)",
+    "cache_ttl_min_override": "Korvaa vähimmäis-TTL",
+    "cache_ttl_max_override": "Korvaa enimmäis-TTL",
+    "enter_cache_size": "Syötä välimuistin koko (tavuina)",
+    "enter_cache_ttl_min_override": "Syötä vähimmäis-TTL (sekunteina)",
+    "enter_cache_ttl_max_override": "Syötä enimmäis-TTL (sekunteina)",
+    "cache_ttl_min_override_desc": "Pidennä ylävirran palvelimelta vastaanotettuja, lyhyitä time-to-live -arvoja (sekunteina) tallennettaessa DNS-vastauksia välimuistiin.",
+    "cache_ttl_max_override_desc": "Määritä DNS-välimuistin kohteiden suurin time-to-live -arvo (sekunteina)",
+    "ttl_cache_validation": "Välimuistin TTL-vähimmäisarvon tulee olla pienempi tai sama kuin enimmäisarvon",
+    "cache_optimistic": "Optimistinen välimuisti",
+    "cache_optimistic_desc": "Pakota AdGuard Home vastaamaan välimuistista vaikka sen tiedot olisivat vanhentuneet. Pyri samalla myös päivittämään tiedot.",
+    "filter_category_general": "Yleiset",
+    "filter_category_security": "Turvallisuus",
+    "filter_category_regional": "Alueelliset",
+    "filter_category_other": "Muut",
+    "filter_category_general_desc": "Listat, jotka estävät seurannan ja mainokset useimmilla laitteilla",
+    "filter_category_security_desc": "Tietojenkalastelu-, huijaus- ja muiden haitallisten verkkotunnusten estoon erikoistuneet listat",
+    "filter_category_regional_desc": "Listat, jotka painottavat alueellisia mainoksia ja seurantapalvelimia",
+    "filter_category_other_desc": "Muut estolistat",
+    "setup_config_to_enable_dhcp_server": "Määritä asetukset DHCP-palvelimen käyttöönottoa varten",
+    "original_response": "Alkuperäinen vastaus",
+    "click_to_view_queries": "Paina näyttääksesi pyynnöt",
+    "port_53_faq_link": "Portti 53 on usein \"DNSStubListener\" tai \"systemd-resolved\" -palveluiden varaama. Lue <0>nämä ohjeet</0> tämän ratkaisemiseksi.",
+    "adg_will_drop_dns_queries": "AdGuard Home hylkää tämän päätelaitteen DNS-pyynnöt.",
+    "filter_allowlist": "VAROITUS: Toiminto ohittaa \"{{disallowed_rule}}\" -säännön sallittujen päätelaitteiden listalta.",
+    "last_rule_in_allowlist": "Et voi estää tätä päätelaitetta, koska säännön \"{{disallowed_rule}}\" ohitus POISTAA KÄYTÖSTÄ \"Sallitut päätelaitteet\" -listan.",
+    "experimental": "Kokeellinen",
+    "use_saved_key": "Käytä aiemmin tallennettua avainta",
+    "parental_control": "Lapsilukko",
+    "safe_browsing": "Turvallinen selaus",
+    "served_from_cache": "{{value}} <i>(jaettu välimuistista)</i>"
+}
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -36,16 +36,23 @@
    "dhcp_ipv4_settings": "Paramètres IPv4 du DHCP",
    "dhcp_ipv6_settings": "Paramètres IPv6 du DHCP",
    "form_error_required": "Champ requis",
-    "form_error_ip4_format": "Format IPv4 invalide",
-    "form_error_ip6_format": "Format IPv6 invalide",
-    "form_error_ip_format": "Format IPv4 invalide",
-    "form_error_mac_format": "Format MAC invalide",
-    "form_error_client_id_format": "Format d'ID client non valide",
+    "form_error_ip4_format": "Adresse IPv4 invalide",
+    "form_error_ip4_range_start_format": "Adresse de début de plage IPv4 incorrecte",
+    "form_error_ip4_range_end_format": "Adresse de fin de plage IPv4 incorrecte",
+    "form_error_ip4_gateway_format": "Adresse de passerelle IPv4 invalide",
+    "form_error_ip6_format": "Adresse IPv6 invalide",
+    "form_error_ip_format": "Adresse IP invalide",
+    "form_error_mac_format": "Adresse MAC invalide",
+    "form_error_client_id_format": "Identifiant de client invalide",
    "form_error_server_name": "Nom de serveur invalide",
    "form_error_subnet": "Le sous-réseau « {{cidr}} » ne contient pas l'adresse IP « {{ip}} »",
    "form_error_positive": "Doit être supérieur à 0",
-    "form_error_negative": "Doit être égal à 0 ou supérieur",
-    "range_end_error": "Doit être supérieur au début de la gamme",
+    "out_of_range_error": "Doit être hors plage « {{start}} » - « {{end}} »",
+    "lower_range_start_error": "Doit être inférieur au début de plage",
+    "greater_range_start_error": "Doit être supérieur au début de plage",
+    "greater_range_end_error": "Doit être supérieur à la fin de plage",
+    "subnet_error": "Les adresses doivent être dans le même sous-réseau",
+    "gateway_or_subnet_invalid": "Masque de sous-réseau invalide",
    "dhcp_form_gateway_input": "IP de la passerelle",
    "dhcp_form_subnet_input": "Masque de sous-réseau",
    "dhcp_form_range_title": "Rangée des adresses IP",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Entrez une URL ou le chemin absolu de la liste",
    "custom_filter_rules": "Règles de filtrage d'utilisateur",
    "custom_filter_rules_hint": "Saisissez la règle en une ligne. C'est possible d'utiliser les règles de blocage ou la syntaxe des fichiers hosts.",
+    "system_host_files": "Fichier d'hôtes système",
    "examples_title": "Exemples",
    "example_meaning_filter_block": "bloque l’accès au domaine example.org et à tous ses sous-domaines",
    "example_meaning_filter_whitelist": "débloque l’accès au domaine example.org et à tous ses sous-domaines",
@@ -208,7 +216,7 @@
    "example_upstream_sdns": "vous pouvez utiliser <0>DNS Stamps</0> pour <1>DNSCrypt</1> ou les resolveurs <2>DNS_over_HTTPS</2>",
    "example_upstream_tcp": "DNS classique (au-dessus de TCP)",
    "all_lists_up_to_date_toast": "Toutes les listes sont déjà à jour",
-    "updated_upstream_dns_toast": "Les serveurs DNS upstream sont mis à jour",
+    "updated_upstream_dns_toast": "Serveurs en amont enregistrés",
    "dns_test_ok_toast": "Les serveurs DNS spécifiés fonctionnent correctement",
    "dns_test_not_ok_toast": "Impossible d'utiliser le serveur « {{key}} »: veuillez vérifier si le nom saisi est bien correct",
    "unblock": "Débloquer",
@@ -235,7 +243,7 @@
    "loading_table_status": "Chargement en cours ...",
    "page_table_footer_text": "Page",
    "rows_table_footer_text": "lignes",
-    "updated_custom_filtering_toast": "Règles de filtrage d'utilisateur mises à jour",
+    "updated_custom_filtering_toast": "Règles d'utilisateur enregistrées",
    "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}}",
    "query_log_response_status": "Statut : {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Vous devrez configurer vos appareils et votre routeur pour utiliser le serveur DNS sur les adresses suivantes :",
    "install_settings_all_interfaces": "Toutes les interfaces",
    "install_auth_title": "Authentification",
-    "install_auth_desc": "Il est fortement recommandé de configurer un mot de passe pour accéder à l'interface web administrateur AdGuard Home. Même si elle est disponible que dans votre réseau local, cela reste important de se protéger contre des accès non désirés.",
+    "install_auth_desc": "C'est nécessaire de configurer l'authentification par aide de mot de passe pour accéder à l'interface web administrateur de votre AdGuard Home. Même si AdGuard Home n'est accessible que dans votre réseau local, c'est important d'y restreindre accès aux tiers.",
    "install_auth_username": "Nom d'utilisateur",
    "install_auth_password": "Mot de passe",
    "install_auth_confirm": "Confirmer le mot de passe",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "Voulez-vous vraiment effacer les statistiques ?",
    "statistics_retention_confirm": "Êtes-vous sûr de vouloir modifier le maintien des statistiques ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
    "statistics_cleared": "Statistiques effacées",
+    "statistics_enable": "Activer les statistiques",
    "interval_hours": "{{count}} heure",
    "interval_hours_plural": "{{count}} heures",
    "filters_configuration": "Configuration des filtres",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "Ajouté à la liste blanche",
    "show_processed_responses": "Traité",
    "blocked_safebrowsing": "Navigation sécurisée bloquée",
-    "blocked_adult_websites": "Sites à contenu adulte bloqués",
+    "blocked_adult_websites": "Bloqué par le Contrôle Parental",
    "blocked_threats": "Menaces bloquées",
    "allowed": "Autorisé",
    "filtered": "Filtré",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Prolonger les valeurs courtes de durée de vie (en secondes) reçues du serveur en amont lors de la mise en cache des réponses DNS",
    "cache_ttl_max_override_desc": "Établir la valeur de durée de vie TTL maximale (en secondes) pour les saisies dans le cache du DNS",
    "ttl_cache_validation": "La valeur TTL minimale du cache doit être inférieure ou égale à la valeur maximale",
-    "cache_optimistic": "Optimiste",
+    "cache_optimistic": "Caching optimiste",
    "cache_optimistic_desc": "Faites en sorte qu'AdGuard Home réponde à partir du cache même lorsque les entrées ont expiré et essayez également de les actualiser.",
    "filter_category_general": "Général",
    "filter_category_security": "Sécurité",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Cliquez pour voir les requêtes",
    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème.",
    "adg_will_drop_dns_queries": "AdGuard Home ignorera toutes les requêtes DNS de ce client.",
-    "client_not_in_allowed_clients": "Le client n’est pas autorisé car il ne figure pas dans la liste « Clients autorisés ».",
-    "experimental": "Expérimental"
+    "filter_allowlist": "ATTENTION : Cette action exclura également la règle « {{disallowed_rule}} » de la liste des clients autorisés.",
+    "last_rule_in_allowlist": "Impossible d’interdire ce client, car l’exclusion de la règle « {{disallowed_rule}} » DÉSACTIVERA la liste des « clients autorisés ».",
+    "experimental": "Expérimental",
+    "use_saved_key": "Utiliser la clef précédemment enregistrée",
+    "parental_control": "Contrôle parental",
+    "safe_browsing": "Navigation sécurisée",
+    "served_from_cache": "{{value}} <i>(depuis le cache)</i>"
 }
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -37,6 +37,9 @@
    "dhcp_ipv6_settings": "DHCP IPv6 postavke",
    "form_error_required": "Obavezno polje",
    "form_error_ip4_format": "Nevažeći IPv4 format",
+    "form_error_ip4_range_start_format": "Nepravilan početak ranga IPv4 adresa",
+    "form_error_ip4_range_end_format": "Nepravilan kraj ranga IPv4 adresa",
+    "form_error_ip4_gateway_format": "Nepravilna IPV4 adresa čvora",
    "form_error_ip6_format": "Nevažeći IPv6 format",
    "form_error_ip_format": "Nevažeći format IP adrese",
    "form_error_mac_format": "Nevažeći MAC format",
@@ -44,8 +47,12 @@
    "form_error_server_name": "Nevažeće ime poslužitelja",
    "form_error_subnet": "Podmrežu \"{{cidr}}\" ne sadrži IP adresu \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Mora biti izvan ranga \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Mora biti niže od početnog ranga",
+    "greater_range_start_error": "Mora biti veće od krajnjeg ranga",
+    "greater_range_end_error": "Mora biti veće od krajnjeg ranga",
+    "subnet_error": "Adrese moraju biti iz iste podmreže",
+    "gateway_or_subnet_invalid": "Maska podmreže je neprvilna",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet maskiranje",
    "dhcp_form_range_title": "Raspon IP adresa",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Nevažeći URL ili putanja od liste",
    "custom_filter_rules": "Prilagođena pravila filtriranja",
    "custom_filter_rules_hint": "Unesite jedno pravilo po liniji. Možete koristiti sintaksu za pravila blokiranja oglasa ili za hosts datoteke.",
+    "system_host_files": "Datoteke host sustava",
    "examples_title": "Primjeri",
    "example_meaning_filter_block": "blokira pristup domeni example.org kao i svim njenim poddomenama",
    "example_meaning_filter_whitelist": "odblokira pristup domeni example.org kao i svim njenim poddomenama",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Ažurirani su upstream DNS poslužitelji",
+    "updated_upstream_dns_toast": "Uzvodni poslužitelji uspješno su spremljeni",
    "dns_test_ok_toast": "Odabrani DNS poslužitelji su trenutno aktivni",
    "dns_test_not_ok_toast": "\"{{key}}\" poslužitelja: ne može se upotrijebiti, provjerite jeste li to ispravno napisali",
    "unblock": "Odblokiraj",
@@ -235,7 +243,7 @@
    "loading_table_status": "Učitavanje...",
    "page_table_footer_text": "Stranica",
    "rows_table_footer_text": "redova",
-    "updated_custom_filtering_toast": "Ažurirana su prilagođena pravila filtriranja",
+    "updated_custom_filtering_toast": "Prilagođena pravila uspješno su spremljena",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Potrebno je postaviti uređaj ili router da koristi DNS poslužitelj na sljedećim adresama:",
    "install_settings_all_interfaces": "Sva sučelja",
    "install_auth_title": "Autentikacija",
-    "install_auth_desc": "Izrazito se preporučuje postavljanje autentikacije za web administratorsko sučelje AdGuard Home. Iako je dostupna samo u vašoj lokalnoj mreži, važno je zaštititi je od ne dozvoljenog pristupa.",
+    "install_auth_desc": "Provjera autentičnosti lozinke na web-sučelje AdGuard Home admin mora biti konfigurirana. Čak i ako je AdGuard Home dostupan samo u vašoj lokalnoj mreži, i dalje je važno zaštititi ga od neograničenog pristupa.",
    "install_auth_username": "Korisničko ime",
    "install_auth_password": "Lozinka",
    "install_auth_confirm": "Potvrdi lozinku",
@@ -491,6 +499,7 @@
    "interval_days": "{{count}} dan",
    "interval_days_plural": "{{count}} dana",
    "domain": "Domena",
+    "punycode": "Punycode",
    "answer": "Odgovor",
    "filter_added_successfully": "Popis je uspješno dodan",
    "filter_removed_successfully": "Ovaj popis je uspješno uklonjen",
@@ -502,6 +511,7 @@
    "statistics_clear_confirm": "Jeste li sigurni da želite poništiti statistiku?",
    "statistics_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje statistike? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
    "statistics_cleared": "Statistika je uspješno uklonjenja",
+    "statistics_enable": "Omogući statistiku",
    "interval_hours": "{{count}} sata/i",
    "interval_hours_plural": "{{count}} sata/i",
    "filters_configuration": "Postavke filtara",
@@ -578,7 +588,7 @@
    "show_whitelisted_responses": "Na popisu dopuštenih",
    "show_processed_responses": "Obrađeno",
    "blocked_safebrowsing": "Blokirano s Sigurnom pretragom",
-    "blocked_adult_websites": "Blokirane web stranice za odrasle",
+    "blocked_adult_websites": "Blokirala roditeljska zaštita",
    "blocked_threats": "Blokirane prijetnje",
    "allowed": "Dopušteno",
    "filtered": "Filtrirano",
@@ -596,7 +606,7 @@
    "cache_ttl_min_override_desc": "Povećajte kratke vrijednosti TTL-a (u sekundama) primljene od upstream poslužitelja prilikom predmemoriranja DNS odgovora",
    "cache_ttl_max_override_desc": "Postavite maksimalnu vrijednost TTL-a (u sekundama) za zapise u DNS predmemoriju",
    "ttl_cache_validation": "Minimalna vrijednost TTL predmemorije mora biti manja ili jednaka maksimalnoj vrijednosti",
-    "cache_optimistic": "optimistički",
+    "cache_optimistic": "Optimistično predmemoriranje",
    "cache_optimistic_desc": "Učinite da AdGuard Home reagira iz predmemorije čak i kada su unosi istekli i pokušajte ih osvježiti.",
    "filter_category_general": "Općenito",
    "filter_category_security": "Sigurnost",
@@ -611,6 +621,11 @@
    "click_to_view_queries": "Kliknite za pregled upita",
    "port_53_faq_link": "Port 53 često zauzimaju usluge \"DNSStubListener\" ili \"systemd-resolved\". Molimo pročitajte <0>ove upute</0> o tome kako to riješiti.",
    "adg_will_drop_dns_queries": "AdGuard Home odbaciti će sve DNS upite od ovog klijenta.",
-    "client_not_in_allowed_clients": "Klijent nije dopušten jer nije na popisu \"Dopuštenih klijenata\".",
-    "experimental": "Eksperimentalno"
+    "filter_allowlist": "UPOZORENJE: Ova akcija će također isključiti pravilo \"{{disallowed_rule}}\" s popisa dopuštenih klijenata.",
+    "last_rule_in_allowlist": "Ovaj klijent nije moguće onemogućiti jer će isključivanje pravila \"{{disallowed_rule}}\" ONEMOGUĆITI popis \"Dopušteni klijenti\".",
+    "experimental": "Eksperimentalno",
+    "use_saved_key": "Korištenje prethodno spremljenog ključa",
+    "parental_control": "Roditeljska zaštita",
+    "safe_browsing": "Sigurno surfanje",
+    "served_from_cache": "{{value}} <i>(dohvaćeno iz predmemorije)</i>"
 }
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -5,14 +5,18 @@
    "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.",
+    "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 fogja a leggyakrabban használni.",
    "bootstrap_dns": "Bootstrap DNS kiszolgálók",
    "bootstrap_dns_desc": "A Bootstrap DNS szerverek a DoH/DoT feloldók IP-címeinek feloldására szolgálnak.",
    "local_ptr_title": "Privát DNS szerverek",
-    "local_ptr_desc": "Azok a DNS szerverek, amiket az AdGuard Home a helyi PTR kérésekhez használ. Ezeket a szervereket arra használjuk, hogy az rDNS segítségével fel lehessen oldani a kliensek hosztneveit. Ha nincs beállítva ilyen, akkor az AdGuard Home alapértelmezés szerint az OS nevét fogja feloldani.",
+    "local_ptr_desc": "Azok a DNS szerverek, amiket az AdGuard Home a helyi PTR kérésekhez használ. Ezeket a szervereket arra használjuk, hogy reverse DNS által feloldjuk a kliensek hosztneveit privát IP címekre, például \"192.168.12.34\". Ha nincs beállítva, akkor az AdGuard Home, kivéve az ő saját címét, az operációs rendszer alapértelmezett DNS feloldók címeit fogja használni.",
+    "local_ptr_default_resolver": "Alapesetben az AdGuard Home a következő reverse DNS feloldókat használja: {{ip}}.",
+    "local_ptr_no_default_resolver": "Az AdGuard Home nem tudta meghatározni a privát reverse DNS feloldókat ehhez a rendszerhez.",
    "local_ptr_placeholder": "Adjon meg soronként egy kiszolgáló címet",
    "resolve_clients_title": "Kliensek IP címeinek fordított feloldása",
-    "resolve_clients_desc": "Ha engedélyezve van, az AdGuard Home megpróbálja átfordítani a kliensek IP címeit hosztnevekre, PTR lekérdezéseket küldve a megfelelő feloldóknak (privát DNS szerverek a helyi kliensek számára, upstream szerverek a nyilvános IP címmel rendelkező ügyfelek számára).",
+    "resolve_clients_desc": "Fordítva oldja fel a kliensek IP címeit a hosztneveikre azáltal, hogy PTR lekérdezéseket küld a megfelelő feloldóknak (privát DNS szerverek a helyi kliensek számára, upstream szerverek a nyilvános IP címmel rendelkező kliensek számára).",
+    "use_private_ptr_resolvers_title": "Privát reverse DNS feloldók használata",
+    "use_private_ptr_resolvers_desc": "Reverse DNS keresések végzése a helyileg kiszolgált címekre ezeknek a szervereknek a használatával. Ha le van tiltva, az AdGuard Home az NXDOMAIN használatával válaszol minden ilyen PTR kérésre, kivéve azokat a klienseket, amelyeket már ismer a DHCP, /etc/hosts, stb. által.",
    "check_dhcp_servers": "DHCP szerverek keresése",
    "save_config": "Konfiguráció mentése",
    "enabled_dhcp": "DHCP szerver engedélyezve",
@@ -34,14 +38,12 @@
    "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_ip_format": "Érvénytelen IP-cím",
    "form_error_mac_format": "Érvénytelen MAC formátum",
    "form_error_client_id_format": "Érvénytelen kliens ID formátum",
    "form_error_server_name": "Érvénytelen szervernév",
    "form_error_subnet": "A(z) \"{{cidr}}\" alhálózat nem tartalmazza a(z) \"{{ip}}\" IP címet",
    "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",
@@ -64,6 +66,9 @@
    "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_leases": "Bérletek alaphelyzetbe",
+    "dhcp_reset_leases_confirm": "Biztosan visszaállítja az összes bérletet?",
+    "dhcp_reset_leases_success": "DHCP bérletek alaphelyzetbe állítva",
    "dhcp_reset": "Biztosan visszaállítja a DHCP beállításokat?",
    "country": "Ország",
    "city": "Város",
@@ -105,6 +110,8 @@
    "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",
+    "stats_disabled": "Ezek a statisztikák ki lettek kapcsolva. Be tudja kapcsolni őket a <0>beállítások oldalon</0>.",
+    "stats_disabled_short": "A statisztikák ki lettek kapcsolva",
    "no_domains_found": "Nem található domain",
    "requests_count": "Kérések száma",
    "top_blocked_domains": "Legtöbbet blokkolt domainek",
@@ -199,7 +206,7 @@
    "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",
+    "updated_upstream_dns_toast": "Upstream szerverek sikeresen mentve",
    "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",
@@ -226,7 +233,7 @@
    "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",
+    "updated_custom_filtering_toast": "Egyéni szűrőszabályok sikeresen mentve",
    "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}}",
@@ -307,9 +314,9 @@
    "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_submit_desc": "A telepítési folyamat befejeződött, használatba veheti az AdGuard Home-ot.",
    "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_router_desc": "Ez a beállítás automatikusan kihat az összes eszközre, amik az otthoni routeréhez kapcsolódnak, nem szükséges őket egyenként, kézileg beállítani.",
    "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, ellenőrizze 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 visszaállíthatja a routert, azonban ne feledje, hogyha ezt az eljárást választja, akkor valószínűleg elveszíti annak összes beállítását. Ha a router beállításához alkalmazásra van szükség, telepítse az alkalmazást a telefonjára vagy a számítógépére, és használja azt az útválasztó beállításainak eléréséhez.",
    "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.",
@@ -319,8 +326,8 @@
    "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_windows_list_5": "Keresse meg az Internet Protocol Version 4 (TCP/IPv4) 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.",
@@ -419,11 +426,11 @@
    "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_allowed_desc": "CIDR-ek, IP-címek vagy kliensazonosítók listája. Ha be van állítva, akkor az AdGuard Home csak azokat a lekérdezéseket engedélyezi, amelyek ezektől a kliensektől érkeznek.",
    "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_disallowed_desc": "CIDR-ek, IP-címek vagy kliensazonosítók listája. Ha be van állítva, akkor az AdGuard Home eldobja azokat a lekérdezéseket, amelyek ezektől a kliensektől érkeznek. Ha engedélyezett kliensek vannak ide bekonfigurálva, akkor pedig az a mező ki lesz hagyva.",
    "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' vagy '||example.org^'.",
+    "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 megegyezik, és ezek a lekérések nem is fognak megjelenni a lekérdezési naplóban sem. Megadhatja a pontos domain neveket, a helyettesítő karaktereket vagy az URL szűrési szabályokat, pl. ennek megfelelően \"example.org\", \"*.example.org\", vagy \"||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",
@@ -477,10 +484,12 @@
    "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_6_hour": "6 óra",
    "interval_24_hour": "24 óra",
    "interval_days": "{{count}} nap",
    "interval_days_plural": "{{count}} nap",
    "domain": "Domain",
+    "punycode": "Punycode",
    "answer": "Válasz",
    "filter_added_successfully": "A lista sikeresen hozzá lett adva",
    "filter_removed_successfully": "A lista sikeresen el lett távolítva",
@@ -488,10 +497,11 @@
    "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": "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",
+    "statistics_enable": "Statisztikák engedélyezése",
    "interval_hours": "{{count}} óra",
    "interval_hours_plural": "{{count}} óra",
    "filters_configuration": "Szűrők beállításai",
@@ -523,8 +533,8 @@
    "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.",
+    "disable_ipv6": "IPv6 címek feloldásának tiltása",
+    "disable_ipv6_desc": "Összes DNS kérés eldobása az IPv6 címekhez (AAAA típus).",
    "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.",
@@ -561,14 +571,14 @@
    "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)",
+    "dnssec_enable_desc": "DNSSEC flag beállítása a kimenő DNS kérésekhez, majd az eredmény ellenőrzése (DNSSEC-engedélyezett feloldó szükséges).",
    "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_adult_websites": "Szülői felügyelet által blokkolva",
    "blocked_threats": "Blokkolt fenyegetések",
    "allowed": "Engedve",
    "filtered": "Megszűrt",
@@ -586,12 +596,14 @@
    "cache_ttl_min_override_desc": "Megnöveli a DNS kiszolgálótól kapott rövid TTL értékeket (másodpercben), ha gyorsítótárazza a DNS kéréseket",
    "cache_ttl_max_override_desc": "Állítson be egy maximális TTL értéket (másodpercben) a DNS gyorsítótár bejegyzéseihez",
    "ttl_cache_validation": "A minimális gyorsítótár TTL értéknek kisebbnek vagy egyenlőnek kell lennie a maximum értékkel",
+    "cache_optimistic": "Optimista gyorsítótár",
+    "cache_optimistic_desc": "Lehetővé teszi, hogy az AdGuard Home a gyorsítótárból válaszoljon, még abban az esetben is, ha az ott lévő bejegyzések lejértak, és próbálja meg frissíteni ő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_security_desc": "Kifejezetten a rosszindulatú, adathalász és átverős domainek blokkolására tervezett listák",
    "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",
@@ -599,6 +611,7 @@
    "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.",
    "adg_will_drop_dns_queries": "Az AdGuard Home eldobja az összes DNS kérést erről a kliensről.",
-    "client_not_in_allowed_clients": "Ez a kliens nincs engedélyezve, mivel nincs rajta az \"Engedélyezett kliensek\" listáján.",
-    "experimental": "Kísérleti"
+    "experimental": "Kísérleti",
+    "use_saved_key": "Előzőleg mentett kulcs használata",
+    "parental_control": "Szülői felügyelet"
 }
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -8,11 +8,15 @@
    "load_balancing_desc": "Permintaan satu server pada satu waktu. AdGuard Home akan menggunakan algoritma acak tertimbang untuk memilih server sehingga server tercepat akan lebih sering digunakan.",
    "bootstrap_dns": "Server DNS bootstrap",
    "bootstrap_dns_desc": "Server Bootstrap DNS dapat digunakan untuk meresolve alamat IP pada DoH/DoT resolvers yang Anda tentukan sebagai upstreams.",
-    "local_ptr_title": "Server DNS pribadi",
-    "local_ptr_desc": "Server DNS yang digunakan AdGuard Home untuk kueri PTR lokal. Server ini digunakan untuk menetapkan nama host klien bersama alamat IP pribadi, sebagai contoh \"192.168.12.34\", menggunakan rDNS. Jika tidka diatur, AdGuard Home akan menggunakan resolver DNS bawaan/default OS Anda.",
+    "local_ptr_title": "Server pembalik DNS pribadi",
+    "local_ptr_desc": "Server DNS yang digunakan AdGuard Home untuk kueri PTR lokal. Server ini digunakan untuk menyelesaikan nama host klien dengan alamat IP pribadi, misalnya \"192.168.12.34\", menggunakan DNS terbalik. Jika tidak disetel, AdGuard Home menggunakan alamat resolver DNS default OS Anda kecuali untuk alamat AdGuard Home itu sendiri.",
+    "local_ptr_default_resolver": "Secara bawaan, AdGuard Home menggunakan pemecah DNS terbalik: {{ip}}.",
+    "local_ptr_no_default_resolver": "AdGuard Home tidak dapat menentukan pemecah DNS terbalik yang sesuai untuk sistem ini.",
    "local_ptr_placeholder": "Masukkan satu alamat server per baris",
    "resolve_clients_title": "Aktifkan resolusi hostname klien",
-    "resolve_clients_desc": "Jika diaktifkan, AdGuard Home akan mencoba menyelesaikan hostname klien secara otomatis dari alamat IP mereka dengan mengirimkan kueri PTR ke penyelesai yang sesuai (server DNS pribadi untuk klien lokal, server upstream untuk klien dengan IP publik).",
+    "resolve_clients_desc": "Menyelesaikan alamat IP klien secara terbalik ke nama host mereka dengan mengirimkan kueri PTR ke resolver yang sesuai (server DNS pribadi untuk klien lokal, server upstream untuk klien dengan alamat IP publik).",
+    "use_private_ptr_resolvers_title": "Gunakan server pembalik DNS pribadi",
+    "use_private_ptr_resolvers_desc": "Lakukan pencarian DNS terbalik untuk alamat yang disajikan secara lokal menggunakan server upstream ini. Jika dinonaktifkan, Adguard Home merespon dengan NXDOMAIN untuk semua permintaan PTR tersebut kecuali untuk klien yang diketahui dari DHCP, /etc/hosts, dan seterusnya.",
    "check_dhcp_servers": "Cek untuk server DHCP",
    "save_config": "Simpan pengaturan",
    "enabled_dhcp": "Server DHCP diaktifkan",
@@ -32,16 +36,10 @@
    "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",
-    "form_error_ip_format": "Format IPv4 tidak valid",
-    "form_error_mac_format": "Format MAC tidak valid",
-    "form_error_client_id_format": "Format client ID tidak valid",
+    "form_error_ip_format": "Alamat IP salah",
    "form_error_server_name": "Nama server tidak valid",
    "form_error_subnet": "Subnet \"{{cidr}}\" tidak berisi alamat IP \"{{ip}}\"",
    "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",
@@ -64,6 +62,9 @@
    "dhcp_new_static_lease": "Static lease baru",
    "dhcp_static_leases_not_found": "DHCP static lease tidak ditemukan",
    "dhcp_add_static_lease": "Tambah static lease",
+    "dhcp_reset_leases": "Atur ulang semua kontrak",
+    "dhcp_reset_leases_confirm": "Apakah Anda yakin ingin mengatur ulang kontrak Anda?",
+    "dhcp_reset_leases_success": "Kontrak DHCP berhasil diatur ulang",
    "dhcp_reset": "Apakah anda yakin ingin mengatur ulang konfigurasi DHCP anda?",
    "country": "Negara",
    "city": "Kota",
@@ -105,6 +106,8 @@
    "for_last_24_hours": "untuk 24 jam terakhir",
    "for_last_days": "untuk {{count}} hari terakhir",
    "for_last_days_plural": "selama {{count}} hari terakhir",
+    "stats_disabled": "Statistik telah dinonaktifkan. Anda dapat mengaktifkannya dari <0>halaman setelan</0>.",
+    "stats_disabled_short": "Statistik telah dinonaktifkan",
    "no_domains_found": "Domain tidak ditemukan",
    "requests_count": "Jumlah permintaan",
    "top_blocked_domains": "Domain diblokir teratas",
@@ -124,10 +127,10 @@
    "block_domain_use_filters_and_hosts": "Blokir domain menggunakan filter dan file hosts",
    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran di pengaturan <a>Penyaringan</a>.",
    "use_adguard_browsing_sec": "Gunakan layanan web Keamanan Penjelajahan AdGuard",
-    "use_adguard_browsing_sec_hint": "AdGuard Home akan mengecek jika domain diblacklist oleh layanan web keamanan penjelajahan. Akan menggunakan lookup API yang ramah privasi untuk melakukan cek: hanya awalan singkat hash SHA256 dari nama domain yang dikirim ke server.",
+    "use_adguard_browsing_sec_hint": "AdGuard Home akan memeriksa apakah domain diblokir oleh layanan web keamanan penjelajahan. Ini akan menggunakan API pencarian yang ramah privasi untuk melakukan pemeriksaan: hanya awalan singkat dari hash nama domain SHA256 yang dikirim ke server.",
    "use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
    "use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
-    "enforce_safe_search": "Paksa penelusuran aman",
+    "enforce_safe_search": "Pakai pencarian aman",
    "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, DuckDuckGo, Yandex, dan Pixabay.",
    "no_servers_specified": "Sever tidak disebutkan",
    "general_settings": "Pengaturan umum",
@@ -199,7 +202,6 @@
    "example_upstream_sdns": "anda bisa menggunakan <0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "DNS reguler (melalui TCP)",
    "all_lists_up_to_date_toast": "Semua daftar sudah diperbarui",
-    "updated_upstream_dns_toast": "Server DNS hulu terbarui",
    "dns_test_ok_toast": "Server DNS yang ditentukan bekerja dengan benar",
    "dns_test_not_ok_toast": "Server \"{{key}}\": tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
    "unblock": "Buka Blokir",
@@ -226,7 +228,7 @@
    "loading_table_status": "Memuat...",
    "page_table_footer_text": "Halaman",
    "rows_table_footer_text": "baris",
-    "updated_custom_filtering_toast": "Perbarui aturan penyaringan khusus",
+    "updated_custom_filtering_toast": "Aturan kustom berhasil disimpan",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -268,7 +270,7 @@
    "form_enter_rate_limit": "Masukkan batas nilai",
    "rate_limit": "Batas nilai",
    "edns_enable": "Aktifkan EDNS Klien Subnet",
-    "edns_cs_desc": "Apabila dinyalakan, AdGuard Home akan mengirim subnet klien ke server-server DNS.",
+    "edns_cs_desc": "Kirim subnet klien ke server DNS.",
    "rate_limit_desc": "Jumlah permintaan per detik yang diperbolehkan untuk satu klien. Atur ke 0 untuk tidak terbatas.",
    "blocking_ipv4_desc": "Alamat IP akan dikembalikan untuk permintaan A yang diblokir",
    "blocking_ipv6_desc": "Alamat IP akan dipulihkan untuk permintaan AAAA yang diblokir",
@@ -297,7 +299,6 @@
    "install_settings_dns_desc": "Anda perlu mengkonfigurasi perangkat atau router anda untuk menggunakan server DNS berikut ini",
    "install_settings_all_interfaces": "Semua antarmuka",
    "install_auth_title": "Otentikasi",
-    "install_auth_desc": "Sangat disarankan untuk mengkonfigurasi otentikasi kata sandi ke antarmuka web admin AdGuard Home Anda. Meskipun hanya dapat diakses di jaringan lokal Anda, tetap penting untuk melindunginya dari akses tak terbatas.",
    "install_auth_username": "Nama Pengguna",
    "install_auth_password": "Kata Sandi",
    "install_auth_confirm": "Konfirmasi kata sandi",
@@ -309,7 +310,7 @@
    "install_submit_title": "Selamat!",
    "install_submit_desc": "Prosedur pengaturan telah selesai, dan anda siap untuk mulai menggunakan AdGuard Home.",
    "install_devices_router": "Router",
-    "install_devices_router_desc": "Pengaturan ini akan secara otomatis mencakup semua perangkat yang terhubung ke router rumah anda dan anda tak perlu mengkonfigurasikan secara manual.",
+    "install_devices_router_desc": "Setelan ini akan secara otomatis mencakup semua perangkat yang terhubung ke router rumah anda dan anda tak perlu mengkonfigurasikan secara manual.",
    "install_devices_address": "Server DNS AdGuard Home akan menggunakan alamat berikut",
    "install_devices_router_list_1": "Buka preferensi untuk router Anda. Biasanya, Anda dapat mengaksesnya dari browser Anda melalui URL, seperti http://192.168.0.1/ atau http://192.168.1.1/. Anda mungkin diminta untuk memasukkan kata sandi. Jika Anda tidak mengingatnya, Anda sering kali dapat mengatur ulang kata sandi dengan menekan tombol pada perute itu sendiri, tetapi perlu diketahui bahwa jika prosedur ini dipilih, Anda mungkin akan kehilangan seluruh konfigurasi perute. Jika router Anda memerlukan aplikasi untuk menyiapkannya, instal aplikasi tersebut di ponsel atau PC Anda dan gunakan untuk mengakses pengaturan router.",
    "install_devices_router_list_2": "Temukan pengaturan DHCP / DNS. Cari huruf DNS di sebelah bidang yang memungkinkan dua atau tiga set angka, masing-masing dipecah menjadi empat grup dengan satu hingga tiga digit.",
@@ -317,10 +318,10 @@
    "install_devices_router_list_4": "Anda tidak dapat menyetel server DNS kustom pada beberapa tipe router. Dalam hal ini mungkin membantu jika Anda mengatur AdGuard Home sebagai <0>server DHCP</0>. Jika tidak, Anda harus mencari petunjuk tentang cara mengkustomisasi server DNS untuk model router khusus Anda.",
    "install_devices_windows_list_1": "Buka Panel Kontrol melalui menu Start atau pencarian Windows.",
    "install_devices_windows_list_2": "Masuk ke kategori Jaringan dan Internet (Network and Internet) dan kemudian ke Pusat Jaringan dan Berbagi (Network and Sharing Center).",
-    "install_devices_windows_list_3": "Di sisi kiri layar temukan Ubah pengaturan adaptor dan klik.",
+    "install_devices_windows_list_3": "Di sisi kiri layar temukan \"Ubah pengaturan adaptor\" dan klik di atasnya.",
    "install_devices_windows_list_4": "Pilih koneksi aktif Anda, klik kanan padanya dan pilih Properties.",
-    "install_devices_windows_list_5": "Temukan Internet Protocol Version 4 (TCP / IP) dalam daftar, pilih dan kemudian klik Properties lagi.",
-    "install_devices_windows_list_6": "Pilih Gunakan alamat server DNS dan masukkan alamat server AdGuard Anda.",
+    "install_devices_windows_list_5": "Temukan \"Internet Protocol Version 4 (TCP/IPv4)\" (atau, untuk IPv6, \"Internet Protocol Version 6 (TCP/IPv6)\") dalam daftar, pilih dan kemudian klik Properties lagi.",
+    "install_devices_windows_list_6": "Pilih \"Gunakan alamat server DNS berikut\" dan masukkan alamat server Beranda AdGuard Anda.",
    "install_devices_macos_list_1": "Klik pada ikon Apple dan pergi ke System Preferences.",
    "install_devices_macos_list_2": "Klik pada Jaringan (Network)",
    "install_devices_macos_list_3": "Pilih koneksi pertama dalam daftar dan klik Advanced.",
@@ -329,7 +330,7 @@
    "install_devices_android_list_2": "Ketuk Wi-Fi pada menu. Layar akan mencantumkan semua jaringan yang tersedia dan akan ditampilkan (tidak mungkin untuk mengatur DNS khusus untuk koneksi seluler).",
    "install_devices_android_list_3": "Tekan lama jaringan yang terhubung, dan ketuk Ubah Jaringan.",
    "install_devices_android_list_4": "Pada beberapa perangkat, Anda mungkin perlu mencentang kotak Advanced untuk melihat pengaturan lebih lanjut. Untuk menyesuaikan pengaturan DNS Android Anda, Anda perlu mengalihkan pengaturan IP dari DHCP ke Statis.",
-    "install_devices_android_list_5": "Ubah nilai DNS 1 & DNS 2 ke alamat server AdGuard Home",
+    "install_devices_android_list_5": "Ubah nilai DNS 1 dan DNS 2 ke alamat server AdGuard Home Anda.",
    "install_devices_ios_list_1": "Dari layar beranda, ketuk Pengaturan.",
    "install_devices_ios_list_2": "Pilih Wi-Fi di menu sebelah kiri (tidak mungkin untuk mengkonfigurasi DNS untuk jaringan seluler).",
    "install_devices_ios_list_3": "Ketuk nama jaringan yang saat ini aktif.",
@@ -399,7 +400,7 @@
    "client_edit": "Ubah Klien",
    "client_identifier": "Identifikasi",
    "ip_address": "Alamat IP",
-    "client_identifier_desc": "Klien dapat diidentifikasi oleh alamat IP, CIDR, alamat MAC atau ID klien khusus (dapat digunakan untuk DoT/DoH/DoQ). <0>Di sini</0> Anda dapat mempelajari lebih lanjut tentang bagaimana mengidentifikasi klien.",
+    "client_identifier_desc": "Klien dapat diidentifikasi oleh alamat IP, CIDR, alamat MAC atau ID klien khusus (dapat digunakan untuk DoT/DoH/DoQ). <0>Di sini</0> Anda dapat mempelajari lebih lanjut tentang cara mengidentifikasi klien.",
    "form_enter_ip": "Masukkan IP",
    "form_enter_subnet_ip": "Masukkan alamat IP di subnet \"{{cidr}}\"",
    "form_enter_mac": "Masukkan MAC",
@@ -419,11 +420,11 @@
    "access_title": "Pengaturan akses",
    "access_desc": "Disini anda dapat mengatur aturan akses untuk server AdGuard Home DNS.",
    "access_allowed_title": "Klien yang diizinkan",
-    "access_allowed_desc": "Daftar CIDR atau alamat IP. Jika dikonfigurasi, AdGuard Home hanya akan menerima permintaan dari alamat IP ini.",
+    "access_allowed_desc": "Daftar CIDR, alamat IP, atau ID klien. Jika dikonfigurasi, AdGuard Home hanya akan menerima permintaan dari klien ini.",
    "access_disallowed_title": "Klien yang tidak diizinkan",
-    "access_disallowed_desc": "Daftar CIDR atau alamat IP. Jika dikonfigurasi, AdGuard Home akan membatalkan permintaan dari alamat IP ini.",
+    "access_disallowed_desc": "Daftar CIDR, alamat IP, atau ID klien. Jika dikonfigurasi, AdGuard Home akan menghapus permintaan dari klien ini. Jika klien yang diizinkan dikonfigurasi, bidang ini diabaikan.",
    "access_blocked_title": "Domain yang diblokir",
-    "access_blocked_desc": "Jangan bingung antara ini dengan filter. AdGuard Home akan membatalkan kueri DNS dengan domain ini dalam pertanyaan kueri. Di sini Anda dapat menentukan nama domain yang tepat, karakter pengganti, dan aturan filter URL, mis. \"example.org\", \"*.example.org\" atau \"||example.org^\".",
+    "access_blocked_desc": "Jangan bingung dengan filter. AdGuard Home menghapus kueri DNS yang cocok dengan domain ini, dan kueri ini bahkan tidak muncul di log kueri. Anda dapat menentukan nama domain, karakter pengganti, atau aturan filter URL yang tepat, mis. \"example.org\", \"*.example.org\", atau \"||example.org^\" yang sesuai.",
    "access_settings_saved": "Pengaturan akses berhasil disimpan",
    "updates_checked": "Pembaruan berhasil dicek",
    "updates_version_equal": "AdGuard Home sudah tebaru",
@@ -477,10 +478,12 @@
    "encryption_key_source_content": "Tempel konten kunci pribadi",
    "stats_params": "Konfigurasi statistik",
    "config_successfully_saved": "Konfigurasi berhasil disimpan",
+    "interval_6_hour": "6 jam",
    "interval_24_hour": "24 jam",
    "interval_days": "{{count}} hari",
    "interval_days_plural": "{{count}} hari",
    "domain": "Domain",
+    "punycode": "Kode kecil",
    "answer": "Jawab",
    "filter_added_successfully": "Filter telah berhasil ditambahkan",
    "filter_removed_successfully": "Daftar ini telah sukses dihapus",
@@ -488,7 +491,7 @@
    "statistics_configuration": "Konfigurasi statistik",
    "statistics_retention": "Statistik disimpan",
    "statistics_retention_desc": "Jika Anda menurunkan nilai interval, beberapa data akan hilang",
-    "statistics_clear": " Hapus statistik",
+    "statistics_clear": "Hapus statistik",
    "statistics_clear_confirm": "Apakah Anda yakin ingin menghapus statistik?",
    "statistics_retention_confirm": "Apakah Anda yakin ingin mengubah retensi statistik? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
    "statistics_cleared": "Statistik berhasil dihapus",
@@ -523,8 +526,8 @@
    "rewrite_domain_name": "Nama domain: tambah ke rekaman CNAME",
    "rewrite_A": "<0>A</0>: nilai khusus, biarkan <0>A</0> merekam dari upstream",
    "rewrite_AAAA": "<0>AAAA</0>: nilai khusus, biarkan <0>AAAA</0> merekam dari upstream",
-    "disable_ipv6": "Matikan IPv6",
-    "disable_ipv6_desc": "Apabila fitur ini dinyalakan, semua permintaan DNS untuk alamat-alamat IPv6 (tipe AAAA) akan diputus.",
+    "disable_ipv6": "Nonaktifkan penyelesaian alamat IPv6",
+    "disable_ipv6_desc": "Jatuhkan semua kueri DNS untuk alamat IPv6 (ketik AAAA).",
    "fastest_addr": "Alamat IP tercepat",
    "fastest_addr_desc": "Kuiri semua server DNS dan kembalikan alamat IP tercepat diantara semua tanggapan. Ini memperlambat pencarian DNS Sebagai Rumah AdGuard harus menunggu tanggapan dari semua server DNS, tapi meningkatkan konektivitas keseluruhan.",
    "autofix_warning_text": "Apabila anda menekan \"Perbaiki\", AdGuardHome akan mengatur sistem anda untuk menggunakan server DNS AdGuardHome.",
@@ -568,7 +571,7 @@
    "show_whitelisted_responses": "Dalam Daftar Putih",
    "show_processed_responses": "Terproses",
    "blocked_safebrowsing": "Terblokir oleh Safebrowsing",
-    "blocked_adult_websites": "Situs Dewasa Terblokir",
+    "blocked_adult_websites": "Diblok oleh Kontrol Orang tua",
    "blocked_threats": "Blokir Ancaman",
    "allowed": "Dibolehkan",
    "filtered": "Tersaring",
@@ -586,6 +589,8 @@
    "cache_ttl_min_override_desc": "Perpanjang nilai waktu-online singkat (detik) yang diterima dari server upstream saat menyimpan respons DNS",
    "cache_ttl_max_override_desc": "Tetapkan nilai waktu-online maksimum (detik) untuk entri di cache DNS",
    "ttl_cache_validation": "Nilai TTL cache minimum harus kurang dari atau sama dengan nilai maksimum",
+    "cache_optimistic": "Caching yang optimis",
+    "cache_optimistic_desc": "Buat AdGuard Home merespons dari cache bahkan ketika entri telah kedaluwarsa dan juga mencoba untuk menyegarkannya.",
    "filter_category_general": "Umum",
    "filter_category_security": "Keamanan",
    "filter_category_regional": "Wilayah",
@@ -599,6 +604,7 @@
    "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.",
    "adg_will_drop_dns_queries": "AdGuard Home akan menghapus semua permintaan DNS dari klien ini.",
-    "client_not_in_allowed_clients": "Klien tidak diizinkan karena tidak ada dalam daftar \"Klien yang diizinkan\".",
-    "experimental": "Eksperimental"
+    "experimental": "Eksperimental",
+    "use_saved_key": "Gunakan kunci yang disimpan sebelumnya",
+    "parental_control": "Kontrol Orang Tua"
 }
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -27,7 +27,7 @@
    "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_not_found": "È sicuro attivare il server DHCP integrato poiché AdGuard Home non ha rilevato alcun server DHCP attivo sulla rete. Tuttavia, dovresti effettuare un ricontrollo manuale poiché la ricerca automatica attualmente non garantisce un\\'affidabilità del 100%.",
+    "dhcp_not_found": "È sicuro attivare il server DHCP integrato poiché AdGuard Home non ha rilevato alcun server DHCP attivo sulla rete. Tuttavia, dovresti effettuare un ricontrollo manuale poiché la ricerca automatica attualmente non garantisce un'affidabilità del 100%.",
    "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",
@@ -36,21 +36,28 @@
    "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",
-    "form_error_ip_format": "Formato IPv4 non valido",
-    "form_error_mac_format": "Formato MAC non valido",
-    "form_error_client_id_format": "Formato ID cliente non valido",
+    "form_error_ip4_format": "Indirizzo IPv4 non valido",
+    "form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
+    "form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
+    "form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
+    "form_error_ip6_format": "Indirizzo IPv6 non valido",
+    "form_error_ip_format": "Indirizzo IP non valido",
+    "form_error_mac_format": "Indirizzo MAC non valido",
+    "form_error_client_id_format": "ID cliente non valido",
    "form_error_server_name": "Nome server non valido",
-    "form_error_subnet": "La subnet \"{{cidr}}\" non contiene l\\'indirizzo IP \"{{ip}}\"",
+    "form_error_subnet": "La subnet \"{{cidr}}\" non contiene l'indirizzo IP \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
+    "greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
+    "greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
+    "subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
+    "gateway_or_subnet_invalid": "Maschera di sottorete non valida",
    "dhcp_form_gateway_input": "IP Gateway",
    "dhcp_form_subnet_input": "Maschera di sottorete",
-    "dhcp_form_range_title": "Range indirizzi IP",
-    "dhcp_form_range_start": "Inizio range",
-    "dhcp_form_range_end": "Fine range",
+    "dhcp_form_range_title": "Intervallo di indirizzi IP",
+    "dhcp_form_range_start": "Intervallo iniziale",
+    "dhcp_form_range_end": "Intervallo finale",
    "dhcp_form_lease_title": "Tempo di lease DHCP (in secondi)",
    "dhcp_form_lease_input": "Durata lease",
    "dhcp_interface_select": "Seleziona l'interfaccia DHCP",
@@ -62,7 +69,7 @@
    "dhcp_warning": "Se desideri attivare il server DHCP integrato, assicurati che non vi siano altri server DHCP attivi, ciò potrebbe causare problemi di connessione alla rete per i dispositivi collegati!",
    "dhcp_error": "AdGuard Home non può determinare se è presente un altro server DHCP attivo nella rete.",
    "dhcp_static_ip_error": "Per utilizzare il server DHCP è necessario impostare un indirizzo IP statico. AdGuard Home non è riuscito a determinare se questa interfaccia di rete è configurata utilizzando un indirizzo IP statico. Ti preghiamo di impostare manualmente un indirizzo IP statico.",
-    "dhcp_dynamic_ip_found": "Il tuo sistema utilizza una configurazione di indirizzi IP dinamici per l\\'interfaccia <0>{{interfaceName}}</0>. Per poter utilizzare un server DHCP, è necessario impostare un indirizzo IP statico. Il tuo indirizzo IP attuale è <0>{{ipAddress}}</0>. AdGuard Home imposterà automaticamente questo indirizzo come statico quando cliccherai il pulsante \"Attiva server DHCP\".",
+    "dhcp_dynamic_ip_found": "Il tuo sistema utilizza una configurazione di indirizzi IP dinamici per l'interfaccia <0>{{interfaceName}}</0>. Per poter utilizzare un server DHCP, è necessario impostare un indirizzo IP statico. Il tuo indirizzo IP attuale è <0>{{ipAddress}}</0>. AdGuard Home imposterà automaticamente questo indirizzo come statico quando cliccherai il pulsante \"Attiva server DHCP\".",
    "dhcp_lease_added": "Lease statici \"{{key}}\" aggiunti correttamente",
    "dhcp_lease_deleted": "Lease statico \"{{key}}\" eliminato correttamente",
    "dhcp_new_static_lease": "Nuovo lease statico",
@@ -98,7 +105,7 @@
    "copyright": "Copyright",
    "homepage": "Pagina principale",
    "report_an_issue": "Segnala un problema",
-    "privacy_policy": "Politica sulla riservatezza",
+    "privacy_policy": "Politica sulla Riservatezza",
    "enable_protection": "Attiva protezione",
    "enabled_protection": "Protezione attiva",
    "disable_protection": "Disattiva protezione",
@@ -123,7 +130,7 @@
    "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 blocco host",
+    "number_of_dns_query_blocked_24_hours": "Numero di richieste DNS bloccate dai filtri per annunci e dagli elenchi di blocco host",
    "number_of_dns_query_blocked_24_hours_by_sec": "Numero di richieste DNS bloccate dal modulo sicurezza di navigazione di AdGuard",
    "number_of_dns_query_blocked_24_hours_adult": "Numero di siti web per adulti bloccati",
    "enforced_save_search": "Ricerca sicura forzata",
@@ -133,7 +140,7 @@
    "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>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 è bloccato dal servizio web di sicurezza della navigazione. Utilizzerà l\\'API di ricerca rispettosa della privacy per eseguire il controllo: solo un breve prefisso hash SHA256 del nome di dominio viene inviato al server.",
+    "use_adguard_browsing_sec_hint": "AdGuard Home verificherà se il dominio è bloccato dal servizio web di sicurezza della navigazione. Utilizzerà l'API di ricerca rispettosa della privacy per eseguire il controllo: solo un breve prefisso hash SHA256 del nome di dominio viene inviato al server.",
    "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'.",
    "enforce_safe_search": "Utilizza ricerca sicura",
@@ -141,7 +148,7 @@
    "no_servers_specified": "Nessun server specificato",
    "general_settings": "Impostazioni generali",
    "dns_settings": "Impostazioni DNS",
-    "dns_blocklists": "Lista nera DNS",
+    "dns_blocklists": "Liste nere DNS",
    "dns_allowlists": "Liste bianche DNS",
    "dns_blocklists_desc": "AdGuard Home bloccherà i domini che corrispondenti alla lista nera.",
    "dns_allowlists_desc": "I domini DNS nelle liste bianche saranno consentiti anche fossero presenti in una delle liste nere.",
@@ -156,8 +163,8 @@
    "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_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": "Ricerca sicura disattivata",
@@ -173,29 +180,30 @@
    "delete_table_action": "Elimina",
    "elapsed": "Trascorso",
    "filters_and_hosts_hint": "AdGuard Home è in grado di comprendere la sintassi delle regole blocca-annunci o quelle dei file hosts.",
-    "no_blocklist_added": "Non è stata aggiunta alcuna lista di blocco",
+    "no_blocklist_added": "Non è stata aggiunta alcuna lista nera",
    "no_whitelist_added": "Non è stata aggiunta alcuna lista bianca",
-    "add_blocklist": "Aggiungi lista di blocco",
+    "add_blocklist": "Aggiungi lista nera",
    "add_allowlist": "Aggiungi lista bianca",
    "cancel_btn": "Annulla",
    "enter_name_hint": "Inserisci nome",
-    "enter_url_or_path_hint": "Inmetti un URL o il percorso assoluto della lista",
+    "enter_url_or_path_hint": "Inmetti un URL o il percorso assoluto dell'elenco",
    "check_updates_btn": "Ricerca aggiornamenti",
-    "new_blocklist": "Nuova lista di blocco",
+    "new_blocklist": "Nuova lista nera",
    "new_allowlist": "Nuova lista bianca",
-    "edit_blocklist": "Modifica lista di blocco",
+    "edit_blocklist": "Modifica lista nera",
    "edit_allowlist": "Modifica lista bianca",
-    "choose_blocklist": "Scegli liste di blocco",
+    "choose_blocklist": "Scegli liste nere",
    "choose_allowlist": "Scegli liste bianche",
-    "enter_valid_blocklist": "Inserisci un URL valido nella lista di blocco.",
-    "enter_valid_allowlist": "Inserisci un URL valido nella lista bianca.",
+    "enter_valid_blocklist": "Inserisci un URL valido alla lista nera.",
+    "enter_valid_allowlist": "Inserisci un URL valido alla lista bianca.",
    "form_error_url_format": "Formato url non valido",
-    "form_error_url_or_path_format": "URL o percorso assoluto della lista non valido",
+    "form_error_url_or_path_format": "URL o percorso assoluto dell'elenco non validi",
    "custom_filter_rules": "Regole filtri personalizzate",
    "custom_filter_rules_hint": "Inserisci una regola per riga. Puoi utilizzare la sintassi delle regole blocca-annunci o quelle dei file hosts.",
+    "system_host_files": "File host di sistema",
    "examples_title": "Esempi",
    "example_meaning_filter_block": "blocca accesso al dominio example.org e a tutti i suoi sottodomini",
-    "example_meaning_filter_whitelist": "consente l\\'accesso al dominio esempio.org e a tutti i relativi sottodomini",
+    "example_meaning_filter_whitelist": "consente l'accesso al dominio esempio.org e a tutti i relativi sottodomini",
    "example_meaning_host_block": "AdGuard Home restituirà 127.0.0.1 come indirizzo per il dominio example.org (ma non per i suoi sottodomini)",
    "example_comment": "! Qui va un commento",
    "example_comment_meaning": "un commento",
@@ -207,8 +215,8 @@
    "example_upstream_doq": "<0>DNS su QUIC</0> crittografato",
    "example_upstream_sdns": "puoi utilizzare <0>DNS Stamps</0> per <1>DNSCrypt</1> oppure dei risolutori <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",
+    "all_lists_up_to_date_toast": "Tutti gli elenchi sono aggiornati",
+    "updated_upstream_dns_toast": "I server upstream sono stati salvati correttamente",
    "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",
    "unblock": "Sblocca",
@@ -235,7 +243,7 @@
    "loading_table_status": "Caricamento...",
    "page_table_footer_text": "Pagina",
    "rows_table_footer_text": "righe",
-    "updated_custom_filtering_toast": "Le regole dei filtri personalizzate sono state aggiornate",
+    "updated_custom_filtering_toast": "Le regole personalizzate sono state correttamente salvate",
    "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}}",
@@ -281,22 +289,22 @@
    "rate_limit_desc": "Il numero di richieste al secondo consentite da un singolo client. Impostare questo valore a 0 rimuove le limitazioni.",
    "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": "Risponde con un indirizzo IP pari a zero (0.0.0.0 per A; :: per AAAA) quando bloccato da una regola in stile Blocca-annunci; risponde con l\\'indirizzo IP specificato nella regola quando bloccato da una regola in stile /etc/hosts",
+    "blocking_mode_default": "Risponde con un indirizzo IP pari a zero (0.0.0.0 per A; :: per AAAA) quando bloccato da una regola in stile Blocca-annunci; risponde con l'indirizzo IP specificato nella regola quando bloccato da una regola in stile /etc/hosts",
    "blocking_mode_refused": "REFUSED: Risposta con codice di REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Rispondi con il codice NXDOMAIN",
    "blocking_mode_null_ip": "IP nullo: Rispondi con indirizzo IP zero (0.0.0.0 per A; :: per AAAA)",
    "blocking_mode_custom_ip": "IP personalizzato: Rispondi con un indirizzo IP impostato manualmente",
    "upstream_dns_client_desc": "Se lasci questo spazio vuoto, AdGuard Home utilizzerà i server configurati nelle <0>impostazioni DNS</0>.",
-    "tracker_source": "Origine tracker",
+    "tracker_source": "Origine tracciante",
    "source_label": "Fonte",
    "found_in_known_domain_db": "Trovato nel database dei domini conosciuti.",
    "category_label": "Categoria",
    "rule_label": "Regola(e)",
-    "list_label": "Lista",
+    "list_label": "Elenco",
    "unknown_filter": "Filtro sconosciuto {{filterId}}",
-    "known_tracker": "Tracker conosciuto",
+    "known_tracker": "Tracciante noto",
    "install_welcome_title": "Benvenuto nella Home di AdGuard!",
-    "install_welcome_desc": "AdGuard Home è un server DNS che blocca annunci e tracker in tutta la rete. Il suo scopo è quello di consentire di controllare l'intera rete e tutti i dispositivi, e non richiede l'utilizzo di un programma sul lato client.",
+    "install_welcome_desc": "AdGuard Home è un server DNS che blocca annunci e traccianti in tutta la rete. Il suo scopo è quello di consentire di controllare l'intera rete e tutti i dispositivi, e non richiede l'utilizzo di un programma sul lato client.",
    "install_settings_title": "Interfaccia Web dell'Admin",
    "install_settings_listen": "Interfaccia d'ascolto",
    "install_settings_port": "Porta",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Sarà necessario configurare i dispositivi o il router per utilizzare il server DNS nei seguenti indirizzi:",
    "install_settings_all_interfaces": "Tutte le interfacce",
    "install_auth_title": "Autenticazione",
-    "install_auth_desc": "Si consiglia vivamente di configurare l'autenticazione della password per l'interfaccia web di amministrazione di AdGuard Home. Anche se è accessibile solo nella rete locale, è comunque importante proteggerlo da accessi illimitati.",
+    "install_auth_desc": "L'autenticazione con password sulla tua interfaccia web da amministratore di AdGuard Home dev'esser configurata. Anche se AdGuard Home è accessibile solo dalla tua rete locale, è comunque importante proteggerlo da accessi non limitati.",
    "install_auth_username": "Nome utente",
    "install_auth_password": "Password",
    "install_auth_confirm": "Conferma password",
@@ -320,7 +328,7 @@
    "install_devices_router": "Router",
    "install_devices_router_desc": "Questa configurazione copre automaticamente tutti i dispositivi collegati al router di casa, non è necessario configurarli manualmente.",
    "install_devices_address": "Il server DNS di AdGuard Home sta ascoltando sui seguenti indirizzi",
-    "install_devices_router_list_1": "Accedi alle preferenze del tuo router. Di solito, puoi farlo dal tuo browser tramite un URL, come http://192.168.0.1/ o http://192.168.1.1/. Potrebbe esserti chiesto di inserire una password. Se non dovessi ricordarla, puoi reimpostare la password premendo un pulsante presente sullo stesso router, ma tieni presente che scegliendo questa procedura, probabilmente perderai l\\'intera configurazione del router. Se il tuo router necessitasse di un\\'app per configurarlo, installala sul tuo telefono o PC e utilizzala per accedere alle impostazioni del router.",
+    "install_devices_router_list_1": "Accedi alle preferenze del tuo router. Di solito, puoi farlo dal tuo browser tramite un URL, come http://192.168.0.1/ o http://192.168.1.1/. Potrebbe esserti chiesto di inserire una password. Se non dovessi ricordarla, puoi reimpostare la password premendo un pulsante presente sullo stesso router, ma tieni presente che scegliendo questa procedura, probabilmente perderai l'intera configurazione del router. Se il tuo router necessitasse di un'app per configurarlo, installala sul tuo telefono o PC e utilizzala per accedere alle impostazioni del router.",
    "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": "Su alcuni tipi di router, non è possibile configurare un server DNS personalizzato. In tal caso, configurare AdGuard Home come un <0>server DHCP</0> potrebbe aiutare. In alternativa, dovresti leggere il manuale di istruzioni per capire come personalizzare i server DNS sul tuo specifico modello di router.",
@@ -328,20 +336,20 @@
    "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 \"Cambia impostazioni adattatore\" e clicca 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/IPv4)\" (o, per IPv6, \"Protocollo Internet versione 6 (TCP/IPv6)\" nella lista, selezionalo e quindi clicca nuovamente su Proprietà.",
+    "install_devices_windows_list_5": "Trova \"Protocollo Internet versione 4 (TCP/IPv4)\" (o, per IPv6, \"Protocollo Internet versione 6 (TCP/IPv6)\" nell'elenco, selezionalo e quindi clicca nuovamente su Proprietà.",
    "install_devices_windows_list_6": "Scegli \"Utilizza i seguenti indirizzi server DNS\" ed inserisci i tuoi indirizzi 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.",
+    "install_devices_macos_list_3": "Seleziona la prima connessione nel tuo elenco e clicca su Avanzate.",
    "install_devices_macos_list_4": "Seleziona la scheda DNS e inserisci gli indirizzi del tuo server AdGuard Home",
-    "install_devices_android_list_1": "Dalla schermata Home Menu di Android, tocca Impostazioni.",
-    "install_devices_android_list_2": "Tocca Wi-Fi nel menu. Verrà visualizzata la schermata che elenca tutte le reti disponibili (impossibile impostare il DNS personalizzato per la connessione mobile).",
-    "install_devices_android_list_3": "Premi a lungo la rete a cui sei connesso e tocca Modifica rete.",
+    "install_devices_android_list_1": "Dalla schermata Home Menu di Android, clicca Impostazioni.",
+    "install_devices_android_list_2": "Clicca sulla voce Wi-Fi nel menu. Verrà visualizzata una schermata che elencherà tutte le reti disponibili (sarà impossibile impostare il DNS personalizzato per la connessione mobile).",
+    "install_devices_android_list_3": "Premi a lungo la rete a cui sei connesso e clicca Modifica rete.",
    "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_1": "Dalla schermata principale, clicca Impostazioni.",
    "install_devices_ios_list_2": "Scegli Wi-Fi nel menu a sinistra (impossibile configurare DNS per reti mobile).",
-    "install_devices_ios_list_3": "Toccare il nome della rete attualmente attiva.",
+    "install_devices_ios_list_3": "Clicca sul nome della rete attualmente attiva.",
    "install_devices_ios_list_4": "Nel campo DNS inserisci gli indirizzi del tuo server AdGuard Home.",
    "get_started": "Inizia",
    "next": "Prossimo",
@@ -380,7 +388,7 @@
    "encryption_reset": "Sei sicuro di voler ripristinare le impostazioni di crittografia?",
    "topline_expiring_certificate": "Il tuo certificato SSL sta per scadere. Aggiorna le<0> Impostazioni di crittografia </ 0>.",
    "topline_expired_certificate": "Il tuo certificato SSL è scaduto. Aggiorna le <0> Impostazioni di crittografia </ 0>.",
-    "form_error_port_range": "Immettere il valore della porta nell\\'intervallo 80-65535",
+    "form_error_port_range": "Immettere il valore della porta nell'intervallo 80-65535",
    "form_error_port_unsafe": "Questa è una porta non sicura",
    "form_error_equal": "Non dovrebbe essere uguale",
    "form_error_password": "Password non corrispondente",
@@ -392,9 +400,9 @@
    "dns_status_error": "Errore nel recupero dello stato del server DNS",
    "down": "Spenta",
    "fix": "Risolvi",
-    "dns_providers": "Qui c\\'è una <0>lista di provider DNS</0> da cui scegliere.",
+    "dns_providers": "Qui c'è un <0>elenco di fornitori DNS conosciuti</0> da cui scegliere.",
    "update_now": "Aggiorna ora",
-    "update_failed": "Aggiornamento automatico non riuscito. Si prega di <a>seguire questi passaggi</a>per aggiornare manualmente.",
+    "update_failed": "Aggiornamento automatico non riuscito. Ti suggeriamo di <a>seguire questi passaggi</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",
@@ -422,15 +430,15 @@
    "client_updated": "Client \"{{key}}\" aggiornato correttamente",
    "clients_not_found": "Nessun client trovato",
    "client_confirm_delete": "Sei sicuro di voler eliminare il client \"{{key}}\"?",
-    "list_confirm_delete": "Sei sicuro di voler eliminare questa lista?",
+    "list_confirm_delete": "Sei sicuro di voler eliminare questo elenco?",
    "auto_clients_title": "Clienti (tempo di esecuzione)",
    "auto_clients_desc": "Dati dei clienti che utilizzano AdGuard Home, ma che non sono salvati nella configurazione",
    "access_title": "Impostazioni di accesso",
    "access_desc": "Qui puoi configurare le regole d'accesso per il server DNS di AdGuard Home.",
    "access_allowed_title": "Client permessi",
-    "access_allowed_desc": "Una lista di CIDR, indirizzi IP o ID client. Se configurata AdGuard Home accetterà richieste solo da questi client.",
+    "access_allowed_desc": "Un elenco di CIDR, indirizzi IP o ID client. Se configurata AdGuard Home accetterà richieste solo da questi client.",
    "access_disallowed_title": "Client non permessi",
-    "access_disallowed_desc": "Una lista di CIDR, indirizzi IP o ID client. Se configurata, AdGuard Home rifiuterà richieste da questi client. Se i client consentiti risulteranno configurati, questo campo verrà ignorato.",
+    "access_disallowed_desc": "Un elenco di CIDR, indirizzi IP o ID client. Se configurata, AdGuard Home rifiuterà richieste da questi client. Se i client consentiti risulteranno configurati, questo campo verrà ignorato.",
    "access_blocked_title": "Domini bloccati",
    "access_blocked_desc": "Da non confondere con i filtri. AdGuard Home eliminerà le richieste DNS corrispondenti a questi domini e queste richieste non verranno visualizzate nel relativo registro. Puoi specificare nomi di dominio esatti, caratteri jolly o regole di filtraggio URL, ad esempio \"esempio.org\", \"*.esempio.org\" o \"||esempio.org^\".",
    "access_settings_saved": "Impostazioni di accesso salvate correttamente",
@@ -493,16 +501,17 @@
    "domain": "Dominio",
    "punycode": "Punycode",
    "answer": "Risposta",
-    "filter_added_successfully": "Il filtro è stato aggiunto correttamente",
-    "filter_removed_successfully": "La lista è stata correttamente rimossa",
-    "filter_updated": "Il filtro è stato aggiornato correttamente",
+    "filter_added_successfully": "L'elenco è stato aggiunto correttamente",
+    "filter_removed_successfully": "L'elenco è stata correttamente rimosso",
+    "filter_updated": "L'elenco è 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_clear": " Azzera statistiche",
+    "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_cleared": "Statistiche azzerate correttamente",
+    "statistics_enable": "Attiva statistiche",
    "interval_hours": "{{count}} ora",
    "interval_hours_plural": "{{count}} ore",
    "filters_configuration": "Configurazione filtri",
@@ -523,7 +532,7 @@
    "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 elenchi host.",
    "blocked_by_response": "Bloccato per CNAME o IP in risposta",
    "blocked_by_cname_or_ip": "Bloccato da CNAME o IP",
    "try_again": "Riprova",
@@ -537,7 +546,7 @@
    "disable_ipv6": "Disattiva risoluzione indirizzi IPv6",
    "disable_ipv6_desc": "Elimina tutte le richieste DNS per gli indirizzi IPv6 (tipo AAAA).",
    "fastest_addr": "Indirizzo IP più veloce",
-    "fastest_addr_desc": "Interroga tutti i server DNS e restituisci l\\'indirizzo IP più veloce tra tutte le risposte. Ciò rallenterà le richieste DNS poiché AdGuard Home dovrà attendere le risposte da tutti i server DNS, ma ciò migliorerà complessivamente la connettività.",
+    "fastest_addr_desc": "Interroga tutti i server DNS e restituisci l'indirizzo IP più veloce tra tutte le risposte. Ciò rallenterà le richieste DNS poiché AdGuard Home dovrà attendere le risposte da tutti i server DNS, ma ciò migliorerà complessivamente la connettività.",
    "autofix_warning_text": "Se fai clic su \"Correggi\", AdGuardHome configurerà il tuo sistema per utilizzare il server DNS AdGuardHome.",
    "autofix_warning_list": "Eseguirà queste attività: <0> Disattiva DNSStubListener di sistema </0> <0> Imposta l'indirizzo del server DNS su 127.0.0.1 </0> <0> Sostituisci la destinazione del collegamento simbolico di /etc/resolv.conf su / run / systemd /resolve/resolv.conf </0> <0> Arresta DNSStubListener (ricarica il servizio systemd-resolved) </0>",
    "autofix_warning_result": "Di conseguenza, tutte le richieste DNS dal sistema verranno elaborate da AdGuardHome per impostazione predefinita.",
@@ -549,9 +558,9 @@
    "check": "Controlla",
    "form_enter_host": "Inserisci un nome per l'host",
    "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",
+    "choose_from_list": "Scegli dall'elenco",
+    "add_custom_list": "Aggiungi elenco personalizzato",
+    "host_whitelisted": "L'host è stato aggiunto alla lista bianca",
    "check_ip": "Indirizzi IP: {{ip}}",
    "check_cname": "CNAME: {{cname}}",
    "check_reason": "Motivo: {{reason}}",
@@ -566,26 +575,26 @@
    "static_ip_desc": "AdGuard Home è un server quindi ha bisogno di un indirizzo IP statico per funzionare correttamente. In caso contrario, ad un certo punto, il router potrebbe assegnare un indirizzo IP differente a questo dispositivo.",
    "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": "AdGuard Home ha rilevato l\\'utilizzo dell\\'indirizzo IP dinamico <0> {{ip}} </0>. Desideri impostarlo come indirizzo statico?",
+    "install_static_error": "AdGuard Home non può configurarlo automaticamente per questa interfaccia di rete. Ti suggeriamo di cercare un metodo alternativo per effettuare tale operazione manualmente.",
+    "install_static_configure": "AdGuard Home ha rilevato l'utilizzo dell'indirizzo IP dinamico <0> {{ip}} </0>. Desideri impostarlo come indirizzo statico?",
    "confirm_static_ip": "AdGuard Home configurerà {{ip}} come indirizzo IP statico. Desideri procedere?",
-    "list_updated": "{{count}} lista aggiornata",
-    "list_updated_plural": "{{count}} liste aggiornate",
+    "list_updated": "{{count}} elenco aggiornato",
+    "list_updated_plural": "{{count}} elenchi aggiornati",
    "dnssec_enable": "Attiva DNSSEC",
    "dnssec_enable_desc": "Imposta il flag DNSSEC sulle richieste DNS in uscita e ne verifica il risultato (è richiesto un risolutore attivo per DNSSEC).",
    "validated_with_dnssec": "Verificato con DNSSEC",
    "all_queries": "Tutte le richieste",
    "show_blocked_responses": "Bloccato",
-    "show_whitelisted_responses": "Aggiunto alla Lista bianca",
+    "show_whitelisted_responses": "Consentito",
    "show_processed_responses": "Processato",
-    "blocked_safebrowsing": "Blocco Navigazione sicura",
-    "blocked_adult_websites": "Siti per adulti bloccati",
+    "blocked_safebrowsing": "Bloccato da Navigazione Sicura",
+    "blocked_adult_websites": "Bloccato da Controllo Parentale",
    "blocked_threats": "Minacce bloccate",
    "allowed": "Consentito",
    "filtered": "Filtrato",
    "rewritten": "Riscritto",
    "safe_search": "Ricerca sicura",
-    "blocklist": "Lista di blocco",
+    "blocklist": "Lista nera",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Dimensioni cache",
    "cache_size_desc": "Dimensioni cache DNS (in byte)",
@@ -597,21 +606,26 @@
    "cache_ttl_min_override_desc": "Estende i valori brevi (in secondi) ricevuti dal server upstream durante la memorizzazione nella cache delle risposte DNS",
    "cache_ttl_max_override_desc": "Imposta un periodo massimo di attivazione (in secondi) per le voci nella cache DNS",
    "ttl_cache_validation": "Il valore minimo della cache TTL deve essere inferiore o uguale al valore massimo",
-    "cache_optimistic": "Ottimistico",
+    "cache_optimistic": "Optimistic caching",
    "cache_optimistic_desc": "Fai in modo che AdGuard Home risponda dalla cache anche quando le voci risultano scadute e prova anche ad aggiornarle.",
    "filter_category_general": "Generali",
    "filter_category_security": "Sicurezza",
    "filter_category_regional": "Regionale",
    "filter_category_other": "Altro",
-    "filter_category_general_desc": "Liste per il blocco dei traccianti e degli annunci sulla maggioranza dei dispositivi",
+    "filter_category_general_desc": "Elenchi per il blocco dei traccianti e degli annunci sulla maggioranza dei dispositivi",
    "filter_category_security_desc": "Elenchi progettati specificamente per bloccare domini malevoli, di phishing o truffa",
-    "filter_category_regional_desc": "Liste focalizzate su annunci regionali e server traccianti",
-    "filter_category_other_desc": "Altre liste di blocco",
-    "setup_config_to_enable_dhcp_server": "Configurazione dell\\'installazione per l\\'attivazione del server DHCP",
+    "filter_category_regional_desc": "Elenchi focalizzati su annunci regionali e server traccianti",
+    "filter_category_other_desc": "Altre liste nere",
+    "setup_config_to_enable_dhcp_server": "Configurazione dell'installazione per l'attivazione del 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.",
+    "port_53_faq_link": "La Porta 53 è spesso occupata dai servizi \"DNSStubListener\" o \"systemd-resolved\". Ti suggeriamo di leggere <0>queste istruzioni</0> per risolvere il problema.",
    "adg_will_drop_dns_queries": "AdGuard Home eliminerà tutte le richieste DNS da questo client.",
-    "client_not_in_allowed_clients": "Il client non è consentito perché non è nell'elenco \"Client consentiti\".",
-    "experimental": "Sperimentale"
+    "filter_allowlist": "ATTENZIONE: Quest'azione escluderà anche la regola \"{{disallowed_rule}}\" dall'elenco di clienti consentiti.",
+    "last_rule_in_allowlist": "Impossibile bloccare questo client perché escludere la regola \"{{disallowed_rule}}\" DISATIVERÁ l'elenco \"Clienti consentiti\".",
+    "experimental": "Sperimentale",
+    "use_saved_key": "Utilizza la chiave salvata in precedenza",
+    "parental_control": "Controllo Parentale",
+    "safe_browsing": "Navigazione Sicura",
+    "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>"
 }
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -36,16 +36,23 @@
    "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": "IPv4フォーマットではありません",
-    "form_error_mac_format": "MACフォーマットではありません",
-    "form_error_client_id_format": "Client IDの形式が無効です",
+    "form_error_ip4_format": "IPv4アドレスが無効です",
+    "form_error_ip4_range_start_format": "範囲開始のIPv4アドレスが無効です",
+    "form_error_ip4_range_end_format": "範囲終了のIPv4アドレスが無効です",
+    "form_error_ip4_gateway_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_server_name": "サーバ名が無効です",
    "form_error_subnet": "IPアドレス「{{ip}}」はサブネット「{{cidr}}」に含まれていません",
    "form_error_positive": "0より大きい必要があります",
-    "form_error_negative": "0以上である必要があります",
-    "range_end_error": "範囲開始よりも大きくなければなりません",
+    "out_of_range_error": "\"{{start}}\"-\"{{end}}\" の範囲外である必要があります",
+    "lower_range_start_error": "範囲開始よりも低い値である必要があります",
+    "greater_range_start_error": "範囲開始より大きい必要があります",
+    "greater_range_end_error": "範囲終了より大きい必要があります",
+    "subnet_error": "アドレスは１つのサブネット内にある必要があります",
+    "gateway_or_subnet_invalid": "サブネットマスクが無効です",
    "dhcp_form_gateway_input": "ゲートウェイIP",
    "dhcp_form_subnet_input": "サブネットマスク",
    "dhcp_form_range_title": "IPアドレスの範囲",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "リストのURLまたは絶対パスが無効です",
    "custom_filter_rules": "カスタム・フィルタリングルール",
    "custom_filter_rules_hint": "1つの行に1つのルールを入力してください。 広告ブロックルールやhostsファイル構文を使用できます。",
+    "system_host_files": "システムのhostsファイル",
    "examples_title": "例",
    "example_meaning_filter_block": "example.orgドメインとそのすべてのサブドメインへのアクセスをブロックする",
    "example_meaning_filter_whitelist": "example.orgドメインとそのすべてのサブドメインへのアクセスのブロックを解除する",
@@ -208,7 +216,7 @@
    "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": "すべてのリストは既に最新です",
-    "updated_upstream_dns_toast": "上流DNSサーバを更新しました",
+    "updated_upstream_dns_toast": "上流DNSサーバを保存しました。",
    "dns_test_ok_toast": "指定されたDNSサーバは正しく動作しています",
    "dns_test_not_ok_toast": "サーバ \"{{key}}\": 使用できませんでした。正しく入力されているかどうかを確認してください",
    "unblock": "ブロック解除",
@@ -235,7 +243,7 @@
    "loading_table_status": "読み込み中…",
    "page_table_footer_text": "ページ",
    "rows_table_footer_text": "行",
-    "updated_custom_filtering_toast": "カスタム・フィルタリングルールを更新しました",
+    "updated_custom_filtering_toast": "カスタムルールを保存しました。",
    "rule_removed_from_custom_filtering_toast": "ルールをカスタム・フィルタリングルールから除去しました {{rule}}",
    "rule_added_to_custom_filtering_toast": "ルールをカスタム・フィルタリングルールに追加しました {{rule}}",
    "query_log_response_status": "ステータス: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "次のアドレスでDNSサーバを使用するようにあなたのデバイスまたはルータを設定する必要があります:",
    "install_settings_all_interfaces": "すべてのインターフェイス",
    "install_auth_title": "認証",
-    "install_auth_desc": "AdGuard Homeの管理ウェブインターフェースにパスワード認証を設定することを強くお勧めします。ローカルネットワークでのみアクセス可能であっても、制限のないアクセスから保護することは重要です。",
+    "install_auth_desc": "AdGuard Homeの管理ウェブインターフェースにパスワード認証を設定する必要があります。AdGuard Homeがローカルネットワークでのみアクセス可能であっても、制限のないアクセスから保護することは重要です。",
    "install_auth_username": "ユーザ名",
    "install_auth_password": "パスワード",
    "install_auth_confirm": "パスワード（確認用）",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "統計を消去してもよろしいですか？",
    "statistics_retention_confirm": "統計の保持を変更してもよろしいですか？ 期間を短くすると、一部のデータが失われます",
    "statistics_cleared": "統計の消去に成功しました",
+    "statistics_enable": "統計を有効にする",
    "interval_hours": "{{count}}時間",
    "interval_hours_plural": "{{count}}時間",
    "filters_configuration": "フィルタ設定",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "ホワイトリストにあり",
    "show_processed_responses": "処理済",
    "blocked_safebrowsing": "ブロックされたセーフブラウジング",
-    "blocked_adult_websites": "ブロックされたアダルトウェブサイト",
+    "blocked_adult_websites": "ペアレンタルコントロールによってブロックされました",
    "blocked_threats": "ブロックされた脅威",
    "allowed": "許可",
    "filtered": "フィルタで処理",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、上流サーバから受信した短いTTL（秒単位）を延長します",
    "cache_ttl_max_override_desc": "DNSキャッシュ内のエントリの最大TTL（秒単位）を設定します",
    "ttl_cache_validation": "最小キャッシュTTL値は最大値以下にする必要があります",
-    "cache_optimistic": "Optimistic (オプティミスティック)",
+    "cache_optimistic": "Optimistic cashing (オプティミスティック・キャッシュ)",
    "cache_optimistic_desc": "エントリの有効期限が切れた場合でも、AdGuard Homeがキャッシュから応答するようにし、エントリの更新も試みます。",
    "filter_category_general": "一般",
    "filter_category_security": "セキュリティ",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "クエリを表示するにはクリックしてください",
    "port_53_faq_link": "多くの場合、ポート53は \"DNSStubListener\" または \"systemd-resolved\" サービスによって利用されています。これを解決する方法については、<0>この手順</0>をお読みください。",
    "adg_will_drop_dns_queries": "AdGuard Homeは、このクライアントからすべてのDNSクエリを落とします。",
-    "client_not_in_allowed_clients": "「許可されたクライアント」リストにないため、このクライアントは許可されていません。",
-    "experimental": "実験用"
+    "filter_allowlist": "【注意】このアクションは、許可されたクライアントのリストから「{{disallowed_rule}}」というルールも除外します。",
+    "last_rule_in_allowlist": "ルール「{{disallowed_rule}}」を除外すると「許可されたクライアント」リストが無効になるため、このクライアントを拒否することはできません。",
+    "experimental": "実験用",
+    "use_saved_key": "以前に保存したキーを使用する",
+    "parental_control": "ペアレンタルコントロール",
+    "safe_browsing": "セーフブラウジング",
+    "served_from_cache": "{{value}} <i>(キャッシュから応答)</i>"
 }
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -37,6 +37,9 @@
    "dhcp_ipv6_settings": "DHCP IPv6 설정",
    "form_error_required": "필수 필드",
    "form_error_ip4_format": "잘못된 IPv4 형식",
+    "form_error_ip4_range_start_format": "잘못된 범위 시작 IPv4 형식",
+    "form_error_ip4_range_end_format": "잘못된 범위 종료 IPv4 형식",
+    "form_error_ip4_gateway_format": "잘못된 게이트웨이 IPv4 형식",
    "form_error_ip6_format": "잘못된 IPv6 형식",
    "form_error_ip_format": "잘못된 IP 형식",
    "form_error_mac_format": "잘못된 MAC 형식",
@@ -44,8 +47,12 @@
    "form_error_server_name": "유효하지 않은 서버 이름입니다",
    "form_error_subnet": "서브넷 \"{{cidr}}\"에 \"{{ip}}\" IP 주소가 없습니다",
    "form_error_positive": "0보다 커야 합니다",
-    "form_error_negative": "반드시 0 이상이여야 합니다",
-    "range_end_error": "입력 값은 범위의 시작 지점보다 큰 값 이여야 합니다.",
+    "out_of_range_error": "\"{{start}}\"-\"{{end}}\" 범위 밖이어야 합니다",
+    "lower_range_start_error": "범위 시작보다 작은 값이어야 합니다",
+    "greater_range_start_error": "범위 시작보다 큰 값이어야 합니다",
+    "greater_range_end_error": "범위 종료보다 큰 값이어야 합니다",
+    "subnet_error": "주소는 하나의 서브넷 아래에 있어야 합니다",
+    "gateway_or_subnet_invalid": "잘못된 서브넷 마스크",
    "dhcp_form_gateway_input": "게이트웨이 IP",
    "dhcp_form_subnet_input": "서브넷 마스크",
    "dhcp_form_range_title": "IP 주소 범위",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "올바른 URL 또는 목록의 절대 경로가 아닙니다",
    "custom_filter_rules": "커스텀 필터링 규칙",
    "custom_filter_rules_hint": "한 라인에 한 규칙만 입력하세요. 광고 차단 규칙과 호스트 파일 문법 중 하나를 사용할 수 있습니다",
+    "system_host_files": "시스템 호스트 파일",
    "examples_title": "예시",
    "example_meaning_filter_block": "example.org 을 포함한 모든 서브 도메인 접근을 차단합니다",
    "example_meaning_filter_whitelist": "example.org 을 포함한 모든 서브 도메인 접근을 차단 해제합니다.",
@@ -208,7 +216,7 @@
    "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": "모든 리스트가 이미 최신입니다",
-    "updated_upstream_dns_toast": "업스트림 DNS 서버를 업데이트하였습니다",
+    "updated_upstream_dns_toast": "업스트림 서버가 성공적으로 저장되었습니다",
    "dns_test_ok_toast": "특정 DNS 서버들은 정상적으로 동작 중입니다",
    "dns_test_not_ok_toast": "서버 \"{{key}}\": 사용할 수 없습니다, 제대로 작성했는지 확인하세요.",
    "unblock": "차단 해제",
@@ -235,7 +243,7 @@
    "loading_table_status": "로딩중...",
    "page_table_footer_text": "페이지",
    "rows_table_footer_text": "행",
-    "updated_custom_filtering_toast": "사용자 정의 필터링 규칙 업데이트",
+    "updated_custom_filtering_toast": "사용자 정의 규칙이 성공적으로 저장되었습니다",
    "rule_removed_from_custom_filtering_toast": "사용자 정의 필터링 규칙에서 규칙 제거 {{rule}}",
    "rule_added_to_custom_filtering_toast": "사용자 정의 필터링 규칙에 추가된 규칙 {{rule}}",
    "query_log_response_status": "상태: {{value}}",
@@ -499,10 +507,11 @@
    "statistics_configuration": "통계 구성",
    "statistics_retention": "통계 저장 기간",
    "statistics_retention_desc": "값을 줄이면 설정한 값보다 오래된 데이터가 소멸됩니다.",
-    "statistics_clear": " 통계 초기화",
+    "statistics_clear": "통계 초기화",
    "statistics_clear_confirm": "통계를 정말로 초기화하시겠습니까?",
    "statistics_retention_confirm": "정말로 통계 저장 기간을 변경하시겠습니까? 저장 주기를 낮출 경우, 일부 데이터가 손실됩니다",
    "statistics_cleared": "통계를 성공적으로 초기화했습니다.",
+    "statistics_enable": "통계 활성화",
    "interval_hours": "{{count}} 시간",
    "interval_hours_plural": "{{count}} 시간",
    "filters_configuration": "필터 구성",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "예외 적용됨",
    "show_processed_responses": "처리됨",
    "blocked_safebrowsing": "차단된 세이프 브라우징",
-    "blocked_adult_websites": "차단된 성인 웹사이트",
+    "blocked_adult_websites": "자녀 보호로 차단됨",
    "blocked_threats": "차단된 위협",
    "allowed": "허용됨",
    "filtered": "필터링됨",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "업스트림 서버에서 수신한 TTL 값(최소)을 무시합니다",
    "cache_ttl_max_override_desc": "업스트림 서버에서 수신한 TTL 값(최대)을 무시합니다",
    "ttl_cache_validation": "최소 캐시 TTL 값은 최대 값보다 이하여야 합니다",
-    "cache_optimistic": "캐시 유지",
+    "cache_optimistic": "옵티미스틱 캐시",
    "cache_optimistic_desc": "세션이 만료되었거나 새로고침을 시도하는 경우에도 AdGuard Home이 캐시를 기반으로 응답하도록 합니다.",
    "filter_category_general": "일반 목록",
    "filter_category_security": "보안 목록",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "쿼리를 보려면 클릭합니다",
    "port_53_faq_link": "53번 포트는 보통 \"DNSStubListener\"나 \"systemd-resolved\" 서비스가 이미 사용하고 있습니다. 이 문제에 대한 해결 방법을 <0>설명</0>에서 찾아보세요.",
    "adg_will_drop_dns_queries": "AdGuard Home은 이 클라이언트에서 모든 DNS 쿼리를 삭제합니다.",
-    "client_not_in_allowed_clients": "이 클라이언트는 허용된 클라이언트 목록에 없으므로 허용되지 않습니다.",
-    "experimental": "실험"
+    "filter_allowlist": "경고: 이 경우 허용된 클라이언트 목록에서 '{{disallowed_rule}}' 규칙 또한 제외됩니다.",
+    "last_rule_in_allowlist": "'{{disallowed_rule}}' 규칙을 제외하면 '허용된 클라이언트' 목록이 꺼지므로 해당 클라이언트를 제외할 수 없습니다.",
+    "experimental": "실험",
+    "use_saved_key": "이전에 저장했던 키 사용하기",
+    "parental_control": "자녀 보호",
+    "safe_browsing": "안전한 브라우징",
+    "served_from_cache": "{{value}} <i>(캐시에서 제공)</i>"
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -1,6 +1,6 @@
 {
-    "client_settings": "Cliënt Instellingen",
-    "example_upstream_reserved": "Je kan een DNS upstream specifiëren <0>voor specifieke domein(en)</0>",
+    "client_settings": "Cliëntinstellingen",
+    "example_upstream_reserved": "Je kan een DNS-upstream opgeven <0>voor specifieke domein(en)</0>",
    "example_upstream_comment": "Je kan je commentaar specifiëren",
    "upstream_parallel": "Parallelle verzoeken gebruiken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers.",
    "parallel_requests": "Parallelle verzoeken",
@@ -24,7 +24,7 @@
    "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_description": "Indien je router geen DHCP instellingen heeft, kan je AdGuard's eigen ingebouwde DHCP server gebruiken.",
    "dhcp_enable": "DHCP server inschakelen",
    "dhcp_disable": "DHCP server uitschakelen",
    "dhcp_not_found": "Het is veilig om de ingebouwde DHCP server in te schakelen omdat AdGuard Home geen actieve DHCP servers vond op het netwerk. We raden je echter aan om het handmatig opnieuw te controleren, omdat onze automatische test momenteel geen 100% garantie geeft.",
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Ongeldig IPv4 formaat",
-    "form_error_mac_format": "Ongeldig MAC formaat.",
-    "form_error_client_id_format": "Opmaak cliënt-ID is ongeldig",
+    "form_error_ip4_format": "Ongeldig IPv4-adres",
+    "form_error_ip4_range_start_format": "Ongeldig IPv4-adres start bereik",
+    "form_error_ip4_range_end_format": "Ongeldig IPv4-adres einde bereik",
+    "form_error_ip4_gateway_format": "Ongeldig IPv4-adres van de gateway",
+    "form_error_ip6_format": "Ongeldig IPv6-adres",
+    "form_error_ip_format": "Ongeldig IP-adres",
+    "form_error_mac_format": "Ongeldig MAC-adres",
+    "form_error_client_id_format": "Ongeldige cliënt-ID",
    "form_error_server_name": "Ongeldige servernaam",
    "form_error_subnet": "Subnet “{{cidr}}” bevat niet het IP-adres “{{ip}}”",
    "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",
+    "out_of_range_error": "Moet buiten bereik zijn \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Moet lager zijn dan begin reeks",
+    "greater_range_start_error": "Moet groter zijn dan begin reeks",
+    "greater_range_end_error": "Moet groter zijn dan einde reeks",
+    "subnet_error": "Adressen moeten in één subnet vallen",
+    "gateway_or_subnet_invalid": "Subnetmasker ongeldig",
    "dhcp_form_gateway_input": "Gateway IP",
    "dhcp_form_subnet_input": "Subnet mask",
    "dhcp_form_range_title": "Bereik van IP adressen",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Ongeldig URL of pad van de lijst",
    "custom_filter_rules": "Aangepaste filterregels",
    "custom_filter_rules_hint": "Voer één regel op een regel in. U kunt adblock-regels gebruiken of de syntaxis van hosts-bestanden gebruiken.",
+    "system_host_files": "Systeem host-bestanden",
    "examples_title": "Voorbeelden",
    "example_meaning_filter_block": "blokkeer toegang tot het example.org domein en alle subdomeinen",
    "example_meaning_filter_whitelist": "deblokkering van toegang tot het example.org-domein en alle bijbehorende subdomeinen",
@@ -207,8 +215,8 @@
    "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-via-HTTPS</2> oplossingen gebruiken",
    "example_upstream_tcp": "standaard DNS (over TCP)",
-    "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
-    "updated_upstream_dns_toast": "De upstream DNS-servers zijn bijgewerkt",
+    "all_lists_up_to_date_toast": "Alle lijsten zijn reeds actueel",
+    "updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen",
    "dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
    "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven",
    "unblock": "Deblokkeren",
@@ -223,7 +231,7 @@
    "domain_or_client": "Domein of cliënt",
    "type_table_header": "Type",
    "response_table_header": "Antwoord",
-    "response_code": "Reactie code",
+    "response_code": "Reactiecode",
    "client_table_header": "Gebruiker",
    "empty_response_status": "Leeg",
    "show_all_filter_type": "Toon alles",
@@ -235,7 +243,7 @@
    "loading_table_status": "Laden...",
    "page_table_footer_text": "Pagina",
    "rows_table_footer_text": "rijen",
-    "updated_custom_filtering_toast": "Aangepaste filter regels zijn bijgewerkt",
+    "updated_custom_filtering_toast": "Aangepaste regels succesvol opgeslagen",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
    "install_settings_all_interfaces": "Alle interfaces",
    "install_auth_title": "Authenticatie",
-    "install_auth_desc": "Het wordt ten zeerste aanbevolen om wachtwoordverificatie te configureren voor de AdGuard Home admin webinterface. Zelfs als het alleen toegankelijk is in uw lokale netwerk, is het nog steeds belangrijk om het te beschermen tegen onbeperkte toegang.",
+    "install_auth_desc": "Wachtwoordverificatie voor je AdGuard Home-beheerderswebinterface moet worden geconfigureerd. Zelfs als AdGuard Home alleen toegankelijk is in je lokale netwerk, is het nog steeds belangrijk om het te beschermen tegen onbeperkte toegang.",
    "install_auth_username": "Gebruikersnaam",
    "install_auth_password": "Wachtwoord",
    "install_auth_confirm": "Bevestig wachtwoord",
@@ -378,8 +386,8 @@
    "encryption_issuer": "Uitgever",
    "encryption_hostnames": "Hostnamen",
    "encryption_reset": "Ben je zeker dat je de encryptie instellingen wil resetten?",
-    "topline_expiring_certificate": "Jouw SSL certificaat vervalt binnenkort. Update <0>Encryptie instellingen</0>.",
-    "topline_expired_certificate": "Jouw SSL certificaat is vervallen. Update <0>Encryptie instellingen</0>.",
+    "topline_expiring_certificate": "Jouw SSL-certificaat vervalt binnenkort. Werk de <0>encryptie-instellingen</0> bij.",
+    "topline_expired_certificate": "Jouw SSL-certificaat is vervallen. Werk de <0>encryptie-instellingen</0> bij.",
    "form_error_port_range": "Poort nummer invoeren tussen 80 en 65535",
    "form_error_port_unsafe": "Dit is een onveilige poort",
    "form_error_equal": "Mag niet gelijk zijn",
@@ -394,7 +402,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": "Automatisch bijwerken is mislukt. <a>Volg deze stappen</a> om handmatig bij te werken.",
    "processing_update": "Even geduld, AdGuard Home wordt bijgewerkt",
    "clients_title": "Gebruikers",
    "clients_desc": "Configureer apparaten die gebruik maken van AdGuard Home",
@@ -435,7 +443,7 @@
    "access_blocked_desc": "Verwar dit niet met filters. AdGuard Home zal deze DNS-zoekopdrachten niet uitvoeren die deze domeinen in de zoekopdracht bevatten. Hier kan je de exacte domeinnamen, wildcards en URL-filter-regels specifiëren, bijv. \"example.org\", \"*.example.org\" of \"||example.org^\".",
    "access_settings_saved": "Toegangsinstellingen succesvol opgeslagen",
    "updates_checked": "Met succes op updates gecontroleerd",
-    "updates_version_equal": "AdGuard Home is up-to-date",
+    "updates_version_equal": "AdGuard Home is actueel",
    "check_updates_now": "Controleer op updates",
    "dns_privacy": "DNS Privacy",
    "setup_dns_privacy_1": "<0>DNS-via-TLS:</0> Gebruik <1>{{address}}</1> string.",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Statistieken configuratie",
    "statistics_retention": "Statistieken retentie",
    "statistics_retention_desc": "Als je de interval waarde vermindert, zullen sommige gegevens verloren gaan",
-    "statistics_clear": " Statistieken wissen",
+    "statistics_clear": "Statistieken wissen",
    "statistics_clear_confirm": "Alle statistieken werkelijk wissen?",
    "statistics_retention_confirm": "Weet u zeker dat u de bewaartermijn van de statistieken wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
    "statistics_cleared": "Statistieken succesvol gewist",
+    "statistics_enable": "Statistieken inschakelen",
    "interval_hours": "{{count}} uur",
    "interval_hours_plural": "{{count}} uren",
    "filters_configuration": "Filters instellingen",
@@ -578,8 +587,8 @@
    "show_blocked_responses": "Geblokkeerd",
    "show_whitelisted_responses": "Op toestemmingslijst",
    "show_processed_responses": "Verwerkt",
-    "blocked_safebrowsing": "Geblokkeerd door Veilig Browsen",
-    "blocked_adult_websites": "Geblokkeerde 18+ websites",
+    "blocked_safebrowsing": "Geblokkeerd door Veilig browsen",
+    "blocked_adult_websites": "Geblokkeerd door ouderlijk toezicht",
    "blocked_threats": "Geblokkeerde bedreigingen",
    "allowed": "Toegestaan",
    "filtered": "Gefilterd",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Uitbreiden van korte Time-To-Live waardes (seconden) ontvangen van de upstream server bij het cachen van DNS antwoorden",
    "cache_ttl_max_override_desc": "Instellen van maximum time-to-live waarde (seconden) voor opslag in de DNS cache",
    "ttl_cache_validation": "Minimale waarde TTL-cache moet kleiner dan of gelijk zijn aan de maximale waarde",
-    "cache_optimistic": "Optimistisch",
+    "cache_optimistic": "Optimistisch cachen",
    "cache_optimistic_desc": "Laat AdGuard Home reageren vanuit de cache, zelfs als de vermeldingen zijn verlopen en probeer deze ook te vernieuwen.",
    "filter_category_general": "Algemeen",
    "filter_category_security": "Beveiliging",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Klik om queries te bekijken",
    "port_53_faq_link": "Poort 53 wordt vaak gebruikt door services als DNSStubListener- of de systeem DNS-resolver. Lees a.u.b. <0>deze instructie</0> hoe dit is op te lossen.",
    "adg_will_drop_dns_queries": "AdGuard Home zal alle DNS verzoeken van deze toepassing/dit systeem negeren.",
-    "client_not_in_allowed_clients": "De toepassing is niet toegestaan omdat deze niet in de lijst \"Toegestane toepassingen\" voorkomt.",
-    "experimental": "Experimenteel"
+    "filter_allowlist": "WAARSCHUWING: Deze actie zal ook de regel \"{{disallowed_rule}}\" uitsluiten van de lijst met toegestane clients.",
+    "last_rule_in_allowlist": "Kan deze client niet weigeren omdat het uitsluiten van de regel \"{{disallowed_rule}}\" de lijst \"Toegestane clients\" zal UITSCHAKELEN.",
+    "experimental": "Experimenteel",
+    "use_saved_key": "De eerder opgeslagen sleutel gebruiken",
+    "parental_control": "Ouderlijk toezicht",
+    "safe_browsing": "Veilig browsen",
+    "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>"
 }
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -23,13 +23,11 @@
    "form_error_required": "Påkrevd felt",
    "form_error_ip4_format": "Ugyldig IPv4-format",
    "form_error_ip6_format": "Ugyldig IPv6-format",
-    "form_error_ip_format": "Ugyldig IPv4-format",
+    "form_error_ip_format": "Ugyldig IP-adresse",
    "form_error_mac_format": "Ugyldig MAC-format",
    "form_error_client_id_format": "Ugyldig ID-klientformat",
    "form_error_server_name": "Ugyldig tjenernavn",
    "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",
@@ -173,7 +171,6 @@
    "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",
-    "updated_upstream_dns_toast": "Oppdaterte oppstrøms-DNS-tjenerne",
    "dns_test_ok_toast": "De spesifiserte DNS-tjenerne fungerer riktig",
    "dns_test_not_ok_toast": "Tjeneren «{{key}}» kunne ikke brukes, vennligst dobbeltsjekk at du har skrevet den riktig",
    "unblock": "Tillat",
@@ -253,6 +250,7 @@
    "source_label": "Kilde",
    "found_in_known_domain_db": "Funnet i databasen over kjente domener.",
    "category_label": "Kategori",
+    "rule_label": "Oppføring",
    "list_label": "Liste",
    "unknown_filter": "Ukjent filter {{filterId}}",
    "known_tracker": "Kjent sporer",
@@ -262,6 +260,7 @@
    "install_settings_listen": "Lytt til grensesnitt",
    "install_settings_port": "Port",
    "install_settings_interface_link": "Ditt AdGuard Home-admin-nettgrensesnitt vil være tilgjengelig på de følgende adressene:",
+    "form_error_port": "Skriv inn en gyldig portverdi",
    "install_settings_dns": "DNS-tjener",
    "install_settings_dns_desc": "Du vil måtte sette opp enhetene eller ruteren din(e) til å bruke DNS-tjeneren på disse adressene:",
    "install_settings_all_interfaces": "Alle grensesnitt",
@@ -434,6 +433,7 @@
    "encryption_key_source_content": "Lim inn innholdet til den private nøkkelen",
    "stats_params": "Statistikk-oppsett",
    "config_successfully_saved": "Oppsettet ble vellykket lagret",
+    "interval_6_hour": "6 timer",
    "interval_24_hour": "24 timer",
    "interval_days": "{{count}} dag",
    "interval_days_plural": "{{count}} dager",
@@ -523,7 +523,7 @@
    "show_whitelisted_responses": "Hvitelistet",
    "show_processed_responses": "Bearbeidet",
    "blocked_safebrowsing": "Blokkert av barnevennlig nettlesing",
-    "blocked_adult_websites": "Blokkerte voksennettsteder",
+    "blocked_adult_websites": "Blokkert av foreldrekontroll",
    "blocked_threats": "Blokkerte trusler",
    "allowed": "Unntak",
    "filtered": "Filtrert",
@@ -553,6 +553,6 @@
    "click_to_view_queries": "Klikk for å vise forespørsler",
    "port_53_faq_link": "Port 53 er ofte opptatt av «DNSStubListener»- eller «systemd-resolved»-tjenestene. Vennligst les <0>denne instruksjonen</0> om hvordan man løser dette.",
    "adg_will_drop_dns_queries": "AdGuard Home vil droppe alle DNS-forespørsler fra denne klienten.",
-    "client_not_in_allowed_clients": "Klienten er ikke tillatt, fordi den ikke er i «Tillatte klienter»-listen.",
-    "experimental": "Eksperimentell"
+    "experimental": "Eksperimentell",
+    "parental_control": "Foreldrekontroll"
 }
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Nieprawidłowy format IP",
-    "form_error_mac_format": "Nieprawidłowy format MAC",
-    "form_error_client_id_format": "Nieprawidłowy format identyfikatora klienta",
+    "form_error_ip4_format": "Nieprawidłowy adres IPv4",
+    "form_error_ip4_range_start_format": "Nieprawidłowy adres IPv4 początku zakresu",
+    "form_error_ip4_range_end_format": "Nieprawidłowy adres IPv4 końca zakresu",
+    "form_error_ip4_gateway_format": "Nieprawidłowy adres IPv4 bramy",
+    "form_error_ip6_format": "Nieprawidłowy adres IPv6",
+    "form_error_ip_format": "Nieprawidłowy adres IP",
+    "form_error_mac_format": "Nieprawidłowy adres MAC",
+    "form_error_client_id_format": "Nieprawidłowy ID klienta",
    "form_error_server_name": "Nieprawidłowa nazwa serwera",
    "form_error_subnet": "Podsieć \"{{cidr}}\" nie zawiera adresu IP \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Musi być spoza zakresu \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Musi być niższy niż początek zakresu",
+    "greater_range_start_error": "Musi być większy niż początek zakresu",
+    "greater_range_end_error": "Musi być większy niż koniec zakresu",
+    "subnet_error": "Adresy muszą należeć do jednej podsieci",
+    "gateway_or_subnet_invalid": "Nieprawidłowa maska podsieci",
    "dhcp_form_gateway_input": "Adres IP bramy",
    "dhcp_form_subnet_input": "Maska podsieci",
    "dhcp_form_range_title": "Zakres adresów IP",
@@ -98,7 +105,7 @@
    "copyright": "Prawo autorskie",
    "homepage": "Strona główna",
    "report_an_issue": "Zgłoś problem",
-    "privacy_policy": "Polityka prywatności",
+    "privacy_policy": "Polityka Prywatności",
    "enable_protection": "Włącz ochronę",
    "enabled_protection": "Ochrona włączona ",
    "disable_protection": "Wyłącz ochronę",
@@ -156,8 +163,8 @@
    "apply_btn": "Zastosuj",
    "disabled_filtering_toast": "Wyłączone filtrowanie",
    "enabled_filtering_toast": "Włączone filtrowanie",
-    "disabled_safe_browsing_toast": "Bezpieczne przeglądanie zostało wyłączone",
-    "enabled_safe_browsing_toast": "Bezpieczne przeglądanie zostało włączone",
+    "disabled_safe_browsing_toast": "Wyłączone Bezpieczne przeglądanie",
+    "enabled_safe_browsing_toast": "Włączone Bezpieczne przeglądanie",
    "disabled_parental_toast": "Wyłączona Kontrola Rodzicielska",
    "enabled_parental_toast": "Włączona Kontrola Rodzicielska",
    "disabled_safe_search_toast": "Bezpieczne wyszukiwanie zostało włączone",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Adres URL lub bezwzględna ścieżka listy jest nieprawidłowa",
    "custom_filter_rules": "Niestandardowe reguły filtrowania",
    "custom_filter_rules_hint": "Wpisz jedną regułę w jednej linii. Możesz użyć reguł adblock lub składni plików hostów.",
+    "system_host_files": "Pliki hosts systemu",
    "examples_title": "Przykłady",
    "example_meaning_filter_block": "zablokuj dostęp do domeny example.org i wszystkich jej subdomen",
    "example_meaning_filter_whitelist": "odblokuj dostęp do domeny example.org i wszystkich jej subdomen",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Główne serwery DNS zostały zaktualizowane",
+    "updated_upstream_dns_toast": "Serwery nadrzędne zostały pomyślnie zapisane",
    "dns_test_ok_toast": "Określone serwery DNS działają poprawnie",
    "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie można go użyć, sprawdź, czy napisałeś go poprawnie",
    "unblock": "Odblokuj",
@@ -235,7 +243,7 @@
    "loading_table_status": "Wczytuję...",
    "page_table_footer_text": "Strona",
    "rows_table_footer_text": "wierszy",
-    "updated_custom_filtering_toast": "Zaktualizowano niestandardowe reguły filtrowania",
+    "updated_custom_filtering_toast": "Reguły niestandardowe zapisane pomyślnie",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Konieczne będzie skonfigurowanie urządzenia lub routera do korzystania z serwera DNS pod następującymi adresami:",
    "install_settings_all_interfaces": "Wszystkie interfejsy",
    "install_auth_title": "Uwierzytelnianie",
-    "install_auth_desc": "Zalecamy skonfigurowanie strony AdGuard Home Admin, aby zweryfikować swoją tożsamość za pomocą hasła. Chociaż jest dostępny tylko w sieci lokalnej, nadal ważne jest, aby chronić go przed nieograniczonym dostępem.",
+    "install_auth_desc": "Należy skonfigurować uwierzytelnianie hasłem do interfejsu internetowego administratora AdGuard Home. Nawet jeśli AdGuard Home jest dostępny tylko w sieci lokalnej, nadal ważne jest, aby chronić go przed nieograniczonym dostępem.",
    "install_auth_username": "Nazwa użytkownika",
    "install_auth_password": "Hasło",
    "install_auth_confirm": "Potwierdź hasło",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Konfiguracja statystyk",
    "statistics_retention": "Przechowywanie statystyk",
    "statistics_retention_desc": "Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
-    "statistics_clear": " Wyczyść statystyki",
+    "statistics_clear": "Wyczyść statystyki",
    "statistics_clear_confirm": "Czy na pewno chcesz wyczyścić statystyki?",
    "statistics_retention_confirm": "Czy chcesz zmienić sposób przechowania statystyk? Jeżeli obniżysz wartość interwału, niektóre dane będą utracone",
    "statistics_cleared": "Statystyki zostały pomyślnie wyczyszczone",
+    "statistics_enable": "Włącz statystyki",
    "interval_hours": "{{count}} godzina",
    "interval_hours_plural": "{{count}} godziny",
    "filters_configuration": "Konfiguracja filtrów",
@@ -578,8 +587,8 @@
    "show_blocked_responses": "Zablokowane",
    "show_whitelisted_responses": "Biała lista",
    "show_processed_responses": "Przetworzono",
-    "blocked_safebrowsing": "Zablokowane przez bezpieczne przeglądanie",
-    "blocked_adult_websites": "Zablokowane witryny dla dorosłych",
+    "blocked_safebrowsing": "Zablokowane przez Bezpieczne przeglądanie",
+    "blocked_adult_websites": "Zablokowane przez Kontrolę rodzicielską",
    "blocked_threats": "Zablokowane zagrożenia",
    "allowed": "Dozwolone",
    "filtered": "Filtrowane",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Zastąp wartość TTL (w sekundach) otrzymaną z serwera nadrzędnego podczas buforowania odpowiedzi DNS",
    "cache_ttl_max_override_desc": "Ustaw maksymalną wartość TTL (w sekundach) dla wpisów w pamięci podręcznej DNS",
    "ttl_cache_validation": "Minimalna pamięć podręczna wartości TTL musi być mniejsza lub równa maksymalnej wartości",
-    "cache_optimistic": "Optymistyczny",
+    "cache_optimistic": "Optymistyczne buforowanie",
    "cache_optimistic_desc": "Spraw, aby AdGuard Home odpowiadał z pamięci podręcznej, nawet gdy wpisy wygasły, a także spróbuj je odświeżyć.",
    "filter_category_general": "Ogólne",
    "filter_category_security": "Bezpieczeństwo",
@@ -612,6 +621,11 @@
    "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.",
-    "client_not_in_allowed_clients": "Klient nie jest dozwolony, ponieważ nie ma go na liście „Dozwoleni klienci”.",
-    "experimental": "Funkcja eksperymentalna"
+    "filter_allowlist": "OSTRZEŻENIE: To działanie spowoduje również wykluczenie reguły \"{{disallowed_rule}}\" z listy dozwolonych klientów.",
+    "last_rule_in_allowlist": "Nie można odrzucić tego klienta, ponieważ wykluczenie reguły \"{{disallowed_rule}}\" spowoduje WYŁĄCZENIE listy „Dozwolonych klientów”.",
+    "experimental": "Funkcja eksperymentalna",
+    "use_saved_key": "Użyj wcześniej zapisanego klucza",
+    "parental_control": "Kontrola rodzicielska",
+    "safe_browsing": "Bezpieczne przeglądanie",
+    "served_from_cache": "{{value}} <i>(podawane z pamięci podręcznej)</i>"
 }
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Formato de endereço IPv inválido",
-    "form_error_mac_format": "Formato do endereço MAC inválido",
-    "form_error_client_id_format": "Formato do ID de cliente inválido",
+    "form_error_ip4_format": "Endereço de IPv4 inválido",
+    "form_error_ip4_range_start_format": "Endereço IPv4 de início de intervalo inválido",
+    "form_error_ip4_range_end_format": "Endereço IPv4 de fim de intervalo inválido",
+    "form_error_ip4_gateway_format": "Endereço IPv4 de gateway inválido",
+    "form_error_ip6_format": "Endereço de IPv6 inválido",
+    "form_error_ip_format": "Endereço de IP inválido",
+    "form_error_mac_format": "Endereço de MAC inválido",
+    "form_error_client_id_format": "ID de cliente inválido",
    "form_error_server_name": "Nome de servidor inválido",
    "form_error_subnet": "A sub-rede \"{{cidr}}\" não contém o endereço IP \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Deve estar fora do intervalo \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Deve ser inferior ao início do intervalo",
+    "greater_range_start_error": "Deve ser maior que o início do intervalo",
+    "greater_range_end_error": "Deve ser maior que o fim do intervalo",
+    "subnet_error": "Endereços devem estar em uma sub-rede",
+    "gateway_or_subnet_invalid": "Máscara de sub-rede inválida",
    "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",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "URL ou local da lista inválida",
    "custom_filter_rules": "Regras de filtragem personalizadas",
    "custom_filter_rules_hint": "Digite uma regra por linha. Você pode usar regras de bloqueio de anúncios ou a sintaxe de arquivos de hosts.",
+    "system_host_files": "Arquivos hosts do sistema",
    "examples_title": "Exemplos",
    "example_meaning_filter_block": "bloqueia o acesso ao domínio exemplo.org e a todos os seus subdomínios",
    "example_meaning_filter_whitelist": "desbloqueia o acesso ao domínio exemplo.org e a todos os seus subdomínios",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Atualizado os servidores DNS primário",
+    "updated_upstream_dns_toast": "Servidores DNS primário salvos com sucesso",
    "dns_test_ok_toast": "Os servidores DNS especificados estão funcionando corretamente",
    "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se você escreveu corretamente",
    "unblock": "Desbloquear",
@@ -235,7 +243,7 @@
    "loading_table_status": "Carregando",
    "page_table_footer_text": "Página",
    "rows_table_footer_text": "linhas",
-    "updated_custom_filtering_toast": "Regras de filtragem personalizadas atualizadas",
+    "updated_custom_filtering_toast": "Regras personalizadas salvas com sucesso",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Você precisa configurar seu dispositivo ou roteador para usar o servidor DNS nos seguintes endereços:",
    "install_settings_all_interfaces": "Todas interfaces",
    "install_auth_title": "Autenticação",
-    "install_auth_desc": "É altamente recomendável configurar a autenticação por senha na interface web de administração do AdGuard Home. Mesmo que ela seja acessível somente em sua rede local, ainda assim é importante protegê-la contra acesso irrestrito.",
+    "install_auth_desc": "A autenticação de senha para a interface da web de administrador do AdGuard Home deve ser configurada. Mesmo que o AdGuard Home esteja acessível apenas em sua rede local, ainda é importante protegê-la de acesso irrestrito.",
    "install_auth_username": "Nome de usuário",
    "install_auth_password": "Senha",
    "install_auth_confirm": "Confirmar senha",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "Você tem certeza de que deseja limpar as estatísticas?",
    "statistics_retention_confirm": "Você tem certeza que quer alterar o arquivamento das estatísticas? Se diminuir o valor do intervalo, alguns dados serão perdidos",
    "statistics_cleared": "As estatísticas foram limpas com sucesso",
+    "statistics_enable": "Ativar estatísticas",
    "interval_hours": "{{count}} hora",
    "interval_hours_plural": "{{count}} horas",
    "filters_configuration": "Configuração de filtros",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "Na lista branca",
    "show_processed_responses": "Processado",
    "blocked_safebrowsing": "Bloqueado pela navegação segura",
-    "blocked_adult_websites": "Sites adultos bloqueados",
+    "blocked_adult_websites": "Bloqueado pelo controle parental",
    "blocked_threats": "Ameaças bloqueadas",
    "allowed": "Permitido",
    "filtered": "Filtrado",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Prolongue os valores de curta duração (segundos) recebidos do servidor primário ao armazenar em cache as respostas DNS",
    "cache_ttl_max_override_desc": "Defina um valor máximo de tempo de vida (segundos) para entradas no cache DNS",
    "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
-    "cache_optimistic": "Otimista",
+    "cache_optimistic": "Cache otimista",
    "cache_optimistic_desc": "Faz o AdGuard Home responder a partir do cache mesmo quando as entradas expirarem e também tenta atualizá-las.",
    "filter_category_general": "Geral",
    "filter_category_security": "Segurança",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Clique para ver as consultas",
    "port_53_faq_link": "A porta 53 é frequentemente ocupada por serviços \"DNSStubListener\" ou \"systemd-resolved\". Por favor leia <0>essa instrução</0> para resolver isso.",
    "adg_will_drop_dns_queries": "O AdGuard Home descartará todas as consultas DNS deste cliente.",
-    "client_not_in_allowed_clients": "O cliente não é permitido porque não está na lista \"Clientes permitidos\".",
-    "experimental": "Experimental"
+    "filter_allowlist": "AVISO: Esta ação também excluirá a regra \"{{disallowed_rule}}\" da lista de clientes permitidos.",
+    "last_rule_in_allowlist": "Não é possível desautorizar este cliente porque excluir a regra \"{{disallowed_rule}}\" DESATIVARÁ a lista de \"Clientes permitidos\".",
+    "experimental": "Experimental",
+    "use_saved_key": "Use a chave salva anteriormente",
+    "parental_control": "Controle parental",
+    "safe_browsing": "Navegação segura",
+    "served_from_cache": "{{value}} <i>(servido do cache)</i>"
 }
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -36,16 +36,23 @@
    "dhcp_ipv4_settings": "Definições DHCP IPv4",
    "dhcp_ipv6_settings": "Definições DHCP IPv6",
    "form_error_required": "Campo obrigatório",
-    "form_error_ip4_format": "Formato de endereço IPv4 inválido",
-    "form_error_ip6_format": "Formato de endereço IPv6 inválido",
-    "form_error_ip_format": "Formato de endereço IPv4 inválido",
-    "form_error_mac_format": "Formato do endereço MAC inválido",
-    "form_error_client_id_format": "Formato inválido",
+    "form_error_ip4_format": "Endereço de IPv4 inválido",
+    "form_error_ip4_range_start_format": "Endereço IPv4 de início de intervalo inválido",
+    "form_error_ip4_range_end_format": "Endereço IPv4 de fim de intervalo inválido",
+    "form_error_ip4_gateway_format": "Endereço IPv4 de gateway inválido",
+    "form_error_ip6_format": "Endereço de IPv6 inválido",
+    "form_error_ip_format": "Endereço de IP inválido",
+    "form_error_mac_format": "Endereço de MAC inválido",
+    "form_error_client_id_format": "ID de cliente inválido",
    "form_error_server_name": "Nome de servidor inválido",
    "form_error_subnet": "A sub-rede \"{{cidr}}\" não contém o endereço IP \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Deve estar fora do intervalo \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Deve ser inferior ao início do intervalo",
+    "greater_range_start_error": "Deve ser maior que o início do intervalo",
+    "greater_range_end_error": "Deve ser maior que o fim do intervalo",
+    "subnet_error": "Os endereços devem estar em uma sub-rede",
+    "gateway_or_subnet_invalid": "Máscara de sub-rede inválida",
    "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",
@@ -98,12 +105,12 @@
    "copyright": "Copyright",
    "homepage": "Página inicial",
    "report_an_issue": "Comunicar um problema",
-    "privacy_policy": "Política de Privacidade",
-    "enable_protection": "Ativar protecção",
-    "enabled_protection": "Ativar protecção",
-    "disable_protection": "Desativar protecção",
-    "disabled_protection": "Desativar protecção",
-    "refresh_statics": "Repor estatísticas",
+    "privacy_policy": "Política de privacidade",
+    "enable_protection": "Ativar proteção",
+    "enabled_protection": "Ativar proteção",
+    "disable_protection": "Desativar proteção",
+    "disabled_protection": "Desativar proteção",
+    "refresh_statics": "Actualizar estatísticas",
    "dns_query": "Consultas de DNS",
    "blocked_by": "<0>Bloqueado por filtros</0>",
    "stats_malware_phishing": "Malware/phishing bloqueados",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "URL ou local da lista inválida",
    "custom_filter_rules": "Regras de filtragem personalizadas",
    "custom_filter_rules_hint": "Insira uma regra por linha. Pode usar regras de bloqueio de anúncios ou a sintaxe de ficheiros de hosts.",
+    "system_host_files": "Arquivos hosts do sistema",
    "examples_title": "Exemplos",
    "example_meaning_filter_block": "bloqueia o acesso ao domínio exemplo.org e a todos os seus subdomínios",
    "example_meaning_filter_whitelist": "desbloqueia o acesso ao domínio exemplo.org e a todos os seus subdomínios",
@@ -208,7 +216,7 @@
    "example_upstream_sdns": "pode usar <0>DNS Stamps</0> para o <1>DNSCrypt</1> ou usar os resolvedores <2>DNS-sobre-HTTPS</2>",
    "example_upstream_tcp": "dNS regular (através do TCP)",
    "all_lists_up_to_date_toast": "Todas as listas já estão atualizadas",
-    "updated_upstream_dns_toast": "A atualizar os servidores DNS primário",
+    "updated_upstream_dns_toast": "Servidores DNS primário guardados com sucesso",
    "dns_test_ok_toast": "Os servidores DNS especificados estão a funcionar corretamente",
    "dns_test_not_ok_toast": "O servidor \"{{key}}\": não pôde ser utilizado. Por favor, verifique se o escreveu corretamente",
    "unblock": "Desbloquear",
@@ -235,7 +243,7 @@
    "loading_table_status": "A carregar...",
    "page_table_footer_text": "Página",
    "rows_table_footer_text": "linhas",
-    "updated_custom_filtering_toast": "Regras de filtragem personalizadas atualizadas",
+    "updated_custom_filtering_toast": "Regras personalizadas guardadas com sucesso",
    "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}}",
    "query_log_response_status": "Status: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Precisa de configurar o seu dispositivo ou router para usar o servidor DNS nos seguintes endereços:",
    "install_settings_all_interfaces": "Todas as interfaces",
    "install_auth_title": "Autenticação",
-    "install_auth_desc": "É altamente recomendável configurar a autenticação por palavra-passe para a sua interface web de administrador do AdGuard Home. Mesmo que seja acessível apenas na sua rede local, ainda assim é importante protegê-lo contra o acesso irrestrito.",
+    "install_auth_desc": "A autenticação de palavra-passe para a interface da web de administrador do AdGuard Home deve ser configurada. Mesmo que o AdGuard Home esteja acessível apenas em sua rede local, ainda é importante protegê-la de acesso irrestrito.",
    "install_auth_username": "Nome do utilizador",
    "install_auth_password": "Palavra-passe",
    "install_auth_confirm": "Confirmar palavra-passe",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Definição das estatísticas",
    "statistics_retention": "Retenção de estatísticas",
    "statistics_retention_desc": "Se diminuir o valor do intervalo, alguns dados serão perdidos",
-    "statistics_clear": " Limpar estatísticas",
+    "statistics_clear": "Limpar estatísticas",
    "statistics_clear_confirm": "Tem a certeza de que deseja limpar as estatísticas?",
    "statistics_retention_confirm": "Tem a certeza que quer alterar a retenção de estatísticas? Se diminuir o valor do intervalo, alguns dados serão perdidos",
    "statistics_cleared": "As estatísticas foram apagadas com sucesso",
+    "statistics_enable": "Ativar estatísticas",
    "interval_hours": "{{count}} hora",
    "interval_hours_plural": "{{count}} horas",
    "filters_configuration": "Definição dos filtros",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "Na lista branca",
    "show_processed_responses": "Processado",
    "blocked_safebrowsing": "Bloqueado pela navegação segura",
-    "blocked_adult_websites": "Sítios adultos bloqueados",
+    "blocked_adult_websites": "Bloqueado pelo controlo parental",
    "blocked_threats": "Ameaças bloqueadas",
    "allowed": "Permitido",
    "filtered": "Filtrado",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Prolongue os valores de curta duração (segundos) recebidos do servidor primário ao armazenar em cache as respostas DNS",
    "cache_ttl_max_override_desc": "Defina um valor máximo de tempo de vida (segundos) para entradas no cache DNS",
    "ttl_cache_validation": "O valor TTL mínimo do cache deve ser menor ou igual ao valor máximo",
-    "cache_optimistic": "Otimista",
+    "cache_optimistic": "Cache otimista",
    "cache_optimistic_desc": "Faz o AdGuard Home responder a partir do cache mesmo quando as entradas expirarem e também tenta atualizá-las.",
    "filter_category_general": "Geral",
    "filter_category_security": "Segurança",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Clique para ver as consultas",
    "port_53_faq_link": "A porta 53 é frequentemente ocupada por serviços \"DNSStubListener\" ou \"systemd-resolved\". Por favor leia <0>essa instrução</0> para resolver isso.",
    "adg_will_drop_dns_queries": "O AdGuard Home descartará todas as consultas DNS deste cliente.",
-    "client_not_in_allowed_clients": "O cliente não é permitido porque não está na lista \"Clientes permitidos\".",
-    "experimental": "Experimental"
+    "filter_allowlist": "AVISO: Esta ação também excluirá a regra \"{{disallowed_rule}}\" da lista de clientes permitidos.",
+    "last_rule_in_allowlist": "Não é possível desautorizar este cliente porque excluir a regra \"{{disallowed_rule}}\" DESATIVARÁ a lista de \"Clientes permitidos\".",
+    "experimental": "Experimental",
+    "use_saved_key": "Use a chave guardada anteriormente",
+    "parental_control": "Controlo parental",
+    "safe_browsing": "Navegação segura",
+    "served_from_cache": "{{value}} <i>(servido do cache)</i>"
 }
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Format IP invalid",
-    "form_error_mac_format": "Format MAC invalid",
-    "form_error_client_id_format": "Format ID de client invalid",
+    "form_error_ip4_format": "Adresă IPv4 nevalidă",
+    "form_error_ip4_range_start_format": "Adresă IPv4 de început al intervalului nevalidă",
+    "form_error_ip4_range_end_format": "Adresa IPv4 de sfârșit al intervalului nevalidă",
+    "form_error_ip4_gateway_format": "Adresă IPv4 a gateway-ului nevalidă",
+    "form_error_ip6_format": "Adresa IPv6 nevalidă",
+    "form_error_ip_format": "Adresă IP nevalidă",
+    "form_error_mac_format": "Adresă MAC nevalidă",
+    "form_error_client_id_format": "ID client nevalid",
    "form_error_server_name": "Nume de server nevalid",
    "form_error_subnet": "Subrețeaua „{{cidr}}” nu conține adresa IP „{{ip}}”",
    "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",
+    "out_of_range_error": "Trebuie să fie în afara intervalului „{{start}}”-„{{end}}”",
+    "lower_range_start_error": "Trebuie să fie mai mică decât începutul intervalului",
+    "greater_range_start_error": "Trebuie să fie mai mare decât începutul intervalului",
+    "greater_range_end_error": "Trebuie să fie mai mare decât sfârșitul intervalului",
+    "subnet_error": "Adresele trebuie să fie în aceeași subrețea",
+    "gateway_or_subnet_invalid": "Mască de subrețea nevalidă",
    "dhcp_form_gateway_input": "IP Gateway",
    "dhcp_form_subnet_input": "Mască subnet",
    "dhcp_form_range_title": "Interval de adrese IP",
@@ -112,6 +119,8 @@
    "for_last_24_hours": "în ultimele 24 ore",
    "for_last_days": "în ultima {{count}} zi",
    "for_last_days_plural": "pentru ultimele {{count}} zile",
+    "stats_disabled": "Statisticile au fost dezactivate. Puteți să le porniți din <0>pagina de setări</0>.",
+    "stats_disabled_short": "Statisticile au fost dezactivate",
    "no_domains_found": "Nu s-au găsit domenii",
    "requests_count": "Cont interogări",
    "top_blocked_domains": "Domeniile blocate cel mai des",
@@ -140,9 +149,9 @@
    "general_settings": "Setări Generale",
    "dns_settings": "Setări DNS",
    "dns_blocklists": "Liste de blocări DNS",
-    "dns_allowlists": "Listă de DNS-uri autorizate",
+    "dns_allowlists": "Listă de autorizări DNS",
    "dns_blocklists_desc": "AdGuard Home blochează domenii incluse în liste de blocări.",
-    "dns_allowlists_desc": "Domeniile DNS autorizate vor fi permise, chiar dacă se află pe orice listă de blocări.",
+    "dns_allowlists_desc": "Domeniile din listele de autorizări DNS vor fi permise chiar dacă se află în oricare dintre listele de blocări.",
    "custom_filtering_rules": "Reguli filtrare personale",
    "encryption_settings": "Setări de criptare",
    "dhcp_settings": "Setări DHCP",
@@ -154,10 +163,10 @@
    "apply_btn": "Aplică",
    "disabled_filtering_toast": "Filtrare dezactivată",
    "enabled_filtering_toast": "Filtrare activată",
-    "disabled_safe_browsing_toast": "Navigare securitară dezactivată",
-    "enabled_safe_browsing_toast": "Navigare securitară activată",
-    "disabled_parental_toast": "Control parental dezactivat",
-    "enabled_parental_toast": "Control parental activat",
+    "disabled_safe_browsing_toast": "Navigare în siguranță dezactivată",
+    "enabled_safe_browsing_toast": "Navigare în siguranță activată",
+    "disabled_parental_toast": "Control Parental dezactivat",
+    "enabled_parental_toast": "Control Parental activat",
    "disabled_safe_search_toast": "Căutare protejată dezactivată",
    "enabled_save_search_toast": "Căutare protejată activată",
    "enabled_table_header": "Activat",
@@ -172,7 +181,7 @@
    "elapsed": "Scurs",
    "filters_and_hosts_hint": "AdGuard Home înțelege regulile de bază de blocare cât și sintaxa fișierelor hosts.",
    "no_blocklist_added": "Listă blocări goală",
-    "no_whitelist_added": "Listă autorizări goală",
+    "no_whitelist_added": "Nu s-au adăugat autorizări",
    "add_blocklist": "Adăugați blocaj",
    "add_allowlist": "Adăugați autorizare",
    "cancel_btn": "Anulare",
@@ -184,13 +193,14 @@
    "edit_blocklist": "Editare blocare",
    "edit_allowlist": "Editare autorizare",
    "choose_blocklist": "Alegeți liste de blocări",
-    "choose_allowlist": "Alegeți liste de autorizări",
+    "choose_allowlist": "Selectați liste de autorizări",
    "enter_valid_blocklist": "Introduceți un URL valid pentru blocare.",
    "enter_valid_allowlist": "Introduceți un URL valid pentru autorizare.",
    "form_error_url_format": "Format URL invalid",
    "form_error_url_or_path_format": "Invalid URL sau o cale absolută a listei",
    "custom_filter_rules": "Reguli de filtrare personalizate",
    "custom_filter_rules_hint": "Introduceți o regulă pe linie. Puteți utiliza reguli de blocare sau sintaxa de fișiere hosts.",
+    "system_host_files": "Fișiere de sistem hosts",
    "examples_title": "Exemple",
    "example_meaning_filter_block": "blochează accesul la domeniul exemplu.org și la toate subdomeniile sale",
    "example_meaning_filter_whitelist": "deblochează accesul la domeniul exemplu.org și la toate subdomeniile sale",
@@ -206,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Serverele DNS în amonte aduse la zi",
+    "updated_upstream_dns_toast": "Serverele din amonte au fost salvate cu succes",
    "dns_test_ok_toast": "Serverele DNS specificate funcționează corect",
    "dns_test_not_ok_toast": "Serverul \"{{key}}\": nu a putut fi utilizat, verificați dacă l-ați scris corect",
    "unblock": "Deblocați",
@@ -233,7 +243,7 @@
    "loading_table_status": "Se încarcă...",
    "page_table_footer_text": "Pagina",
    "rows_table_footer_text": "linii",
-    "updated_custom_filtering_toast": "Reguli personalizate de filtrare aduse la zi",
+    "updated_custom_filtering_toast": "Regulile personalizate au fost salvate cu succes",
    "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}}",
    "query_log_response_status": "Statut: {{value}}",
@@ -304,7 +314,7 @@
    "install_settings_dns_desc": "Va trebui să configurați aparatele sau routerul pentru a utiliza serverul DNS pe următoarele adrese:",
    "install_settings_all_interfaces": "Toate interfețele",
    "install_auth_title": "Autentificare",
-    "install_auth_desc": "Este foarte recomandat să configurați o parolă pentru accesul la interfața web de administrare AdGuard Home. Chiar dacă este accesibil numai în rețeaua dvs. locală, este încă important să îl protejați de accesul fără restricții.",
+    "install_auth_desc": "Trebuie configurată autentificarea cu parolă la interfața web AdGuard Home admin. Chiar dacă AdGuard Home este accesibil numai în rețeaua locală, este important să îl protejați de accesul fără restricții.",
    "install_auth_username": "Nume utilizator",
    "install_auth_password": "Parola",
    "install_auth_confirm": "Confirmați parola",
@@ -326,8 +336,8 @@
    "install_devices_windows_list_2": "Accesați categoria \"Rețea și Internet\", apoi la \"Centrul de Rețea și Partajare\".",
    "install_devices_windows_list_3": "În partea stângă a ecranului găsiți \"Schimbare setări adaptor\" și clicați pe el.",
    "install_devices_windows_list_4": "Selectați conexiunea activă, faceți clic dreapta pe ea și alegeți \"Proprietăți\".",
-    "install_devices_windows_list_5": "Găsiți Internet Protocol Versiunea 4 (TCP/IP) din listă, selectați-l și apoi clicați din nou pe Proprietăți.",
-    "install_devices_windows_list_6": "Alegeți Utilizați următoarele adrese de server DNS și introduceți adresele de server AdGuard Home.",
+    "install_devices_windows_list_5": "Găsiți Internet Protocol Versiunea 4 (TCP/IPv4) din listă, selectați-l și apoi clicați din nou pe Proprietăți.",
+    "install_devices_windows_list_6": "Alegeți „Utilizați următoarele adrese de server DNS” și introduceți adresele serverului dvs. AdGuard Home.",
    "install_devices_macos_list_1": "Clicați pe icoana Apple și accesați Preferințele Sistemului.",
    "install_devices_macos_list_2": "Clicați pe Network.",
    "install_devices_macos_list_3": "Selectați prima conexiune din listă și clicați pe Avansat.",
@@ -501,6 +511,7 @@
    "statistics_clear_confirm": "Sunteți sigur că doriți să ștergeți statisticile?",
    "statistics_retention_confirm": "Sunteți sigur că doriți să schimbați păstrarea statisticilor? Dacă reduceți valoarea intervalului, unele date vor fi pierdute",
    "statistics_cleared": "Statisticile au fost șterse cu succes",
+    "statistics_enable": "Activați statisticile",
    "interval_hours": "{{count}} oră",
    "interval_hours_plural": "{{count}} ore",
    "filters_configuration": "Configurația filtrelor",
@@ -574,9 +585,9 @@
    "validated_with_dnssec": "Validat cu DNSSEC",
    "all_queries": "Toate interogările",
    "show_blocked_responses": "Blocat",
-    "show_whitelisted_responses": "Pe lista albă",
+    "show_whitelisted_responses": "Autorizate",
    "show_processed_responses": "Tratat",
-    "blocked_safebrowsing": "Blocat de Navigarea securitară",
+    "blocked_safebrowsing": "Blocat de Navigarea în siguranță",
    "blocked_adult_websites": "Site-uri pentru adulți blocate",
    "blocked_threats": "Amenințări blocate",
    "allowed": "Permise",
@@ -595,6 +606,8 @@
    "cache_ttl_min_override_desc": "Extinde valorile timp-de-viață scurte (secunde) primite de la serverul din amonte la stocarea în cache a răspunsurilor DNS",
    "cache_ttl_max_override_desc": "Setează o valoare maximă a timpului-de-viață (secunde) pentru intrările din memoria cache DNS",
    "ttl_cache_validation": "Valoarea TTL cache minimă trebuie să fie mai mică sau egală cu valoarea maximă",
+    "cache_optimistic": "Caching optimistic",
+    "cache_optimistic_desc": "Face ca AdGuard Home să răspundă din cache chiar și atunci când intrările au expirate și de asemenea, încearcă să le reîmprospăteze.",
    "filter_category_general": "General",
    "filter_category_security": "Securitate",
    "filter_category_regional": "Regional",
@@ -608,6 +621,11 @@
    "click_to_view_queries": "Clicați pentru a vizualiza interogări",
    "port_53_faq_link": "Portul 53 este adesea ocupat de serviciile \"DNSStubListener\" sau \"systemd-resolved\". Vă rugăm să citiți <0>această instrucțiune</0> despre cum să rezolvați aceasta.",
    "adg_will_drop_dns_queries": "AdGuard Home va renunța la toate interogările DNS de la acest client.",
-    "client_not_in_allowed_clients": "Clientul nu este permis deoarece nu este în lista de \"Clienți permiși\".",
-    "experimental": "Experimental"
+    "filter_allowlist": "AVERTISMENT: Această acțiune va exclude și regula „{{disallowed_rule}}” din lista de clienți permiși.",
+    "last_rule_in_allowlist": "Acest client nu poate fi exclus deoarece excluderea regulii „{{disallowed_rule}}” va DEZACTIVA lista „Clienți acceptați”.",
+    "experimental": "Experimental",
+    "use_saved_key": "Folosiți cheia salvată anterior",
+    "parental_control": "Control Parental",
+    "safe_browsing": "Navigare în siguranță",
+    "served_from_cache": "{{value}} <i>(furnizat din cache)</i>"
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -36,16 +36,23 @@
    "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_server_name": "Неверное имя сервера",
+    "form_error_ip4_format": "Некорректный IPv4-адрес",
+    "form_error_ip4_range_start_format": "Некорректный IPv4-адрес начала диапазона",
+    "form_error_ip4_range_end_format": "Некорректный IPv4-адрес конца диапазона",
+    "form_error_ip4_gateway_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_server_name": "Некорректное имя сервера",
    "form_error_subnet": "Подсеть «{{cidr}}» не содержит IP-адрес «{{ip}}»",
    "form_error_positive": "Должно быть больше 0",
-    "form_error_negative": "Должно быть не меньше 0",
-    "range_end_error": "Должно превышать начало диапазона",
+    "out_of_range_error": "Должно быть вне диапазона «{{start}}»-«{{end}}»",
+    "lower_range_start_error": "Должно быть меньше начала диапазона",
+    "greater_range_start_error": "Должно быть больше начала диапазона",
+    "greater_range_end_error": "Должно быть больше конца диапазона",
+    "subnet_error": "Адреса должны быть внутри одной подсети",
+    "gateway_or_subnet_invalid": "Некорректная маска подсети",
    "dhcp_form_gateway_input": "IP-адрес шлюза",
    "dhcp_form_subnet_input": "Маска подсети",
    "dhcp_form_range_title": "Диапазон IP-адресов",
@@ -156,8 +163,8 @@
    "apply_btn": "Применить",
    "disabled_filtering_toast": "Фильтрация выкл.",
    "enabled_filtering_toast": "Фильтрация вкл.",
-    "disabled_safe_browsing_toast": "Безопасная навигация выкл.",
-    "enabled_safe_browsing_toast": "Безопасная навигация вкл.",
+    "disabled_safe_browsing_toast": "Антифишинг отключен",
+    "enabled_safe_browsing_toast": "Антифишинг включен",
    "disabled_parental_toast": "Родительский контроль выкл.",
    "enabled_parental_toast": "Родительский контроль вкл.",
    "disabled_safe_search_toast": "Безопасный поиск выкл.",
@@ -189,10 +196,11 @@
    "choose_allowlist": "Выберите списки разрешённых",
    "enter_valid_blocklist": "Добавьте действующий URL-адрес в чёрный список.",
    "enter_valid_allowlist": "Добавьте действующий URL-адрес в белый список.",
-    "form_error_url_format": "Неверный формат URL",
-    "form_error_url_or_path_format": "Неверный URL или абсолютный путь к списку",
+    "form_error_url_format": "Некорректный URL",
+    "form_error_url_or_path_format": "Некорректный URL или абсолютный путь к списку",
    "custom_filter_rules": "Пользовательское правило фильтрации",
    "custom_filter_rules_hint": "Вводите по одному правилу на строчку. Вы можете использовать правила блокировки или синтаксис файлов hosts.",
+    "system_host_files": "Системные hosts-файлы",
    "examples_title": "Примеры",
    "example_meaning_filter_block": "заблокировать доступ к домену example.org и всем его поддоменам",
    "example_meaning_filter_whitelist": "разблокировать доступ к домену example.org и всем его поддоменам",
@@ -208,7 +216,7 @@
    "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": "Upstream DNS-серверы обновлены",
+    "updated_upstream_dns_toast": "DNS-серверы успешно обновлены",
    "dns_test_ok_toast": "Указанные серверы DNS работают корректно",
    "dns_test_not_ok_toast": "Сервер «{{key}}»: невозможно использовать, проверьте правильность написания",
    "unblock": "Разблокировать",
@@ -231,11 +239,11 @@
    "no_logs_found": "Логи не найдены",
    "refresh_btn": "Обновить",
    "previous_btn": "Назад",
-    "next_btn": "Вперёд",
+    "next_btn": "Далее",
    "loading_table_status": "Загрузка…",
    "page_table_footer_text": "Страница",
    "rows_table_footer_text": "строк",
-    "updated_custom_filtering_toast": "Внесены изменения в пользовательские правила",
+    "updated_custom_filtering_toast": "Пользовательские правила успешно сохранены",
    "rule_removed_from_custom_filtering_toast": "Пользовательское правило удалено: {{rule}}",
    "rule_added_to_custom_filtering_toast": "Пользовательское правило добавлено: {{rule}}",
    "query_log_response_status": "Статус: {{value}}",
@@ -277,7 +285,7 @@
    "form_enter_rate_limit": "Введите rate limit",
    "rate_limit": "Rate limit",
    "edns_enable": "Включить отправку EDNS Client Subnet",
-    "edns_cs_desc": "Отправлять подсети клиентов на DNS-сервера.",
+    "edns_cs_desc": "Отправлять подсети клиентов на DNS-серверы.",
    "rate_limit_desc": "Ограничение на количество запросов в секунду для каждого клиента (0 — неограниченно).",
    "blocking_ipv4_desc": "IP-адрес, возвращаемый при блокировке A-запроса",
    "blocking_ipv6_desc": "IP-адрес, возвращаемый при блокировке AAAA-запроса",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Вам будет нужно настроить свои устройства или роутер на использование DNS-сервера на одном из следующих адресов:",
    "install_settings_all_interfaces": "Все интерфейсы",
    "install_auth_title": "Авторизация",
-    "install_auth_desc": "Настоятельно рекомендуется настроить аутентификацию паролем для веб-интерфейса AdGuard Home. Даже если он доступен только в вашей локальной сети, важно защитить его от неограниченного доступа.",
+    "install_auth_desc": "Должна быть настроена аутентификация паролем для веб-интерфейса AdGuard Home. Даже если он доступен только в вашей локальной сети, важно защитить его от неограниченного доступа.",
    "install_auth_username": "Имя пользователя",
    "install_auth_password": "Пароль",
    "install_auth_confirm": "Подтвердить пароль",
@@ -314,9 +322,9 @@
    "install_auth_password_enter": "Введите пароль",
    "install_step": "Шаг",
    "install_devices_title": "Настройте ваши устройства",
-    "install_devices_desc": "Для того, чтобы использовать AdGuard Home, вам нужно настроить ваши устройства на его использование.",
+    "install_devices_desc": "Чтобы использовать AdGuard Home, настройте ваши устройства на его использование.",
    "install_submit_title": "Поздравляем!",
-    "install_submit_desc": "Процедура настройки завершена, AdGuard Home готов к использованию.",
+    "install_submit_desc": "Настройка завершена, AdGuard Home готов к использованию.",
    "install_devices_router": "Роутер",
    "install_devices_router_desc": "Эта настройка покроет все устройства, подключенные к вашему домашнему роутеру, и вам не нужно будет настраивать каждое вручную.",
    "install_devices_address": "DNS-сервер AdGuard Home доступен по следующим адресам",
@@ -344,7 +352,7 @@
    "install_devices_ios_list_3": "Нажмите на название сети, к которой устройство подключено в данный момент.",
    "install_devices_ios_list_4": "В поле «DNS» введите введите адреса AdGuard Home.",
    "get_started": "Поехали",
-    "next": "Дальше",
+    "next": "Далее",
    "open_dashboard": "Открыть Панель управления",
    "install_saved": "Успешно сохранено",
    "encryption_title": "Шифрование",
@@ -362,7 +370,7 @@
    "encryption_doq": "Порт DNS-over-QUIC",
    "encryption_doq_desc": "Если этот порт настроен, AdGuard Home запустит сервер DNS-over-QUIC на этом порте. Это экспериментально и может быть ненадёжно. Кроме того, не так много клиентов поддерживает этот способ в настоящий момент.",
    "encryption_certificates": "Сертификаты",
-    "encryption_certificates_desc": "Для использования шифрования вам необходимо предоставить валидную цепочку SSL-сертификатов для вашего домена. Вы можете получить бесплатный сертификат на <0>{{link}}</0> или вы можете купить его у одного из доверенных Центров Сертификации.",
+    "encryption_certificates_desc": "Для использования шифрования вам необходимо предоставить корректную цепочку SSL-сертификатов для вашего домена. Вы можете получить бесплатный сертификат на <0>{{link}}</0> или вы можете купить его у одного из доверенных Центров Сертификации.",
    "encryption_certificates_input": "Скопируйте сюда сертификаты в PEM-кодировке.",
    "encryption_status": "Статус",
    "encryption_expire": "Истекает",
@@ -370,10 +378,10 @@
    "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_chain_valid": "Цепочка сертификатов прошла проверку",
+    "encryption_chain_invalid": "Цепочка сертификатов не прошла проверку",
+    "encryption_key_valid": "Корректный {{type}} приватный ключ",
+    "encryption_key_invalid": "Некорректный {{type}} приватный ключ",
    "encryption_subject": "Субъект",
    "encryption_issuer": "Издатель",
    "encryption_hostnames": "Имена хостов",
@@ -455,19 +463,19 @@
    "setup_dns_privacy_other_5": "Вы можете найти ещё варианты <0>тут</0> и <1>тут</1>.",
    "setup_dns_privacy_ioc_mac": "Конфигурация для iOS и macOS",
    "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_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_applied": "Применено правило перезаписи",
    "rewrite_hosts_applied": "Переписано по правилу файла hosts",
-    "dns_rewrites": "Перенаправления DNS",
+    "dns_rewrites": "Перезапись DNS-запросов",
    "form_domain": "Введите домен",
    "form_answer": "Введите IP адрес или домен",
-    "form_error_domain_format": "Неверный формат домена",
-    "form_error_answer_format": "Неверный формат ответа",
+    "form_error_domain_format": "Некорректный домен",
+    "form_error_answer_format": "Некорректный ответ",
    "configure": "Настроить",
    "main_settings": "Основные настройки",
    "block_services": "Выбрать заблокированные сервисы",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Конфигурация статистики",
    "statistics_retention": "Сохранение статистики",
    "statistics_retention_desc": "Если вы уменьшите значение интервала, некоторые данные могут быть утеряны",
-    "statistics_clear": " Очистить статистику",
+    "statistics_clear": "Очистить статистику",
    "statistics_clear_confirm": "Вы уверены, что хотите очистить статистику?",
    "statistics_retention_confirm": "Вы уверены, что хотите изменить срок хранения статистики? При сокращении интервала данные могут быть утеряны",
    "statistics_cleared": "Статистика успешно очищена",
+    "statistics_enable": "Включить статистику",
    "interval_hours": "{{count}} час",
    "interval_hours_plural": "{{count}} часов",
    "filters_configuration": "Настройка фильтров",
@@ -528,9 +537,9 @@
    "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 для А или АААА ответов",
+    "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> с upstream-сервера",
    "rewrite_AAAA": "<0>AAAA</0>: специальное значение, хранить записи <0>AAAA</0> с upstream-сервера",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "В белом списке",
    "show_processed_responses": "Обработан",
    "blocked_safebrowsing": "Заблокировано согласно базе данных Safebrowsing",
-    "blocked_adult_websites": "Заблокированные «взрослые» сайты",
+    "blocked_adult_websites": "Заблокировано Родительским контролем",
    "blocked_threats": "Заблокировано угроз",
    "allowed": "Разрешённые",
    "filtered": "Отфильтрованные",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Расширить короткие TTL-значения (в секундах), полученные с upstream-сервера при кешировании DNS-ответов",
    "cache_ttl_max_override_desc": "Установить максимальное TTL-значение (в секундах) для записей в DNS-кэше",
    "ttl_cache_validation": "Минимальное значение TTL-кеша должно быть меньше или равно максимальному значению",
-    "cache_optimistic": "Оптимистичный",
+    "cache_optimistic": "Оптимистическое кеширование",
    "cache_optimistic_desc": "AdGuard Home будет отвечать из кеша, даже если ответы в нём неактуальны, и попытается обновить их.",
    "filter_category_general": "Общие",
    "filter_category_security": "Безопасность",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Нажмите, чтобы просмотреть запросы",
    "port_53_faq_link": "Порт 53 часто занят службами «DNSStubListener» или «systemd-resolved». Ознакомьтесь с <0>инструкцией</0> о том, как это разрешить.",
    "adg_will_drop_dns_queries": "AdGuard Home AdGuard Home сбросит все DNS-запросы от этого клиента.",
-    "client_not_in_allowed_clients": "Клиент не разрешён, так как его нет в списке «Разрешённых клиентов».",
-    "experimental": "Экспериментальный"
+    "filter_allowlist": "ВНИМАНИЕ: Это действие также исключит правило «{{disallowed_rule}}» из списка разрешённых клиентов.",
+    "last_rule_in_allowlist": "Нельзя заблокировать этого клиента, так как исключение правила «{{disallowed_rule}}» ОТКЛЮЧИТ режим белого списка.",
+    "experimental": "Экспериментальный",
+    "use_saved_key": "Использовать сохранённый ранее ключ",
+    "parental_control": "Родительский контроль",
+    "safe_browsing": "Безопасный интернет",
+    "served_from_cache": "{{value}} <i>(получено из кеша)</i>"
 }
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -3,40 +3,41 @@
    "example_upstream_comment": "ඔබට අදහසක් සඳහන් කළ හැකිය",
    "parallel_requests": "සමාන්තර ඉල්ලීම්",
    "load_balancing": "ධාරිතාව තුලනය",
-    "local_ptr_title": "පෞද්ගලික ප්‍රතිවර්ත ව.නා.ප. සේවාදායකයන්",
+    "local_ptr_title": "පෞද්ගලික ප්‍රතිවර්ත ව.නා.ප. සේවාදායක",
    "local_ptr_placeholder": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් යොදන්න",
-    "resolve_clients_title": "අනුග්‍රාහකවල අ.ජා. කෙ. ලිපින ප්‍රතිවර්ත විසඳීම සබල කරන්න",
-    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායකයන්  සඳහා පරීක්ෂා කරන්න",
+    "resolve_clients_title": "අනුග්‍රාහකවල අ.ජා.කෙ. ලිපින ප්‍රතිවර්ත විසඳීම සබල කරන්න",
+    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායක සඳහා පරීක්‍ෂා කරන්න",
    "save_config": "වින්‍යාසය සුරකින්න",
-    "enabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය සබල කර ඇත",
-    "disabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය අබල කර ඇත",
-    "unavailable_dhcp_desc": "ඇඩ්ගාර්ඩ් හෝම් හට ඔබගේ මෙහෙයුම් පද්ධතියේ ග.ධා.වි.කෙ. සේවාදායකයක් ධාවනය කළ නොහැක",
+    "enabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය සබල කෙරිණි",
+    "disabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය අබල කෙරිණි",
+    "unavailable_dhcp_desc": "ඇඩ්ගාර්ඩ් හෝම් හට ඔබගේ මෙහෙයුම් පද්ධතියේ ග.ධා.වි.කෙ. සේවාදායකයක් ධාවනය කිරීමට නොහැකිය",
    "dhcp_title": "ග.ධා.වි.කෙ. සේවාදායකය (පර්යේෂණාත්මක!)",
    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට ඇඩ්ගාර්ඩ් හි ඇති ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
    "dhcp_enable": "ග.ධා.වි.කෙ. සේවාදායකය සබල කරන්න",
    "dhcp_disable": "ග.ධා.වි.කෙ. සේවාදායකය අබල කරන්න",
    "dhcp_config_saved": "ග.ධා.වි.කෙ. වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. අයිපීවී 4 සැකසුම්",
-    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අයිපීවී 6 සැකසුම්",
+    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. අ.ජා.කෙ. 4 සැකසුම්",
+    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අ.ජා.කෙ. 6 සැකසුම්",
    "form_error_required": "අවශ්‍ය ක්ෂේත්‍රයකි",
-    "form_error_ip4_format": "වලංගු නොවන IPv4 ආකෘතියකි",
-    "form_error_ip6_format": "වලංගු නොවන IPv6 ආකෘතියකි",
-    "form_error_ip_format": "වලංගු නොවන අ.ජා. කෙ. (IP) ආකෘතියකි",
-    "form_error_mac_format": "වලංගු නොවන මා.ප්‍ර.පා. ආකෘතියකි",
-    "form_error_client_id_format": "වලංගු නොවන අනුග්‍රාහක හැඳුනුම් ආකෘතියකි",
+    "form_error_ip4_format": "වලංගු නොවන IPv4 ලිපිනයකි",
+    "form_error_ip4_range_start_format": "පරාසය ආරම්භයේ අ.ජා.කෙ.4 ලිපිනය වලංගු නොවේ",
+    "form_error_ip4_range_end_format": "පරාසය අවසානයේ අ.ජා.කෙ.4 ලිපිනය වලංගු නොවේ",
+    "form_error_ip6_format": "වලංගු නොවන අ.ජා.කෙ.6 ලිපිනයකි",
+    "form_error_ip_format": "අ.ජා.කෙ. (IP) ලිපිනය වලංගු නොවේ",
+    "form_error_mac_format": "මා.ප්‍ර.පා. ලිපිනය වලංගු නොවේ",
+    "form_error_client_id_format": "අනුග්‍රාහකයේ හැඳු. වලංගු නොවේ",
    "form_error_server_name": "වලංගු නොවන සේවාදායක නාමයකි",
    "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_hardware_address": "දෘඩාංග ලිපිනය",
-    "dhcp_ip_addresses": "අ.ජා. කෙ. (IP) ලිපින",
-    "ip": "අ.ජා. කෙ. (IP)",
+    "dhcp_ip_addresses": "අ.ජා.කෙ. (IP) ලිපින",
+    "ip": "අ.ජා.කෙ. (IP)",
    "dhcp_table_hostname": "ධාරක නාමය",
    "dhcp_table_expires": "කල් ඉකුත් වීම",
-    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නොමැති බව තහවුරු කරගන්න. මෙය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
+    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබගේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නැති බව තහවුරු කරගන්න. මෙය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
    "dhcp_error": "ජාලයේ තවත් ග.ධා.වි.කෙ. සේවාදායකයක් තිබේද යන්න නිශ්චය කළ නොහැකි විය.",
    "dhcp_static_ip_error": "ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් සැකසිය යුතුය. මෙම ජාල අතුරුමුහුණත ස්ථිතික අ.ජා. කෙ. ලිපිනයක් භාවිතයෙන් වින්‍යාසගත කර තිබේද යන්න තීරණය කිරීමට ඇඩ්ගාර්ඩ් හෝම් අසමත් විය. කරුණාකර ස්ථිතික අ.ජා. කෙ. ලිපිනයක් අතින් සකසන්න.",
    "dhcp_dynamic_ip_found": "ඔබගේ පද්ධතිය <0>{{interfaceName}}</0> අතුරු මුහුණත සඳහා ගතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපින වින්‍යාසය භාවිතා කරයි. ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීම සඳහා ස්ථිතික අ.ජා. කෙ. ලිපිනයක් සැකසිය යුතුය. ඔබගේ වර්තමාන අ.ජා. කෙ. ලිපිනය <0>{{ipAddress}}</0> වේ. ඔබ \"ග.ධා.වි.කෙ. සබල කරන්න\" බොත්තම එබුවහොත් ඇඩ්ගාර්ඩ් හෝම් ස්වයංක්‍රීයව මෙම අ.ජා. කෙ. ලිපිනය ස්ථිතික ලෙස සකසනු ඇත.",
@@ -44,9 +45,9 @@
    "country": "රට",
    "city": "නගරය",
    "delete_confirm": "\"{{key}}\" මකා දැමීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "form_enter_hostname": "ධාරක නාමය ඇතුළත් කරන්න",
+    "form_enter_hostname": "ධාරක නාමය ඇතුල් කරන්න",
    "error_details": "දෝෂ විස්තර",
-    "response_details": "ප්‍රතිචාරය‌ෙහි විස්තර",
+    "response_details": "ප්‍රතිචාරයෙහි විස්තර",
    "request_details": "ඉල්ලීමෙහි විස්තර",
    "client_details": "අනුග්‍රාහකයේ විස්තර",
    "details": "විස්තර",
@@ -57,8 +58,8 @@
    "filter": "පෙරහන",
    "query_log": "විමසුම් ලොගය",
    "compact": "සංක්ෂිප්ත",
-    "nothing_found": "කිසිවක් සොයාගත නොහැක",
-    "faq": "නිති අසන පැණ",
+    "nothing_found": "කිසිවක් හමු නොවිණි",
+    "faq": "නිති පැණ",
    "version": "අනුවාදය",
    "address": "ලිපිනය",
    "protocol": "කෙටුම්පත",
@@ -68,115 +69,118 @@
    "homepage": "මුල්  පිටුව",
    "report_an_issue": "ගැටලුවක් වාර්තා කරන්න",
    "privacy_policy": "රහස්‍යතා ප්‍රතිපත්තිය",
-    "enable_protection": "ආරක්ෂණය සබල කරන්න",
-    "enabled_protection": "ආරක්ෂණය සබල කර ඇත",
-    "disable_protection": "ආරක්ෂණය අබල කරන්න",
-    "disabled_protection": "ආරක්ෂණය අබල කර ඇත",
+    "enable_protection": "රැකවරණය සබල කරන්න",
+    "enabled_protection": "රැකවරණය සබල කෙරිණි",
+    "disable_protection": "රැකවරණය අබල කරන්න",
+    "disabled_protection": "රැකවරණය අබල කෙරිණි",
    "refresh_statics": "සංඛ්‍යාලේඛන නැවුම් කරන්න",
    "dns_query": "ව.නා.ප. (DNS) විමසුම්",
-    "blocked_by": "<0>පෙරහන් මගින් අවහිර කරන ලද</0>",
+    "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": "වසම් කිසිවක් සොයා ගත නොහැකි විය",
+    "for_last_days": "පසුගිය දවස් {{count}} සඳහා",
+    "for_last_days_plural": "පසුගිය දවස් {{count}} සඳහා",
+    "stats_disabled": "සංඛ්‍යාලේඛන අබල කර ඇත. එය <0>සැකසුම් පිටුවෙන්</0> සබල කළ හැකිය.",
+    "stats_disabled_short": "සංඛ්‍යාලේඛන අබල කර ඇත",
+    "no_domains_found": "වසම් කිසිවක් හමු නොවිණි",
    "requests_count": "ඉල්ලීම් ගණන",
    "top_blocked_domains": "ජනප්‍රිය අවහිර කළ වසම්",
-    "top_clients": "ජනප්‍රිය අනුග්‍රාහකයන්",
-    "no_clients_found": "අනුග්‍රාහකයින් හමු නොවිණි",
+    "top_clients": "ජනප්‍රිය අනුග්‍රාහක",
+    "no_clients_found": "අනුග්‍රාහක හමු නොවිණි",
    "general_statistics": "පොදු සංඛ්‍යාලේඛන",
-    "number_of_dns_query_days": "පසුගිය දින {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_days_plural": "පසුගිය දින {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_24_hours": "පසුගිය හෝරා 24 සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
-    "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්ෂණ ඒකකය මගින් අවහිර කරන ලද ව.නා.ප. ඉල්ලීම් ගණන",
+    "number_of_dns_query_days": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
+    "number_of_dns_query_days_plural": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
+    "number_of_dns_query_24_hours": "පසුගිය පැය 24 සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
+    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
+    "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ ඒකකය මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි ගණන",
-    "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කරන ලද",
+    "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ",
    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
    "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
    "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
    "block_domain_use_filters_and_hosts": "පෙරහන් සහ ධාරක ගොනු භාවිතා කරමින් වසම් අවහිර කරන්න",
    "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
-    "use_adguard_browsing_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්ෂණ වියමන සේවාව භාවිතා කරන්න",
+    "use_adguard_browsing_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව භාවිතා කරන්න",
    "use_adguard_parental": "ඇඩ්ගාර්ඩ් දෙමාපිය පාලන වියමන සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය පිරික්සුම් ආරක්ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
-    "enforce_safe_search": "ආරක්ෂිත සෙවීම භාවිතා කරන්න",
-    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් පහත සෙවුම් යන්ත්‍ර තුළ ආරක්ෂිත සෙවීම බලාත්මක කරනු ඇත: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
+    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
+    "enforce_safe_search": "ආරක්‍ෂිත සෙවුම භාවිතා කරන්න",
+    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් පහත සෙවුම් යන්ත්‍ර තුළ ආරක්‍ෂිත සෙවුම බලාත්මක කරනු ඇත: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
    "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
    "general_settings": "පොදු සැකසුම්",
    "dns_settings": "ව.නා.ප. සැකසුම්",
    "dns_blocklists": "ව.නා.ප. අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "dns_allowlists": "ව.නා.ප. අවසර දීමේ ලැයිස්තු",
-    "dns_blocklists_desc": "ඇඩ්ගාර්ඩ් හෝම් විසින් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු වලට ගැලපෙන වසම් අවහිර කරනු ඇත.",
-    "dns_allowlists_desc": "අවසර දීමේ ව.නා.ප. ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක අඩංගු වුවද එය නොසලකා හැර අවසර දෙනු ලැබේ.",
+    "dns_allowlists": "ව.නා.ප. ඉඩ දීමේ ලැයිස්තු",
+    "dns_blocklists_desc": "ඇඩ්ගාර්ඩ් හෝම් විසින් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු වලට ගැළපෙන වසම් අවහිර කරනු ඇත.",
+    "dns_allowlists_desc": "ඉඩ දීමේ ව.නා.ප. ලැයිස්තුවල වසම් කිසියම් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක අඩංගු වුවද එය නොසලකා හැර ඉඩ දෙනු ලැබේ.",
    "custom_filtering_rules": "අභිරුචි පෙරීමේ නීති",
-    "encryption_settings": "සංකේතාංකන සැකසුම්",
+    "encryption_settings": "සංකේතන සැකසුම්",
    "dhcp_settings": "ග.ධා.වි.කෙ. සැකසුම්",
-    "upstream_dns": "Upstream ව.නා.ප. සේවාදායකයන්",
-    "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුළත් කරන්න. upstream ව.නා.ප. (DNS) \n සේවාදායකයන් වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
+    "upstream_dns": "Upstream ව.නා.ප. සේවාදායක",
+    "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුල් කරන්න. upstream ව.නා.ප. (DNS) \n සේවාදායක වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
    "upstream_dns_configured_in_file": "{{path}} හි වින්‍යාසගත කර ඇත",
    "apply_btn": "යොදන්න",
-    "disabled_filtering_toast": "පෙරීම අබල කර ඇත",
-    "enabled_filtering_toast": "පෙරීම සබල කර ඇත",
-    "disabled_safe_browsing_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
-    "enabled_safe_browsing_toast": "ආරක්ෂිත සෙවීම සබල කර ඇත",
-    "disabled_parental_toast": "Parental control අබල කර ඇත",
-    "enabled_parental_toast": "Parental control සබල කර ඇත",
-    "disabled_safe_search_toast": "ආරක්ෂිත සෙවීම අබල කර ඇත",
-    "enabled_save_search_toast": "ආරක්ෂිත සෙවීම සබල කර ඇත",
-    "enabled_table_header": "සබල කර ඇත",
+    "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": "අවසන් වරට යාවත්කාලීන කරන ලද",
+    "last_time_updated_table_header": "අවසන් යාවත්කාල වීම",
    "actions_table_header": "ක්‍රියාමාර්ග",
    "request_table_header": "ඉල්ලීම",
    "edit_table_action": "සංස්කරණය කරන්න",
    "delete_table_action": "මකන්න",
-    "elapsed": "ගත වූූූ කාලය",
+    "elapsed": "ගත වූ කාලය",
    "filters_and_hosts_hint": "ඇඩ්ගාර්ඩ් හෝම් මූලික දැන්වීම් වාරණ නීති සහ ධාරක ගොනු පද ගැලපුම් තේරුම් ගනී.",
    "no_blocklist_added": "අවහිර කිරීමේ ලැයිස්තු එකතු කර නැත",
-    "no_whitelist_added": "අවසර දීමේ ලැයිස්තු එකතු කර නැත",
+    "no_whitelist_added": "ඉඩ දීමේ ලැයිස්තු එකතු කර නැත",
    "add_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක් එකතු කරන්න",
-    "add_allowlist": "අවසර දීමේ ලැයිස්තුවක් එකතු කරන්න",
-    "cancel_btn": "අහෝසි කරන්න",
-    "enter_name_hint": "නම ඇතුළත් කරන්න",
-    "enter_url_or_path_hint": "ලැයිස්තුවක ඒ.ස.නි.(URL) හෝ ස්ථීර මාර්ගයක් ඇතුළත් කරන්න",
-    "check_updates_btn": "යාවත්කාල පරීක්ෂා කරන්න",
+    "add_allowlist": "ඉඩ දීමේ ලැයිස්තුවක් එකතු කරන්න",
+    "cancel_btn": "අවලංගු",
+    "enter_name_hint": "නම ඇතුල් කරන්න",
+    "enter_url_or_path_hint": "ලැයිස්තුවක ඒ.ස.නි.(URL) හෝ ස්ථීර මාර්ගයක් ඇතුල් කරන්න",
+    "check_updates_btn": "යාවත්කාල පරීක්‍ෂා කරන්න",
    "new_blocklist": "නව අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
-    "new_allowlist": "නව අවසර දීමේ ලැයිස්තුව",
-    "edit_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව සංස්කරණය කරන්න",
-    "edit_allowlist": "අවසර දීමේ ලැයිස්තුව සංස්කරණය කරන්න",
+    "new_allowlist": "නව ඉඩ දීමේ ලැයිස්තුව",
+    "edit_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව සංස්කරණය",
+    "edit_allowlist": "ඉඩ දීමේ ලැයිස්තුව සංස්කරණය",
    "choose_blocklist": "අවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
-    "choose_allowlist": "අනවහිර කීරීමේ ලැයිස්තුවක් තෝරන්න",
-    "enter_valid_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවට වලංගු ඒ.ස.නි.(URL) ලිපිනයක් ඇතුළත් කරන්න.",
-    "enter_valid_allowlist": "අවසර දීමේ ලැයිස්තුවට වලංගු ඒ.ස.නි.(URL) ලිපිනයක් ඇතුළත් කරන්න.",
+    "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": "පේළියකට එක් නීතියක් බැගින් ඇතුළත් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ ධාරක ගොනු පද ගැලපුම් භාවිතා කළ හැකිය.",
+    "custom_filter_rules_hint": "පේළියකට එක් නීතියක් බැගින් ඇතුල් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ ධාරක ගොනු පද ගැලපුම් භාවිතා කළ හැකිය.",
+    "system_host_files": "පද්ධතියේ සත්කාරක ගොනු",
    "examples_title": "උදාහරණ",
-    "example_meaning_filter_block": "example.org වසමට සහ එහි සියලුම උප වසම් වලට පිවිසීම අවහිර කරයි",
-    "example_meaning_filter_whitelist": "example.org වසමට සහ එහි සියලුම උප වසම් වලට ප්‍රවේශය අවහිර නොකරයි",
-    "example_meaning_host_block": "ඇඩ්ගාර්ඩ් හෝම් දැන් example.org වසම සඳහා 127.0.0.1 ලිපිනය ලබා දෙනු ඇත (නමුත් එහි උප ලිපින නොවේ).",
+    "example_meaning_filter_block": "උදාහරණය.ලංකා වසමට සහ එහි සියළුම උප වසම් වලට ප්‍රවේශය අවහිර කරයි",
+    "example_meaning_filter_whitelist": "උදාහරණය.ලංකා වසමට සහ එහි සියළුම උප වසම් වලට ප්‍රවේශය අනවහිර කරයි",
+    "example_meaning_host_block": "ඇඩ්ගාර්ඩ් හෝම් දැන් උදාහරණය.ලංකා වසම සඳහා 127.0.0.1 ලිපිනය ලබා දෙනු ඇත (නමුත් එහි උප ලිපින නොවේ).",
    "example_comment": "! මෙතැන අදහස් දැක්වීමක්",
-    "example_comment_meaning": "විස්තර කිරීමක්",
+    "example_comment_meaning": "අදහසක්",
    "example_comment_hash": "# එසේම අදහස් දැක්වීමක්",
-    "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත පිවිසීම අවහිර කරයි",
+    "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැලපෙන වසම් වෙත ප්‍රවේශය අවහිර කරයි",
    "example_upstream_regular": "සාමාන්‍ය ව.නා.ප. (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_dot": "සංකේතිත <0>DNS-over-TLS</0>",
+    "example_upstream_doh": "සංකේතිත <0>DNS-over-HTTPS</0>",
+    "example_upstream_doq": "සංකේතිත <0>DNS-over-QUIC</0>",
    "example_upstream_tcp": "සාමාන්‍ය ව.නා.ප. (TCP/ස.පා.කෙ. හරහා) ",
-    "all_lists_up_to_date_toast": "සියලුම ලැයිස්තු දැනටමත් යාවත්කාලීනයි",
-    "dns_test_ok_toast": "සඳහන් කළ ව.නා.ප. සේවාදායකයන් නිවැරදිව ක්‍රියා කරයි",
-    "dns_test_not_ok_toast": "සේවාදායක \"{{key}}\": භාවිතා කළ නොහැකි විය, කරුණාකර ඔබ එය නිවැරදිව ලියා ඇත්දැයි පරීක්ෂා කරන්න",
+    "all_lists_up_to_date_toast": "සියළුම ලැයිස්තු දැනටමත් යාවත්කාලීනයි",
+    "dns_test_ok_toast": "සඳහන් කළ ව.නා.ප. සේවාදායක නිවැරදිව ක්‍රියා කරයි",
+    "dns_test_not_ok_toast": "\"{{key}}\" සේවාදායක(ය): භාවිතා කිරීමට නොහැකි විය, ඔබ එය නිවැරදිව ලියා ඇතිදැයි පරීක්‍ෂා කරන්න",
    "unblock": "අනවහිර",
    "block": "අවහිර",
-    "disallow_this_client": "මෙම අනුග්‍රාහකයට අවසර නොදෙන්න",
-    "allow_this_client": "මෙම අනුග්‍රාහකයට අවසර දෙන්න",
+    "disallow_this_client": "මෙම අනුග්‍රාහකයට නොඉඩ දෙන්න",
+    "allow_this_client": "මෙම අනුග්‍රාහකයට ඉඩ දෙන්න",
    "block_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අවහිර කරන්න",
    "unblock_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අනවහිර කරන්න",
    "time_table_header": "වේලාව",
@@ -196,11 +200,11 @@
    "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}} මගින් පෙරහන් කරන ලදි",
+    "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_updated": "විමසුම් ලොගය සාර්ථකව යාවත්කාලීන කරන ලදි",
    "query_log_clear": "විමසුම් ලොග ඉවත් කරන්න",
@@ -208,10 +212,10 @@
    "query_log_enable": "ලොගය සබල කරන්න",
    "query_log_configuration": "ලොග වින්‍යාසය",
    "query_log_disabled": "විමසුම් ලොගය අබල කර ඇති අතර එය <0>සැකසුම්</0> තුළ වින්‍යාසගත කළ හැකිය",
-    "query_log_strict_search": "ඉතා නිවැරදිව සෙවීම සඳහා ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
+    "query_log_strict_search": "ඉතා නිවැරදිව සෙවීමට ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
    "query_log_retention_confirm": "විමසුම් ලොගය රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
-    "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා. කෙ. (IP) නිර්නාමික කරන්න",
-    "anonymize_client_ip_desc": "ලොග සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ සම්පූර්ණ අ.ජා. කෙ. ලිපිනය සුරකීමෙන් වලකින්න",
+    "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා.කෙ. (IP) නිර්නාමික කරන්න",
+    "anonymize_client_ip_desc": "ලොග සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ සම්පූර්ණ අ.ජා.කෙ. ලිපිනය සුරැකීමෙන් වලකින්න",
    "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
    "dns_cache_config": "ව.නා.ප. නිහිත වින්‍යාසය",
    "dns_cache_config_desc": "මෙහිදී ඔබට ව.නා.ප. නිහිතය වින්‍යාසගත කළ හැකිය",
@@ -219,25 +223,26 @@
    "default": "සුපුරුදු",
    "nxdomain": "නොපවතින වසම",
    "refused": "REFUSED",
-    "null_ip": "අභිශූන්‍යය අ.ජා. කෙ.",
-    "custom_ip": "අභිරුචි අ.ජා. කෙ.",
-    "blocking_ipv4": "අයි.පී.වී.4 අවහිර කිරීම\n",
-    "blocking_ipv6": "අයි.පී.වී.6 අවහිර කිරීම",
+    "null_ip": "අභිශූන්‍යය අ.ජා.කෙ.",
+    "custom_ip": "අභිරුචි අ.ජා.කෙ.",
+    "blocking_ipv4": "අ.ජා.කෙ.4 අවහිර කිරීම",
+    "blocking_ipv6": "අ.ජා.කෙ.6 අවහිර කිරීම",
    "client_id": "අනුග්‍රාහකයේ හැඳුනුම",
    "client_id_placeholder": "අනුග්‍රාහකයේ හැඳුනුම යොදන්න",
    "download_mobileconfig": "වින්‍යාසගත ගොනුව බාගන්න",
    "plain_dns": "සරල ව.නා.ප.",
-    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුළත් කරන්න",
+    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුල් කරන්න",
    "rate_limit": "අනුපාත සීමාව",
    "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
-    "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
-    "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා. කෙ. (IP) ලිපිනය",
+    "rate_limit_desc": "එක් අනුග්‍රාහකයකට ඉඩ දී ඇති තත්පරයට ඉල්ලීම් ගණන. එය 0 ලෙස සැකසීම යනුවෙන් අදහස් කරන්නේ සීමාවක් නැති බවයි.",
+    "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
+    "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
    "blocking_mode_default": "පොදු: දැන්වීම් අවහිර කරන ආකාරයේ නීතියක් මගින් අවහිර කළ විට REFUSED සමඟ ප්‍රතිචාර දක්වයි; /etc/host-style ආකාරයේ නීතියක් මගින් අවහිර කළ විට නීතියේ දක්වා ඇති අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_refused": "REFUSED: REFUSED කේතය සමඟ ප්‍රතිචාර දක්වයි",
-    "blocking_mode_nxdomain": "නොපවතින වසම (NXDOMAIN): NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
-    "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා. කෙ. : ශුන්‍ය අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
+    "blocking_mode_nxdomain": "නොපවතින වසම: NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
+    "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා.කෙ.: ශුන්‍ය අ.ජා.කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායකයන් භාවිතා කරනු ඇත.",
+    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායක භාවිතා කරනු ඇත.",
    "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
    "source_label": "මූලාශ්‍රය",
    "found_in_known_domain_db": "දැනුවත් වසම් දත්ත ගබඩාවේ හමු විය.",
@@ -245,79 +250,78 @@
    "rule_label": "නීති(ය)",
    "list_label": "ලැයිස්තුව",
    "unknown_filter": "{{filterId}} නොදන්නා පෙරහනකි",
-    "known_tracker": "දැනුවත් ලුහුබැඳීමක්",
+    "known_tracker": "දැනුවත් ලුහුබැඳීමකි",
    "install_welcome_title": "ඇඩ්ගාර්ඩ් හෝම් වෙත සාදරයෙන් පිළිගනිමු!",
-    "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකි. ඔබගේ මුළු ජාලය සහ සියලුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
+    "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකයකි. ඔබගේ මුළු ජාලය සහ සියළුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
    "install_settings_title": "පරිපාලක වියමන අතුරු මුහුණත",
    "install_settings_listen": "සවන් දෙන අතුරු මුහුණත",
-    "install_settings_port": "කවුළුව",
-    "install_settings_interface_link": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණත පහත ලිපිනයන්ගෙන් ප්‍රවේශ විය හැකිය:",
-    "form_error_port": "වලංගු කවුළුවක අගයක් යොදන්න",
+    "install_settings_port": "කෙවෙනිය",
+    "install_settings_interface_link": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණතට පහත ලිපින වලින් ප්‍රවේශ වීමට හැකිය:",
+    "form_error_port": "වලංගු කෙවෙනියක අගයක් යොදන්න",
    "install_settings_dns": "ව.නා.ප. සේවාදායකය",
    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ මාර්ගකාරකය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
    "install_settings_all_interfaces": "සියලුම අතුරුමුහුණත්",
    "install_auth_title": "සත්‍යාපනය",
-    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කිරීම අතිශයින් නිර්දේශ කෙරේ. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
+    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලන වියමන අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කළ යුතුය. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
    "install_auth_username": "පරිශීලක නාමය",
    "install_auth_password": "මුරපදය",
    "install_auth_confirm": "මුරපදය තහවුරු කරන්න",
-    "install_auth_username_enter": "පරිශීලක නාමය ඇතුළත් කරන්න",
-    "install_auth_password_enter": "මුරපදය ඇතුළත් කරන්න",
+    "install_auth_username_enter": "පරිශීලක නාමය යොදන්න",
+    "install_auth_password_enter": "මුරපදය ඇතුල් කරන්න",
    "install_step": "පියවර",
    "install_devices_title": "ඔබගේ උපාංග වින්‍යාසගත කරන්න",
-    "install_devices_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කිරීම අවශ්‍ය වේ.",
+    "install_devices_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කළ යුතුය.",
    "install_submit_title": "සුභ පැතුම්!",
    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ දැන් ඇඩ්ගාර්ඩ් හෝම් භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
    "install_devices_router": "මාර්ගකාරකය",
    "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධ සියලුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒ සෑම එකක්ම අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවේ.",
    "install_devices_address": "ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය පහත ලිපිනයන්ට සවන් දෙමින් පවතී",
-    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. ඉලක්කම් කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අක්ෂර සොයන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
-    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුළත් කරන්න.",
-    "install_devices_router_list_4": "ඔබට සමහර වර්ගයේ මාර්ගකාරකය වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසිය නොහැක. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නොමැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරක මාදිළිය සඳහා වූ ව.නා.ප. සේවාදායකයන් රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත පරීක්ෂා කළ යුතුය.",
-    "install_devices_windows_list_1": "ආරම්භක මෙනුව හෝ වින්ඩෝස් සෙවුම හරහා පාලක පැනලය විවෘත කරන්න.",
+    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. අංක කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අකුරු බලන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
+    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුල් කරන්න.",
+    "install_devices_router_list_4": "සමහර වර්ගයේ මාර්ගකාරක වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසීමට නොහැකිය. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරකය සඳහා වූ ව.නා.ප. සේවාදායක රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත පරීක්‍ෂා කළ යුතුය.",
    "install_devices_windows_list_2": "ජාල සහ අන්තර්ජාල ප්‍රවර්ගයට ගොස් පසුව ජාල සහ බෙදාගැනීමේ මධ්‍යස්ථානය වෙත යන්න.",
-    "install_devices_windows_list_3": "උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම තිරයේ වම් පසින් සොයාගෙන එය මත ක්ලික් කරන්න.",
+    "install_devices_windows_list_3": "\"උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම\" තිරයේ වම් පසින් සොයාගෙන එය මත ඔබන්න.",
    "install_devices_windows_list_4": "ඔබගේ ක්‍රියාකාරී සම්බන්ධතාවය තෝරන්න, එය මත දකුණු-ක්ලික් කර ගුණාංග තෝරන්න.",
-    "install_devices_windows_list_5": "ලැයිස්තුවේ ඇති අන්තර්ජාල කෙටුම්පත් අනුවාදය 4 (TCP/IP) සොයාගෙන එය තෝරා ඉන්පසු ගුණාංග මත නැවත ක්ලික් කරන්න.",
-    "install_devices_windows_list_6": "'පහත සඳහන් ව.නා.ප. සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
-    "install_devices_macos_list_1": "ඇපල් අයිකනය මත ක්ලික් කර පද්ධති මනාපයන් වෙත යන්න.",
-    "install_devices_macos_list_2": "ජාලය මත ක්ලික් කරන්න.",
-    "install_devices_macos_list_3": "ඔබගේ ලැයිස්තුවේ පළමු සම්බන්ධතාවය තෝරා උසස් මත ක්ලික් කරන්න.",
-    "install_devices_macos_list_4": "ව.නා.ප. (DNS) තීරුව තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
+    "install_devices_windows_list_5": "ලැයිස්තුවෙන් \"අන්තර්ජාල කෙටුම්පත් අනුවාදය 4 (TCP/IPv4)\" (හෝ, IPv6 සඳහා, \"අන්තර්ජාල කෙටුම්පත් අනුවාදය 6 (TCP/IPv6)\") සොයාගෙන එය තෝරා ඉන්පසු ගුණාංග මත නැවත ඔබන්න.",
+    "install_devices_windows_list_6": "'පහත සඳහන් ව.නා.ප. සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
+    "install_devices_macos_list_1": "ඇපල් නිරූපකය එබීමෙන් පසු පද්ධතියේ මනාප වෙත යන්න.",
+    "install_devices_macos_list_2": "ජාලය මත ඔබන්න.",
+    "install_devices_macos_list_3": "ඔබගේ ලැයිස්තුවේ පළමු සම්බන්ධතාවය තෝරා වැඩිදුර යන්න ඔබන්න.",
+    "install_devices_macos_list_4": "ව.නා.ප. (DNS) තීරුව තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
    "install_devices_android_list_1": "ඇන්ඩ්‍රොයිඩ් මෙනුවෙහි මුල් තිරයෙන්, සැකසීම් මත තට්ටු කරන්න.",
    "install_devices_android_list_2": "මෙනුවේ වයි-ෆයි මත තට්ටු කරන්න. පවතින සියලුම ජාල ලැයිස්තුගත කර ඇති තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි ව.නා.ප. සැකසිය නොහැක).",
-    "install_devices_android_list_3": "ඔබ සම්බන්ධ වී ඇති ජාලය මත දිගු වේලාවක් ඔබන්න, ඉන්පසුව ජාලය වෙනස් කිරීම මත තට්ටු කරන්න.",
-    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල වැඩිදුර සැකසුම් බැලීමට \"උසස්\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් ව.නා.ප. (DNS) සැකසුම් වෙනස් කිරීමට අ.ජා. කෙ. (IP) සැකසුම්, ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
+    "install_devices_android_list_3": "සම්බන්ධිත ජාලය මත දිගු වේලාවක් ඔබන්න, ඉන්පසුව ජාලය වෙනස් කිරීම මත තට්ටු කරන්න.",
+    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල සියළු සැකසුම් බැලීමට \"වැඩිදුර\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් ව.නා.ප. (DNS) සැකසුම් වෙනස් කිරීමට අ.ජා.කෙ. (IP) සැකසුම්, ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
    "install_devices_android_list_5": "ව.නා.ප. 1 සහ ව.නා.ප. 2 පිහිටුවීම් අගයන් ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින වලට වෙනස් කරන්න.",
    "install_devices_ios_list_1": "මුල් තිරයේ සිට, සැකසුම් මත තට්ටු කරන්න.",
-    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි වයි-ෆයි තෝරන්න (ජංගම දුරකථන සඳහා ව.නා.ප. වින්‍යාසගත කිරීමට නොහැකිය).",
+    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි වයි-ෆයි තෝරන්න (ජං. දු.ක. සඳහා ව.නා.ප. වින්‍යාසගත කිරීමට නොහැකිය).",
    "install_devices_ios_list_3": "දැනට ක්‍රියාකාරී ජාලයයහෙි නම මත තට්ටු කරන්න.",
-    "install_devices_ios_list_4": "ව.නා.ප. (DNS) ක්ෂේත්‍රය තුළ ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුළත් කරන්න.",
-    "get_started": "ආරම්භ කර ගන්න",
+    "install_devices_ios_list_4": "ව.නා.ප. (DNS) ක්ෂේත්‍රය තුළ ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
+    "get_started": "පටන් ගන්න",
    "next": "ඊළඟ",
    "open_dashboard": "උපකරණ පුවරුව විවෘත කරන්න",
    "install_saved": "සාර්ථකව සුරකින ලදි",
-    "encryption_title": "සංකේතාංකනය",
+    "encryption_title": "සංකේතනය",
    "encryption_desc": "ගුප්තකේතනය (HTTPS/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වියමන අතුරු මුහුණත සහය දක්වයි",
-    "encryption_config_saved": "සංකේතාංකන වින්‍යාසය සුරකින ලදි",
+    "encryption_config_saved": "සංකේතන වින්‍යාසය සුරකින ලදි",
    "encryption_server": "සේවාදායක‌‌‌‌යේ නම",
-    "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුළත් කරන්න",
+    "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුල් කරන්න",
    "encryption_redirect": "ස්වයංක්‍රීයව HTTPS වෙත හරවා යවන්න",
    "encryption_redirect_desc": "සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
-    "encryption_https": "HTTPS කවුළුව",
-    "encryption_https_desc": "HTTPS කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
-    "encryption_dot": "DNS-over-TLS කවුළුව",
-    "encryption_dot_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත.",
-    "encryption_doq": "DNS-over-QUIC කවුළුව",
-    "encryption_doq_desc": "මෙම කවුළුව වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-QUIC සේවාදායකයක් ක්‍රියාත්මක කරනු ඇත. එය පර්යේෂණාත්මක වන අතර විශ්වාසදායක නොවිය හැකිය. එසේම, මේ වන විට එයට සහාය දක්වන බොහෝ අනුග්‍රාහකයින් නොමැත.",
+    "encryption_https": "HTTPS කෙවෙනිය",
+    "encryption_https_desc": "HTTPS කෙවෙනිය වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/dns-query' ස්ථානයේ DNS-over-HTTPS ද ලබා දෙනු ඇත.",
+    "encryption_dot": "DNS-over-TLS කෙවෙනිය",
+    "encryption_dot_desc": "මෙම කෙවෙනිය වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා DNS-over-TLS සේවාදායකයක් ධාවනය කරනු ඇත.",
+    "encryption_doq": "DNS-over-QUIC කෙවෙනිය",
+    "encryption_doq_desc": "මෙම කෙවෙනිය වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කෙවෙනිය හරහා DNS-over-QUIC සේවාදායකයක් ධාවනය කරනු ඇත. එය පර්යේෂණාත්මක වන අතර විශ්වාසදායක නොවිය හැකිය. එසේම, මේ වන විට එයට සහාය දක්වන බොහෝ අනුග්‍රාහකයින් නැත.",
    "encryption_certificates": "සහතික",
-    "encryption_certificates_input": "ඔබගේ PEM-කේතාංකනය කළ සහතික පිටපත් කර මෙහි අලවන්න.",
-    "encryption_status": "තත්ත්වය",
+    "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": "සංකේතාංකනය සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර ව.නා.ප. සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
+    "encryption_key_input": "ඔබගේ සහතිකය සඳහා PEM-කේතනය කළ පුද්ගලික යතුර පිටපත් කර මෙහි අලවන්න.",
+    "encryption_enable": "සංකේතනය සබල කරන්න (HTTPS, DNS-over-HTTPS සහ DNS-over-TLS)",
+    "encryption_enable_desc": "සංකේතනය සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර ව.නා.ප. සේවාදායකය DNS-over-HTTPS සහ DNS-over-TLS හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
    "encryption_chain_valid": "සහතික දාමය වලංගු ය",
    "encryption_chain_invalid": "සහතික දාමය වලංගු නොවේ",
    "encryption_key_valid": "මෙය වලංගු {{type}} පුද්ගලික යතුරකි",
@@ -326,26 +330,26 @@
    "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": "මෙය අනාරක්ෂිත කවුළුවකි",
+    "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": "මුරපදය නොගැලපුුුුුුණි",
+    "form_error_password": "මුරපදය නොගැලපුණි",
    "reset_settings": "සැකසුම් යළි පිහිටුවන්න",
-    "update_announcement": "ඇඩ්ගාර්ඩ් හෝම් {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙහි ක්ලික් කරන්න</0>.",
+    "update_announcement": "ඇඩ්ගාර්ඩ් හෝම් {{version}} දැන් ලබා ගත හැකිය! වැඩි විස්තර සඳහා <0>මෙය ඔබන්න</0>.",
    "setup_guide": "පිහිටුවීමේ මාර්ගෝපදේශය",
    "dns_addresses": "ව.නා.ප. ලිපින",
-    "dns_start": "ව.නා.ප. සේවාදායකය ආරම්භ වෙමින් පවතී",
-    "dns_status_error": "ව.නා.ප. සේවාදායකයේ තත්වය පරීක්ෂා කිරීමේදී දෝෂයකි",
-    "down": "පහත",
-    "fix": "නිරාකරණය කරන්න",
+    "dns_start": "ව.නා.ප. සේවාදායකය ආරම්භ වෙමින්",
+    "dns_status_error": "ව.නා.ප. සේවාදායකයේ තත්වය පරීක්‍ෂා කිරීමේදී දෝෂයකි",
+    "down": "බිඳ වැටී",
+    "fix": "නිරාකරණය",
    "dns_providers": "මෙහි තෝරා ගැනීමට <0>දැනුවත් ව.නා.ප. සපයන්නන්ගේ ලැයිස්තුවක්</0> ඇත.",
-    "update_now": "දැන් \tයාවත්කාල කරන්න",
-    "update_failed": "ස්වයංක්‍රීය යාවත්කාල කිරීම අසාර්ථක විය. අතින් යාවත්කාල කිරීමට කරුණාකර <a>පියවර අනුගමනය කරන්න</a>.",
-    "processing_update": "කරුණාකර රැඳී සිටින්න, ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීන වෙමින් පවතී",
-    "clients_title": "අනුග්‍රාහකයන්",
-    "clients_desc": "ඇඩ්ගාර්ඩ් හෝම් වෙත සම්බන්ධ කර ඇති උපාංග වින්‍යාසගත කරන්න",
+    "update_now": "යාවත්කාල කරන්න",
+    "update_failed": "ස්වයං යාවත්කාලය අසමත් විය. අතින් යාවත්කාල කිරීමට කරුණාකර <a>පියවර අනුගමනය කරන්න</a>.",
+    "processing_update": "රැඳී සිටින්න, ඇඩ්ගාර්ඩ් හෝම් යාවත්කාල වෙමින්",
+    "clients_title": "අනුග්‍රාහක",
+    "clients_desc": "ඇඩ්ගාර්ඩ් හෝම් වෙත සම්බන්ධිත උපාංග වින්‍යාසගත කරන්න",
    "settings_global": "ගෝලීය",
    "settings_custom": "අභිරුචි",
    "table_client": "අනුග්‍රාහකය",
@@ -353,68 +357,68 @@
    "save_btn": "සුරකින්න",
    "client_add": "අනුග්‍රාහකයක් එකතු කරන්න",
    "client_new": "නව අනුග්‍රාහකය",
-    "client_edit": "අනුග්‍රාහකය සංස්කරණය කරන්න",
+    "client_edit": "අනුග්‍රාහකය සංස්කරණය",
    "client_identifier": "හඳුන්වනය",
-    "ip_address": "අ.ජා. කෙ. (IP) ලිපිනය",
-    "form_enter_ip": "අ.ජා. කෙ. (IP) ඇතුළත් කරන්න",
-    "form_enter_subnet_ip": "\"{{cidr}}\" අනුජාලයෙහි අ.ජා. කෙ. ලිපිනයක් යොදන්න.",
-    "form_enter_mac": "මා.ප්‍ර.පා. (MAC) ඇතුළත් කරන්න",
-    "form_enter_id": "හඳුන්වනය ඇතුළත් කරන්න",
-    "form_add_id": "හඳුන්වනයක් එක් කරන්න",
-    "form_client_name": "අනුග්‍රාහකයේ නම ඇතුළත් කරන්න",
+    "ip_address": "අ.ජා.කෙ. ලිපිනය",
+    "form_enter_ip": "අ.ජා.කෙ. (IP) ඇතුල් කරන්න",
+    "form_enter_subnet_ip": "\"{{cidr}}\" අනුජාලයෙහි අ.ජා.කෙ. ලිපිනයක් යොදන්න.",
+    "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_deleted": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව ඉවත් කෙරිණි",
+    "client_added": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව එකතු කෙරිණි",
+    "client_updated": "\"{{key}}\" අනුග්‍රාහකය සාර්ථකව යාවත්කාල කෙරිණි",
+    "clients_not_found": "අනුග්‍රාහක හමු නොවිණි",
    "client_confirm_delete": "\"{{key}}\" අනුග්‍රාහකය ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "list_confirm_delete": "මෙම ලැයිස්තුව ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන අනුග්‍රාහකයන්‌ගේ දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නොමැති",
+    "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන අනුග්‍රාහක දත්ත, නමුත් වින්‍යාසය තුළ ගබඩා කර නැති",
    "access_title": "ප්‍රවේශවීමට සැකසුම්",
    "access_desc": "මෙහිදී ඔබට ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය සඳහා ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය.",
-    "access_allowed_title": "අවසර ලත් අනුග්‍රාහකයන්",
+    "access_allowed_title": "ඉඩ ලත් අනුග්‍රාහකයින්",
    "access_allowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අ.ජා. කෙ. ලිපින වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
-    "access_disallowed_title": "අවසර නොලත් අනුග්‍රාහකයන්",
+    "access_disallowed_title": "නොඉඩ ලත් අනුග්‍රාහකයින්",
    "access_disallowed_desc": "CIDR හෝ අ.ජා. කෙ. ලිපින ලැයිස්තුවක් වින්‍යාසගත කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අ.ජා. කෙ. ලිපින වලින් ඉල්ලීම් අත්හරිනු ඇත.",
-    "access_blocked_title": "අවහිර කළ වසම්",
+    "access_blocked_title": "නොඉඩ ලත් වසම්",
    "access_settings_saved": "ප්‍රවේශ වීමේ සැකසුම් සාර්ථකව සුරකින ලදි",
-    "updates_checked": "යාවත්කාලීන කිරීම් සාර්ථකව පරික්ෂා කර ඇත",
+    "updates_checked": "යාවත්කාල සාර්ථකව පරික්‍ෂා කෙරිණි",
    "updates_version_equal": "ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීනයි",
-    "check_updates_now": "යාවත්කාල කිරීම සඳහා දැන් පරීක්ෂා කරන්න",
+    "check_updates_now": "දැන් යාවත්කාල පරීක්‍ෂා කරන්න",
    "dns_privacy": "ව.නා.ප. රහස්‍යතා",
    "setup_dns_privacy_3": "<0>මෙහි ඔබට භාවිතා කළ හැකි මෘදුකාංග ලැයිස්තුවක් ඇත.</0>",
    "setup_dns_privacy_other_title": "වෙනත් ක්‍රියාවට නැංවූ දෑ",
-    "setup_dns_privacy_other_2": "<0>ඩීඑන්එස්ප්‍රොක්සි</0> දන්නා සියලුම ආරක්ෂිත ව.නා.ප. කෙටුම්පත් සඳහා සහය දක්වයි.",
-    "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_privacy_other_2": "<0>ඩීඑන්එස්ප්‍රොක්සි</0> දන්නා සියලුම ආරක්‍ෂිත ව.නා.ප. කෙටුම්පත් සඳහා සහාය දක්වයි.",
+    "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_privacy_other_5": "<0>මෙහි</0> සහ <1>මෙහි</1> තවත් ක්‍රියාවට නැංවූ දෑ ඔබට හමුවනු ඇත.",
    "setup_dns_privacy_ioc_mac": "අයිඕඑස් සහ මැක්ඕඑස් වින්‍යාසය",
-    "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතා කිරීම සඳහා ඇඩ්ගාර්ඩ් හෝම් සැකසුම් තුළ <0>සංකේතාංකනය වින්‍යාසගත</0> කිරීමට අවශ්‍ය වේ.",
-    "rewrite_added": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම සාර්ථකව එකතු කරන ලදි",
+    "setup_dns_notice": "ඔබට <1>DNS-over-HTTPS</1> හෝ <1>DNS-over-TLS</1> භාවිතයට ඇඩ්ගාර්ඩ් හෝම් සැකසුම් තුළ <0>සංකේතනය වින්‍යාසගත</0> කිරීමට ඇවැසිය.",
+    "rewrite_added": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම සාර්ථකව එකතු කෙරිණි",
    "rewrite_add": "ව.නා.ප. නැවත ලිවීමක් එකතු කරන්න",
-    "rewrite_not_found": "ව.නා.ප. නැවත ලිවීම් හමු නොවීය",
+    "rewrite_not_found": "ව.නා.ප. නැවත ලිවීම් හමු නොවිණි",
    "rewrite_confirm_delete": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "rewrite_desc": "විශේෂිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
+    "rewrite_desc": "නිශ්චිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
    "rewrite_applied": "නැවත ලිවීමේ නීතිය යොදා ඇත",
    "rewrite_hosts_applied": "ධාරක ගොනු නීතිය මගින් නැවත ලියා ඇත",
    "dns_rewrites": "ව.නා.ප. නැවත ලිවීම්",
-    "form_answer": "අ.ජා. කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුළත් කරන්න ",
+    "form_answer": "අ.ජා.කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුල් කරන්න ",
    "form_error_domain_format": "වලංගු නොවන වසම් ආකෘතියකි",
-    "form_error_answer_format": "වලංගු නොවන පිළිතුරු ආකෘතියකි",
+    "form_error_answer_format": "වලංගු නොවන උත්තර ආකෘතියකි",
    "configure": "වින්‍යාසගත කරන්න",
    "main_settings": "ප්‍රධාන සැකසුම්",
-    "block_services": "විශේෂිත සේවාවන් අවහිර කරන්න",
-    "blocked_services": "අවහිර කළ සේවාවන්",
-    "blocked_services_desc": "ජනප්‍රිය අඩවි සහ සේවාවන් ඉක්මනින් අවහිර කිරීමට ඉඩ දෙයි.",
-    "blocked_services_saved": "අවහිර කළ සේවාවන් සාර්ථකව සුරකින ලදි",
-    "blocked_services_global": "ගෝලීය අවහිර කළ සේවාවන් භාවිතා කරන්න",
+    "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_path": "සහතික ගොනු‌ව‌ක මාර්ගය සකසන්න",
    "encryption_certificates_source_content": "සහතිකවල අන්තර්ගත අලවන්න",
    "encryption_key_source_path": "පුද්ගලික යතුරක ගොනුවක් සකසන්න",
    "encryption_key_source_content": "පුද්ගලික යතු‌රෙහි අන්තර්ගත අලවන්න",
@@ -422,20 +426,21 @@
    "config_successfully_saved": "වින්‍යාසය සාර්ථකව සුරකින ලදි",
    "interval_6_hour": "පැය 6",
    "interval_24_hour": "පැය 24",
-    "interval_days": "{{count}} දිනය",
-    "interval_days_plural": "දින {{count}}",
+    "interval_days": "දවස් {{count}}",
+    "interval_days_plural": "දවස් {{count}}",
    "domain": "වසම",
-    "answer": "පිළිතුර",
-    "filter_added_successfully": "පෙරහන සාර්ථකව එකතු කරන ලදි",
-    "filter_removed_successfully": "ලැයිස්තුව සාර්ථකව ඉවත් කරන ලදි",
-    "filter_updated": "ලැයිස්තුව සාර්ථකව යාවත්කාලීන කර ඇත",
+    "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": "සංඛ්‍යාලේඛන සාර්ථකව ඉවත් කරන ලදි",
+    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව ඉවත් කෙරිණි",
+    "statistics_enable": "සංඛ්‍යාලේඛන සබල කරන්න",
    "interval_hours": "පැය {{count}}",
    "interval_hours_plural": "පැය {{count}}",
    "filters_configuration": "පෙරහන් වින්‍යාසය",
@@ -443,9 +448,9 @@
    "filters_interval": "පෙරහන් යාවත්කාල කාල පරතරය",
    "disabled": "අබල කර ඇත",
    "username_label": "පරිශීලක නාමය",
-    "username_placeholder": "පරිශීලක නාමය ඇතුළත් කරන්න",
+    "username_placeholder": "පරිශීලක නාමය යොදන්න",
    "password_label": "මුරපදය",
-    "password_placeholder": "මුරපදය ඇතුළත් කරන්න",
+    "password_placeholder": "මුරපදය ඇතුල් කරන්න",
    "sign_in": "පුරන්න",
    "sign_out": "වරන්න",
    "forgot_password": "මුරපදය අමතක වුණා ද?",
@@ -454,87 +459,91 @@
    "orgname": "සංවිධානයේ නම",
    "netname": "ජාල‌යේ  නම",
    "network": "ජාලය",
-    "descr": "විස්තරය",
+    "descr": "සවිස්තරය",
    "whois": "Whois",
    "filtering_rules_learn_more": "ඔබගේ ම ධාරක ලැයිස්තු සෑදීම පිළිබඳව <0>තව දැනගන්න</0>.",
-    "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
-    "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා. කෙ. මගින් අවහිර කර ඇත",
-    "try_again": "නැවත උත්සහා කරන්න",
+    "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා.කෙ. මගින් අවහිර කර ඇත",
+    "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා.කෙ. මගින් අවහිර කර ඇත",
+    "try_again": "යළි උත්සාහය",
    "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
-    "example_rewrite_wildcard": "<0>example.org</0> සහ එහි සියලුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
-    "rewrite_ip_address": "අ.ජා. කෙ. ලිපිනය: මෙම අ.ජා. කෙටුම්පත A හෝ AAAA ප්‍රතිචාරයකට භාවිතා කරන්න",
-    "rewrite_domain_name": "වසම් නාමය: අන්. නා. (CNAME) වාර්තාවක් එක් කරන්න",
-    "disable_ipv6": "IPv6 අබල කරන්න",
-    "disable_ipv6_desc": "මෙම අංගය සක්‍රීය කර ඇත්නම්, IPv6 ලිපින සඳහා වන සියලුම ව.නා.ප. විමසුම් (AAAA වර්ගය) අතහැර දමනු ලැබේ.",
+    "example_rewrite_wildcard": "<0>උදාහරණය.ලංකා</0> සහ එහි සියළුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
+    "rewrite_ip_address": "අ.ජා.කෙ. ලිපිනය: මෙම අ.ජා.කෙ. A හෝ AAAA ප්‍රතිචාරයකට ගන්න",
+    "rewrite_domain_name": "වසම් නාමය: අන්. නාම (CNAME) වාර්තාවක් එක්කරන්න",
+    "disable_ipv6": "අයිපීවී6 ලිපින විසඳීම අබල කරන්න",
+    "disable_ipv6_desc": "අ.ජා.කෙ. අනු.6 ලිපින (AAAA වර්ගය) සඳහා වන සියළුම ව.නා.ප. විමසුම් අතහැර දමයි.",
    "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "fastest_addr_desc": "සියලුම ව.නා.ප. සේවාදායකයන්ගෙන් විමසා සියලු ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා. කෙ. ලිපිනය ලබා දෙයි. සියලුම ව.නා.ප. සේවාදායකයන්ගේ ප්‍රතිචාර සඳහා ඇඩ්ගාර්ඩ් හෝම් රැඳී සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
-    "autofix_warning_text": "ඔබ \"නිරාකරණය කරන්න\" බොත්තම එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතා කිරීමට වින්‍යාසගත කරනු ඇත.",
-    "autofix_warning_result": "ප්‍රතිඵලයක් ලෙස ඔබගේ පද්ධතියෙන් ලැබෙන සියලුම ව.නා.ප. ඉල්ලීම් මූලිකවම ඇඩ්ගාර්ඩ් හෝම් විසින් සකසනු ඇත.",
+    "fastest_addr_desc": "සියළුම ව.නා.ප. සේවාදායක වලින් විමසා සියළු ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා.කෙ. ලිපිනය ලබා දෙයි. සියළුම ව.නා.ප. ප්‍රතිචාර සඳහා ඇඩ්ගාර්ඩ් හෝම් රැඳී සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
+    "autofix_warning_text": "ඔබ \"නිරාකරණය\" යන්න එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතයට වින්‍යාසගත කෙරෙනු ඇත.",
+    "autofix_warning_result": "ප්‍රතිඵලයක් ලෙස ඔබගේ පද්ධතියෙන් ලැබෙන සියළුම ව.නා.ප. ඉල්ලීම් මූලිකවම ඇඩ්ගාර්ඩ් හෝම් විසින් සකසනු ඇත.",
    "tags_title": "හැඳුනුම් සංකේත",
-    "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>වැඩිදුර ඉගෙන ගන්න</0>",
+    "tags_desc": "අනුග්‍රාහකයට අනුරූප වන හැඳුනුම් සංකේත ඔබට තෝරා ගත හැකිය. පෙරහන් නීති වලට හැඳුනුම් සංකේත ඇතුළත් කළ හැකි අතර ඒවා වඩාත් නිවැරදිව යෙදීමට ඔබට ඉඩ සලසයි. <0>තව දැන ගන්න</0>",
    "form_select_tags": "අනුග්‍රාහක හැඳුනුම් සංකේත",
-    "check_title": "පෙරීම පරීක්ෂා කරන්න",
-    "check_desc": "ධාරක නාමය පෙරහන් කර ඇත්දැයි පරීක්ෂා කරන්න",
-    "check": "පරීක්ෂා කරන්න",
-    "form_enter_host": "ධාරක නාමයක් ඇතුළත් කරන්න",
+    "check_title": "පෙරීම පරීක්‍ෂා කරන්න",
+    "check_desc": "ධාරක නාමය පෙරහන් වේ දැයි පරීක්‍ෂා කරන්න",
+    "check": "පරීක්‍ෂාව",
+    "form_enter_host": "ධාරක නාමයක් ඇතුල් කරන්න",
    "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
    "choose_from_list": "ලැයිස්තුවෙන් තෝරන්න",
-    "add_custom_list": "අභිරුචි ලැයිස්තුවක් එකතු කරන්න",
-    "host_whitelisted": "ධාරකය සුදු ලැයිස්තු ගත කර ඇත",
-    "check_ip": "අ.ජා. කෙ. (IP) ලිපින: {{ip}}",
+    "add_custom_list": "අභිරුචි ලැයිස්තුවක් එක්කරන්න",
+    "host_whitelisted": "ධාරකයට ඉඩ දී ඇත",
+    "check_ip": "අ.ජා.කෙ. ලිපින: {{ip}}",
    "check_cname": "අන්. නාමය (CNAME): {{cname}}",
    "check_reason": "හේතුව: {{reason}}",
    "check_service": "සේවාවෙහි නම: {{service}}",
    "service_name": "සේවාවේ නම",
-    "check_not_found": "ඔබගේ පෙරහන් ලැයිස්තු තුළ සොයා ගත නොහැක",
-    "client_confirm_block": "{{ip}} අනුග්‍රාහකය අවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "client_confirm_unblock": "{{ip}} අනුග්‍රාහකය අනවහිර කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කරන ලදි",
-    "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කරන ලදි",
+    "check_not_found": "ඔබගේ පෙරහන් ලැයිස්තු තුළ නැත",
+    "client_confirm_block": "{{ip}} අනුග්‍රාහකය අවහිර කිරීමට ඇවැසි බව ඔබට විශ්වාසද?",
+    "client_confirm_unblock": "{{ip}} අනුග්‍රාහකය අනවහිර කිරීමට ඇවැසි බව ඔබට විශ්වාසද?",
+    "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කෙරිණි",
+    "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කෙරිණි",
    "static_ip": "ස්ථිතික අ.ජා. කෙ. ලිපිනය",
-    "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් අවශ්‍ය වේ. එසේ නොමැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
-    "set_static_ip": "ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනයක් සකසන්න",
+    "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් ඇවැසිය. එසේ නැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
+    "set_static_ip": "ස්ථිතික අ.ජා.කෙ. (IP) ලිපිනයක් සකසන්න",
    "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
-    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා ඇඩ්ගාර්ඩ් හෝම් හට එය ස්වයංක්‍රීයව වින්‍යාසගත කළ නොහැක. කරුණාකර මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
-    "install_static_configure": "ගතික අ.ජා. කෙ. (IP) ලිපිනයක් භාවිතා කරන බව ඇඩ්ගාර්ඩ් හෝම් හඳුනාගෙන ඇත - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
-    "confirm_static_ip": "ඇඩ්ගාර්ඩ් හෝම් ඔබේ ස්ථිතික අ.ජා. කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
-    "list_updated": "{{count}} ලැයිස්තුව යාවත්කාලීන කරන ලදි",
-    "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාලීන කරන ලදි",
-    "all_queries": "සියලුම විමසුම්",
+    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා ඇඩ්ගාර්ඩ් හෝම් හට එය ස්වයංක්‍රීයව වින්‍යාසගත කිරීමට නොහැකිය. මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
+    "install_static_configure": "ගතික අ.ජා.කෙ. (IP) ලිපිනයක් භාවිතා කරන බව ඇඩ්ගාර්ඩ් හෝම් හඳුනාගෙන ඇත - <0>{{ip}}</0>. එය ඔබගේ ස්ථිතික ලිපිනය ලෙස භාවිතා කිරීමට අවශ්‍යද?",
+    "confirm_static_ip": "ඇඩ්ගාර්ඩ් හෝම් ඔබගේ ස්ථිතික අ.ජා.කෙ. (IP) ලිපිනය ලෙස {{ip}} වින්‍යාසගත කරනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍යද?",
+    "list_updated": "ලැයිස්තු {{count}} ක් යාවත්කාල කෙරිණි",
+    "list_updated_plural": "ලැයිස්තු {{count}} ක් යාවත්කාල කෙරිණි",
+    "all_queries": "සියළුම විමසුම්",
    "show_blocked_responses": "අවහිර කර ඇත",
-    "show_whitelisted_responses": "සුදු ලැයිස්තුගත කර ඇත",
+    "show_whitelisted_responses": "ඉඩ දී ඇත",
    "show_processed_responses": "සකසා ඇත",
-    "blocked_safebrowsing": "ආරක්ෂිත සෙවීම මගින් අවහිර කරන ලද",
-    "blocked_adult_websites": "අවහිර කළ වැඩිහිටි වියමන අඩවි",
+    "blocked_safebrowsing": "ආරක්‍ෂිත පිරික්සුම මගින් අවහිර කළ",
+    "blocked_adult_websites": "දෙමාපිය පාලනය මගින් අවහිර කළ",
    "blocked_threats": "අවහිර කළ තර්ජන",
-    "allowed": "අවසර ලත්",
+    "allowed": "ඉඩ දී ඇත",
    "filtered": "පෙරහන් කරන ලද",
    "rewritten": "නැවත ලියන ලද",
-    "safe_search": "ආරක්ෂිත සෙවීම",
+    "safe_search": "ආරක්‍ෂිත සෙවීම",
    "blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුව",
    "milliseconds_abbreviation": "මිලි තත්.",
    "cache_size": "නිහිතයෙහි ප්‍රමාණය",
    "cache_size_desc": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය (බයිට වලින්)",
    "cache_ttl_min_override": "අවම පව. කා. අභිබවන්න",
    "cache_ttl_max_override": "උපරිම පව. කා. අභිබවන්න",
-    "enter_cache_size": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය ඇතුළත් කරන්න (බයිට)",
-    "enter_cache_ttl_min_override": "අවම පව. කා. (TTL) ඇතුළත් කරන්න",
-    "enter_cache_ttl_max_override": "උපරිම පව. කා. (TTL) ඇතුළත් කරන්න",
-    "cache_ttl_max_override_desc": "ව.නා.ප. නිහිතයෙහි ඇති ඇතුළත් කිරීම් සඳහා ඉතා වැඩි පවත්නා කාලයක අගයක් (තත්පර) සකසන්න",
+    "enter_cache_size": "ව.නා.ප. නිහිතයෙහි ප්‍රමාණය යොදන්න (බයිට)",
+    "enter_cache_ttl_min_override": "අවම පව. කා. (TTL) ඇතුල් කරන්න",
+    "enter_cache_ttl_max_override": "උපරිම පව. කා. (TTL) ඇතුල් කරන්න",
+    "cache_ttl_max_override_desc": "ව.නා.ප. නිහිතයෙහි නිවේශිත සඳහා ඉතා වැඩි පවත්නා කාලයක අගයක් (තත්.) සකසන්න",
    "ttl_cache_validation": "නිහිතයෙහි අවම පව. කා. (TTL) අගය උපරිම අගයට වඩා අඩු හෝ සමාන විය යුතුය",
+    "cache_optimistic_desc": "නිවේශිත කල් ඉකුත් වූ විට පවා ඇඩ්ගාර්ඩ් හෝම් ට නිහිතයෙන් ප්‍රතිචාර දැක්වීමට සලස්වයි එමෙන්ම ඒවා නැවත නැවුම් කිරීමට ද උත්සාහ කරයි.",
    "filter_category_general": "පොදු",
-    "filter_category_security": "ආරක්ෂණ",
-    "filter_category_regional": "ප්‍රාදේශ්‍රීය",
+    "filter_category_security": "ආරක්‍ෂණ",
+    "filter_category_regional": "ප්‍රාදේශීය",
    "filter_category_other": "වෙනත්",
    "filter_category_general_desc": "බොහෝ උපාංගවල ලුහුබැඳීම් සහ දැන්වීම් අවහිර කරන ලැයිස්තු",
-    "filter_category_security_desc": "අනිෂ්ට මෘදුකාංග, තතුබෑම් හෝ වංචනික වසම් අවහිර කිරීමට විශේෂ වූ ලැයිස්තු",
-    "filter_category_regional_desc": "ප්‍රාදේශ්‍රීය දැන්වීම් සහ ලුහුබැඳීමේ සේවාදායකයන් කෙරෙහි අවධානය යොමු කරන ලැයිස්තු",
+    "filter_category_security_desc": "ද්වේෂසහගත, තතුබෑම් සහ වංචනික වසම් අවහිර කිරීමට නිර්මාණය කළ ලැයිස්තු",
+    "filter_category_regional_desc": "ප්‍රාදේශීය දැන්වීම් සහ ලුහුබැඳීමේ සේවාදායක කෙරෙහි අවධානය යොමු කරන ලැයිස්තු",
    "filter_category_other_desc": "වෙනත් අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තු",
-    "setup_config_to_enable_dhcp_server": "ග.ධා.වි.කෙ. සේවාදායකය සක්‍රීය කිරීම සඳහා වින්‍යාසය පිහිටුවන්න",
+    "setup_config_to_enable_dhcp_server": "ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට වින්‍යාසය පිහිටුවන්න",
    "original_response": "මුල් ප්‍රතිචාරය",
    "click_to_view_queries": "විමසුම් බැලීමට ඔබන්න",
-    "port_53_faq_link": "53 කවුළුව බොහෝ විට \"DNSStubListener\" හෝ \"systemd-resolved\" සේවාවන් භාවිතයට ගනු ලැබේ. කරුණාකර මෙය විසඳන්නේ කෙසේද යන්න පිළිබඳ <0>මෙම උපදෙස්</0> කියවන්න.",
-    "adg_will_drop_dns_queries": "ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම අනුග්‍රාහකයේ සියලුම ව.නා.ප. විමසුම් අතහැර දමනු ඇත.",
-    "client_not_in_allowed_clients": "\"අවසර ලත් අනුග්‍රාහකයින්\" ලැයිස්තුවේ නොමැති නිසා අනුග්‍රාහකයට අවසර නැත.",
-    "experimental": "පරීක්ෂණාත්මක"
+    "port_53_faq_link": "53 වන කෙවෙනිය බොහෝ විට \"DNSStubListener\" හෝ \"systemd-resolved\" සේවා භාවිතයට ගනු ලැබේ. කරුණාකර මෙය විසඳන්නේ කෙසේද යන්න පිළිබඳ <0>මෙම උපදෙස්</0> කියවන්න.",
+    "adg_will_drop_dns_queries": "ඇඩ්ගාර්ඩ් හෝම් මෙම අනුග්‍රාහකයේ සියළුම ව.නා.ප. විමසුම් අතහැර දමනු ඇත.",
+    "experimental": "පරීක්‍ෂාත්මක",
+    "use_saved_key": "පෙර සුරැකි යතුර භාවිතා කරන්න",
+    "parental_control": "දෙමාපිය පාලනය",
+    "safe_browsing": "ආරක්‍ෂිත පිරික්සුම",
+    "served_from_cache": "{{value}} <i>(නිහිතයෙන් ගැනිණි)</i>"
 }
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Nesprávny formát IPv4",
-    "form_error_mac_format": "Nesprávny MAC formát",
-    "form_error_client_id_format": "Neplatný formát client ID",
+    "form_error_ip4_format": "Neplatná IPv4 adresa",
+    "form_error_ip4_range_start_format": "Neplatný začiatok rozsahu IPv4 formátu",
+    "form_error_ip4_range_end_format": "Neplatný koniec rozsahu IPv4 formátu",
+    "form_error_ip4_gateway_format": "Neplatná IPv4 adresa brány",
+    "form_error_ip6_format": "Neplatná IPv6 adresa",
+    "form_error_ip_format": "Neplatná IP adresa",
+    "form_error_mac_format": "Neplatná MAC adresa",
+    "form_error_client_id_format": "Neplatné ID klienta",
    "form_error_server_name": "Neplatné meno servera",
    "form_error_subnet": "Podsieť \"{{cidr}}\" neobsahuje IP adresu \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Musí byť mimo rozsahu \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Musí byť nižšie ako začiatok rozsahu",
+    "greater_range_start_error": "Musí byť väčšie ako začiatok rozsahu",
+    "greater_range_end_error": "Musí byť väčšie ako koniec rozsahu",
+    "subnet_error": "Adresy musia byť v spoločnej podsieti",
+    "gateway_or_subnet_invalid": "Maska podsiete je neplatná",
    "dhcp_form_gateway_input": "IP brána",
    "dhcp_form_subnet_input": "Maska podsiete",
    "dhcp_form_range_title": "Rozsah IP adries",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Neplatná URL adresa alebo absolútna adresa zoznamu",
    "custom_filter_rules": "Vlastné filtračné pravidlá",
    "custom_filter_rules_hint": "Zadajte na každý riadok jedno pravidlo. Môžete použiť buď adblock pravidlá alebo syntax host súborov.",
+    "system_host_files": "Systémové súbory hosts",
    "examples_title": "Príklady",
    "example_meaning_filter_block": "zablokovať prístup k doméne example.org  a všetkým jej subdoménam",
    "example_meaning_filter_whitelist": "odblokovať prístup k doméne example.org  a všetkým jej subdoménam",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Aktualizované upstream DNS servery",
+    "updated_upstream_dns_toast": "Upstream servery boli úspešne uložené",
    "dns_test_ok_toast": "Špecifikované DNS servery pracujú korektne",
    "dns_test_not_ok_toast": "Server \"{{key}}\": nemohol byť použitý, skontrolujte, či ste ho správne napísali",
    "unblock": "Odblokovať",
@@ -235,7 +243,7 @@
    "loading_table_status": "Načítavam...",
    "page_table_footer_text": "Stránka",
    "rows_table_footer_text": "riadky",
-    "updated_custom_filtering_toast": "Aktualizované vlastné filtračné pravidlá",
+    "updated_custom_filtering_toast": "Vlastné pravidlá boli úspešne uložené",
    "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}}",
    "query_log_response_status": "Stav: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Budete musieť konfigurovať Vaše zariadenia alebo smerovač, aby používali DNS server na nasledujúcich adresách:",
    "install_settings_all_interfaces": "Všetky rozhrania",
    "install_auth_title": "Overenie identity",
-    "install_auth_desc": "Odporúčame Vám nakonfigurovať na administrátorskom webovom rozhraní AdGuard Home overenie Vašej identity heslom. Aj keď je prístupné iba vo Vašej lokálnej sieti, je stále dôležité chrániť ho pred neobmedzeným prístupom.",
+    "install_auth_desc": "Je potrebné nakonfigurovať autentifikáciu heslom do administrátorského webového rozhrania AdGuard Home. Aj keď je AdGuard Home prístupný iba vo Vašej lokálnej sieti, je stále dôležité chrániť ho pred neobmedzeným prístupom.",
    "install_auth_username": "Meno používateľa",
    "install_auth_password": "Heslo",
    "install_auth_confirm": "Potvrdenie hesla",
@@ -326,10 +334,10 @@
    "install_devices_router_list_4": "Na niektorých typoch smerovačov nemôžete nastaviť vlastný DNS server. V takom prípade môže pomôcť, ak nastavíte AdGuard Home ako <0>DHCP server</0>. V opačnom prípade by ste mali vyhľadať príručku, ako prispôsobiť DNS servery konkrétnemu modelu smerovača.",
    "install_devices_windows_list_1": "Otvorte panel Nastavenia cez menu Štart alebo vyhľadávanie Windows.",
    "install_devices_windows_list_2": "Prejdite do kategórie Sieť a internet a potom do Centra sietí a zdieľania.",
-    "install_devices_windows_list_3": "Vyhľadajte položku Zmeniť možnosti adaptéra a kliknite na ňu",
+    "install_devices_windows_list_3": "Na ľavej strane obrazovky nájdite položku \"Zmeniť nastavenia adaptéra\" a kliknite na ňu.",
    "install_devices_windows_list_4": "Zvoľte aktívne pripojený adaptér a pravým klikom otvorte Vlastnosti",
-    "install_devices_windows_list_5": "Vyhľadajte položku Protokol TCP/IPv4, zvoľte ju a dvojklikom otvorte jej vlastnosti.",
-    "install_devices_windows_list_6": "Zvoľte Použiť tieto adresy serverov DNS a zadajte adresy Vašich AdGuard Home serverov.",
+    "install_devices_windows_list_5": "Nájdite v zozname položku \"Internet Protocol verzia 4 (TCP/IPv4)\" (alebo pre IPv6, \"Internet Protocol verzia 6 (TCP/IPv6)\"), vyberte ju a potom znova kliknite na Vlastnosti.",
+    "install_devices_windows_list_6": "Zvoľte \"Použiť nasledujúce adresy DNS servera\" a zadajte adresy domáceho AdGuard servera.",
    "install_devices_macos_list_1": "Kliknite na ikonu Apple a prejdite na položku Systémové predvoľby.",
    "install_devices_macos_list_2": "Kliknite na Sieť.",
    "install_devices_macos_list_3": "Zvoľte prvé pripojenie vo Vašom zozname a kliknite na Pokročilé.",
@@ -499,10 +507,11 @@
    "statistics_configuration": "Konfigurácia štatistiky",
    "statistics_retention": "Štatistika za obdobie",
    "statistics_retention_desc": "Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
-    "statistics_clear": " Vynulovať štatistiku",
+    "statistics_clear": "Vynulovať štatistiku",
    "statistics_clear_confirm": "Naozaj chcete vynulovať štatistiku?",
    "statistics_retention_confirm": "Naozaj chcete zmeniť uchovávanie štatistík? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
    "statistics_cleared": "Štatistika bola úspešne vynulovaná",
+    "statistics_enable": "Zapnúť štatistiku",
    "interval_hours": "{{count}} hodina",
    "interval_hours_plural": "{{count}} hodín",
    "filters_configuration": "Konfigurácia filtrov",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "Obsiahnuté v bielej listine",
    "show_processed_responses": "Spracované",
    "blocked_safebrowsing": "Zablokované modulom Bezpečné prehliadanie",
-    "blocked_adult_websites": "Zablokovaná stránka pre dospelých",
+    "blocked_adult_websites": "Blokované Rodičovskou kontrolou",
    "blocked_threats": "Zablokované hrozby",
    "allowed": "Povolené",
    "filtered": "Filtrované",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Kliknite pre zobrazenie dopytov",
    "port_53_faq_link": "Port 53 je často obsadený službami \"DNSStubListener\" alebo \"systemd-resolved\". Prečítajte si <0>tento návod</0> o tom, ako to vyriešiť.",
    "adg_will_drop_dns_queries": "AdGuard Home zruší všetky DNS dopyty od tohto klienta.",
-    "client_not_in_allowed_clients": "Klient nemá povolenie, pretože sa nenachádza v zozname „Povolení klienti“.",
-    "experimental": "Experimentálne"
+    "filter_allowlist": "UPOZORNENIE: Táto akcia tiež vylúči pravidlo \"\"{{disallowed_rule}}\"\" zo zoznamu povolených klientov.",
+    "last_rule_in_allowlist": "Nemôžete zakázať tohto klienta, pretože vylúčenie pravidla \"{{disallowed_rule}}\" zakáže zoznam \"povolených klientov\".",
+    "experimental": "Experimentálne",
+    "use_saved_key": "Použiť predtým uložený kľúč",
+    "parental_control": "Rodičovská kontrola",
+    "safe_browsing": "Bezpečné prehliadanie",
+    "served_from_cache": "{{value}} <i>(prevzatá z cache pamäte)</i>"
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -36,16 +36,23 @@
    "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",
-    "form_error_ip_format": "Neveljaven format IP",
-    "form_error_mac_format": "Neveljaven MAC format",
-    "form_error_client_id_format": "Neveljaven format ID odjemalca",
+    "form_error_ip4_format": "Neveljaven naslov IPv4",
+    "form_error_ip4_range_start_format": "Neveljaven začetek oblike razpona IPv4",
+    "form_error_ip4_range_end_format": "Neveljaven konec oblike razpona IPv4",
+    "form_error_ip4_gateway_format": "Neveljaven naslov IPv4 prehoda",
+    "form_error_ip6_format": "Neveljaven naslov IPv6",
+    "form_error_ip_format": "Neveljaven naslov IP",
+    "form_error_mac_format": "Neveljaven naslov MAC",
+    "form_error_client_id_format": "Neveljaven ID odjemalca",
    "form_error_server_name": "Neveljavno ime strežnika",
    "form_error_subnet": "Podomrežje \"{{cidr}}\" ne vsebuje naslova IP \"{{ip}}\"",
    "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",
+    "out_of_range_error": "Mora biti izven razpona \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "Mora biti manjši od začetka razpona",
+    "greater_range_start_error": "Mora biti večji od začetka razpona",
+    "greater_range_end_error": "Mora biti večji od konca razpona",
+    "subnet_error": "Naslovi morajo biti v enem podomrežju",
+    "gateway_or_subnet_invalid": "Maska podomrežja ni veljavna",
    "dhcp_form_gateway_input": "IP prehoda",
    "dhcp_form_subnet_input": "Maska podomrežja",
    "dhcp_form_range_title": "Razpon naslovov IP",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "Neveljaven URL ali absolutna pot seznama",
    "custom_filter_rules": "Pravila filtriranja po meri",
    "custom_filter_rules_hint": "V vrstico vnesite eno pravilo. Uporabite lahko pravila zaviranja oglasov ali sintakso gostiteljskih datotek.",
+    "system_host_files": "Sistemske gostiteljske datooteke",
    "examples_title": "Primeri",
    "example_meaning_filter_block": "onemogoči dostop do domene example.org in vseh njenih poddomen",
    "example_meaning_filter_whitelist": "omogoči dostop do domene example.org in vseh njenih poddomen",
@@ -208,7 +216,7 @@
    "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",
-    "updated_upstream_dns_toast": "Posodobljeni Zagonske strežnike DNS",
+    "updated_upstream_dns_toast": "Gorvodni trežniki so uspešno shranjeni",
    "dns_test_ok_toast": "Navedeni strežniki DNS delujejo pravilno",
    "dns_test_not_ok_toast": "Ni mogoče uporabiti: strežnika \"{{key}}\". Preverite, ali ste ga pravilno napisali",
    "unblock": "Omogoči",
@@ -235,7 +243,7 @@
    "loading_table_status": "Nalaganje...",
    "page_table_footer_text": "Stran",
    "rows_table_footer_text": "vrstic",
-    "updated_custom_filtering_toast": "Posodobljena pravila filtriranja po meri",
+    "updated_custom_filtering_toast": "Pravila po meri so uspešno shranjena",
    "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}}",
    "query_log_response_status": "Stanje: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Vaše naprave ali usmerjevalnik boste morali konfigurirati za uporabo strežnika DNS na naslednjih naslovih:",
    "install_settings_all_interfaces": "Vsi vmesniki",
    "install_auth_title": "Preverjanje pristnosti",
-    "install_auth_desc": "Zelo priporočljivo je, da konfigurirate overovitev pristnosti gesla za vaš skrbniški spletni vmesnik AdGuard Home. Tudi če je dostopen v vašem lokalnem omrežju, je še vedno pomembno, da ga zaščitite pred neomejenim dostopom.",
+    "install_auth_desc": "Nastavljeno mora biti preverjanje pristnosti gesla za skrbniški spletni vmesnik AdGuard Home. Tudi če je AdGuard Home dostopen samo v vašem lokalnem omrežju, je še vedno pomembno, da ga zaščitite pred neomejenim dostopom.",
    "install_auth_username": "Uporabniško ime",
    "install_auth_password": "Geslo",
    "install_auth_confirm": "Potrdite geslo",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "Ali ste prepričani, da želite počistiti statistiko?",
    "statistics_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje statistike? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
    "statistics_cleared": "Statistika je bila uspešno počiščena",
+    "statistics_enable": "Omogoči statistiko",
    "interval_hours": "{{count}} ur",
    "interval_hours_plural": "{{count}} ur",
    "filters_configuration": "Nastavitve filtrov",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "Na seznamu dovoljenih",
    "show_processed_responses": "Obdelana",
    "blocked_safebrowsing": "Onemogočeno z 'Varnim brskanjem'",
-    "blocked_adult_websites": "Onemogočeno spletnih strani za odrasle",
+    "blocked_adult_websites": "Onemogočeno s Starševskim nadzorom",
    "blocked_threats": "Onemogočeno groženj",
    "allowed": "Dovoljeno",
    "filtered": "Filtrirano",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "Razširite kratke vrednosti časa v živo (v sekundah), ki jih prejme strežnik za predpomnjenje, ko predpomni odzive DNS",
    "cache_ttl_max_override_desc": "Nastavi največjo vrednost časa v živo (v sekundah) za vnose v predpomnilnik DNS",
    "ttl_cache_validation": "Najmanjša vrednost predpomnilnika TTL mora biti manjša ali enaka največji vrednosti",
-    "cache_optimistic": "Optimistično",
+    "cache_optimistic": "Optimistično predpomnjenje",
    "cache_optimistic_desc": "Poskrbi, da se AdGuard Home odzove iz predpomnilnika, tudi ko vnosi potečejo, in jih tudi poskusi osvežiti.",
    "filter_category_general": "Splošno",
    "filter_category_security": "Varnost",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "Kliknite za prikaz poizvedb",
    "port_53_faq_link": "Vrata 53 pogosto zasedajo storitve 'DNSStubListener' ali 'Sistemsko razrešene storitve'. Preberite <0>to navodilo</0> o tem, kako to rešiti.",
    "adg_will_drop_dns_queries": "AdGuard Home bo izpustil vse poizvedbe DNS iz tega odjemalca.",
-    "client_not_in_allowed_clients": "Odjemalec ni dovoljen, ker ga ni na seznamu \"Dovoljeni odjemalci\".",
-    "experimental": "Eksperimentalno"
+    "filter_allowlist": "OPOZORILO: S to akcijo bo pravilo \"{{disallowed_rule}}\" izključeno s seznama dovoljenih odjemalcev.",
+    "last_rule_in_allowlist": "Tega odjemalca ni mogoče onemogočiti, ker izključitev pravila \"{{disallowed_rule}}\" bo ONEMOGOČILO seznam 'Dovoljeni odjemalci'.",
+    "experimental": "Eksperimentalno",
+    "use_saved_key": "Uporabi prej shranjeni ključ",
+    "parental_control": "Starševski nadzor",
+    "safe_browsing": "Varno brskanje",
+    "served_from_cache": "{{value}} <i>(postreženo iz predpomnilnika)</i>"
 }
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -22,12 +22,10 @@
    "form_error_required": "Obavezno polje",
    "form_error_ip4_format": "Nevažeći IPv4 format",
    "form_error_ip6_format": "Nevažeći IPv6 format",
-    "form_error_ip_format": "Nevažeći IPv4 oblik",
+    "form_error_ip_format": "Pogrešna IP adresa",
    "form_error_mac_format": "Nevažeći MAC format",
    "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",
@@ -171,7 +169,6 @@
    "example_upstream_sdns": "možete koristiti <0>DNS brojeve</0> za <1>DNSCrypt</1> ili <2>DNS-over-HTTPS</2>",
    "example_upstream_tcp": "uobičajeni DNS (preko TCP)",
    "all_lists_up_to_date_toast": "Sve liste su već ažurirane",
-    "updated_upstream_dns_toast": "Ažurirani upstream DNS serveri",
    "dns_test_ok_toast": "Dati DNS serveri rade ispravno",
    "dns_test_not_ok_toast": "Server \"{{key}}\": se ne može koristiti. Proverite da li ste ga ispravno uneli",
    "unblock": "Odblokiraj",
@@ -226,8 +223,10 @@
    "custom_ip": "Prilagođeni IP",
    "blocking_ipv4": "Blokiranje IPv4",
    "blocking_ipv6": "Blokiranje IPv6",
+    "dnscrypt": "DNSCrypt",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
    "download_mobileconfig_doh": "Preuzimanja",
    "download_mobileconfig_dot": "Preuzmi .mobileconfig za DNS-over-TLS",
    "plain_dns": "Plain DNS",
@@ -247,6 +246,7 @@
    "source_label": "Izvor",
    "found_in_known_domain_db": "Pronađeno u poznatim bazama podataka domena.",
    "category_label": "Kategorija",
+    "rule_label": "Pravilo(-a)",
    "list_label": "Lista",
    "unknown_filter": "Nepoznat filter {{filterId}}",
    "known_tracker": "Poznato praćenje",
@@ -429,6 +429,7 @@
    "encryption_key_source_content": "Nalepi sadržaj privatnog ključa",
    "stats_params": "Konfiguracija statistike",
    "config_successfully_saved": "Konfiguracija je uspešno sačuvana",
+    "interval_6_hour": "6 sati",
    "interval_24_hour": "24 časa",
    "interval_days": "{{count}} dan",
    "interval_days_plural": "{{count}} dana",
@@ -518,7 +519,7 @@
    "show_whitelisted_responses": "Na beloj listi",
    "show_processed_responses": "Obrađeno",
    "blocked_safebrowsing": "Blokiralo bezbedno pregledanje",
-    "blocked_adult_websites": "Blokiraj sajtove za odrasle",
+    "blocked_adult_websites": "Blokirala roditeljska kontrola",
    "blocked_threats": "Blokiranih pretnji",
    "allowed": "Dozvoljeno",
    "filtered": "Filtrirano",
@@ -548,6 +549,6 @@
    "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.",
    "adg_will_drop_dns_queries": "AdGuard Home će odbacivati sve DNS unose od ovog klijenta.",
-    "client_not_in_allowed_clients": "Klijent nije dozvoljen zato što se ne nalazi na spisku dozvoljenih klijenata.",
-    "experimental": "Eksperimentalno"
+    "experimental": "Eksperimentalno",
+    "parental_control": "Roditeljska kontrola"
 }
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -2,7 +2,9 @@
    "client_settings": "Klientinställningar",
    "bootstrap_dns": "Bootstrap-DNS-servrar",
    "bootstrap_dns_desc": "Bootstrap-DNS-servrar används för att slå upp DoH/DoT-resolvrarnas IP-adresser som du specificerat som uppström.",
+    "local_ptr_placeholder": "Ange en serveradress per rad",
    "check_dhcp_servers": "Letar efter DHCP-servrar",
+    "save_config": "Spara konfiguration",
    "enabled_dhcp": "DHCP-server aktiverad",
    "disabled_dhcp": "Dhcp-server avaktiverad",
    "dhcp_title": "DHCP-server (experimentell)",
@@ -14,8 +16,8 @@
    "dhcp_static_leases": "Statiska DHCP-leases",
    "dhcp_leases_not_found": "Ingen DHCP-lease hittad",
    "form_error_required": "Obligatoriskt fält",
-    "form_error_ip_format": "Ogiltigt IPv4-format",
-    "form_error_mac_format": "Ogiltigt MAC-format",
+    "form_error_ip_format": "Ogiltig IP-adress",
+    "form_error_mac_format": "Ogiltig MAC-adress",
    "form_error_positive": "Måste vara större än noll",
    "dhcp_form_gateway_input": "Gateway-IP",
    "dhcp_form_subnet_input": "Subnetmask",
@@ -37,14 +39,18 @@
    "delete_confirm": "Är du säker på att du vill ta bort \"{{key}}\"?",
    "form_enter_hostname": "Skriv in värdnamn",
    "error_details": "Felinformation",
+    "request_details": "Förfrågningsdetaljer",
+    "details": "Detaljer",
    "back": "Tiilbaka",
    "dashboard": "Kontrollpanel",
    "settings": "Inställningar",
    "filters": "Filter",
+    "filter": "Filter",
    "query_log": "Förfrågningslogg",
    "faq": "FAQ",
    "version": "version",
    "address": "Adress",
+    "protocol": "Protokoll",
    "on": "PÅ",
    "off": "AV",
    "copyright": "Copyright",
@@ -83,6 +89,7 @@
    "no_servers_specified": "Inga servrar angivna",
    "general_settings": "Allmänna inställningar",
    "dns_settings": "DNS-inställningar",
+    "custom_filtering_rules": "Egna filterregler",
    "encryption_settings": "Krypteringsinställningar",
    "dhcp_settings": "DHCP-inställningar",
    "upstream_dns": "Upstream DNS-servrar",
@@ -102,7 +109,7 @@
    "last_time_updated_table_header": "Uppdaterades senast",
    "actions_table_header": "Åtgärder",
    "edit_table_action": "Redigera",
-    "delete_table_action": "Ta bort",
+    "delete_table_action": "Radera",
    "filters_and_hosts_hint": "AdGuard tillämpar grundläggande annonsblockeringsregler och värdfiltersyntaxer",
    "cancel_btn": "Avbryt",
    "enter_name_hint": "Skriv in namn",
@@ -122,7 +129,6 @@
    "example_upstream_doh": "krypterat <0>DNS-over-HTTPS</0>",
    "example_upstream_sdns": "Du kan använda <0>DNS-stamps</0> för <1>DNSCrypt</1> eller <2>DNS-over-HTTPS</2>-resolvers",
    "example_upstream_tcp": "vanlig DNS (över UDP)",
-    "updated_upstream_dns_toast": "Uppdaterade uppströms-dns-servrar",
    "dns_test_ok_toast": "Angivna DNS servrar fungerar korrekt",
    "dns_test_not_ok_toast": "Server \"{{key}}\": kunde inte användas. Var snäll och kolla att du skrivit in rätt",
    "unblock": "Avblockera",
@@ -157,6 +163,12 @@
    "query_log_disabled": "Förfrågningsloggen är avaktiverad och kan konfigureras i <0>inställningar</0>",
    "query_log_strict_search": "Använd dubbla citattecken för strikt sökning",
    "query_log_retention_confirm": "Är du säker på att du vill ändra förfrågningsloggars retentionstid? Om du minskar intervallet kommer viss data att gå förlorad",
+    "default": "Standard",
+    "custom_ip": "Eget IP",
+    "dnscrypt": "DNSCrypt",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
    "source_label": "Källa",
    "found_in_known_domain_db": "Hittad i domändatabas.",
    "category_label": "Kategori",
@@ -175,7 +187,7 @@
    "install_auth_username": "Användarnamn",
    "install_auth_password": "Lösenord",
    "install_auth_confirm": "Bekräfta lösenord",
-    "install_auth_username_enter": "Skriv in användarnamn",
+    "install_auth_username_enter": "Ange användarnamn",
    "install_auth_password_enter": "Skriv in lösenord",
    "install_step": "Steg",
    "install_devices_title": "Ställ in dina enheter",
@@ -265,6 +277,7 @@
    "form_enter_ip": "Skriv in IP",
    "form_enter_mac": "Skriv in MAC",
    "form_client_name": "Skriv in klientnamn",
+    "name": "Namn",
    "client_global_settings": "Använda globala inställningar",
    "client_deleted": "Klient \"{{key}}\" har raderats",
    "client_added": "Klient \"{{key}}\" har lagts till",
@@ -301,14 +314,18 @@
    "setup_dns_notice": "För att kunna använda <1>DNS-över-HTTPS</1> eller <1>DNS-över-TLS</1>, behöver du <0>konfigurera Kryptering</0> i AdGuard Home-inställningar.",
    "rewrite_added": "DNS-omskrivning för \"{{key}}\" lyckad",
    "rewrite_deleted": "DNS-omskrivning för \"{{key}}\" har tagits bort",
+    "interval_6_hour": "6 timmar",
    "interval_24_hour": "24 timmar",
+    "interval_days": "{{count}} dag",
+    "interval_days_plural": "{{count}} dagar",
    "domain": "Domän",
    "answer": "Svar",
    "statistics_retention_desc": "Om du minskar intervallet kommer viss data att gå förlorad",
-    "statistics_clear": " Rensa statistik",
+    "statistics_clear": "Rensa statistik",
    "statistics_clear_confirm": "Är du säker på att du vill radera statistiken?",
    "statistics_retention_confirm": "Är du säker på att du vill ändra retentionstiden för statistik? Om du minskar intervallet kommer viss data att gå förlorad",
    "statistics_cleared": "Statistiken har rensats",
+    "statistics_enable": "Aktivera statistik",
    "interval_hours": "{{count}} timme",
    "interval_hours_plural": "{{count}} timmar",
    "filters_configuration": "Filterinställningar",
@@ -326,10 +343,21 @@
    "location": "Plats",
    "orgname": "Organisationsnamn",
    "netname": "Nätverksnamn",
+    "network": "Nätverk",
    "descr": "Beskrivning",
    "whois": "Whois",
    "filtering_rules_learn_more": "<0>Mer info</0> om att skapa dina egna blockeringslistor för värdar.",
+    "try_again": "Försök igen",
    "show_blocked_responses": "Blockerade",
-    "blocked_adult_websites": "Blockerade vuxensajter",
-    "blocked_threats": "Blockerade hot"
+    "show_whitelisted_responses": "Vitlistade",
+    "show_processed_responses": "Utförda",
+    "blocked_adult_websites": "Blockerad av Föräldrakontrollen",
+    "blocked_threats": "Blockerade hot",
+    "allowed": "Vitlistade",
+    "safe_search": "Säker surf",
+    "filter_category_general": "General",
+    "filter_category_security": "säkerhet",
+    "filter_category_other": "Övrigt",
+    "use_saved_key": "Använd den tidigare sparade nyckeln",
+    "parental_control": "Föräldrarkontroll"
 }
--- a/client/src/__locales/th.json
+++ b/client/src/__locales/th.json
@@ -20,7 +20,6 @@
    "form_error_mac_format": "รูปแบบ MAC ไม่ถูกต้อง",
    "form_error_client_id_format": "รูปแบบ ID ลูกค้าไม่ถูกต้อง",
    "form_error_positive": "ต้องมากกว่า 0",
-    "form_error_negative": "ต้องเท่ากับ 0 หรือมากกว่า",
    "dhcp_form_gateway_input": "IP ของเกตเวย์",
    "dhcp_form_subnet_input": "ซับเน็ตมาสก์",
    "dhcp_form_range_title": "ช่วงของที่อยู่ IP",
@@ -41,6 +40,7 @@
    "delete_confirm": "คุณแน่ใจหรือว่าต้องการลบ \"{{key}}\"?",
    "form_enter_hostname": "ป้อนชื่อโฮสต์",
    "error_details": "รายละเอียดข้อผิดพลาด",
+    "request_details": "ขอรายละเอียด",
    "back": "กลับ",
    "dashboard": "แผงควบคุม",
    "settings": "การตั้งค่า",
@@ -87,6 +87,7 @@
    "no_servers_specified": "ไม่ได้ระบุเซิร์ฟเวอร์",
    "general_settings": "การตั้งค่าทั่วไป",
    "dns_settings": "การตั้งค่า DNS",
+    "custom_filtering_rules": "กฎการกรองที่กำหนดเอง",
    "encryption_settings": "การตั้งค่าการเข้ารหัส",
    "dhcp_settings": "การตั้งค่า DHCP",
    "upstream_dns": "เซิร์ฟเวอร์ DNS ต้นทาง",
@@ -127,7 +128,6 @@
    "example_upstream_doh": "เข้ารหัส <0>DNS-over-HTTPS</0> แล้ว",
    "example_upstream_sdns": "คุณสามรถใช้ <0>DNS Stamps</0> กับ <1>DNSCrypt</1> หรือ <2>DNS-over-HTTPS</2> ตัวแก้ปัญหา",
    "example_upstream_tcp": "dNS ปกติ (ผ่าน TCP)",
-    "updated_upstream_dns_toast": "อัปเดตเซิร์ฟเวอร์ DNS ต้นทาง",
    "dns_test_ok_toast": "เซิร์ฟเวอร์ DNS ที่ระบุทำงานอย่างถูกต้อง",
    "dns_test_not_ok_toast": "เซิร์ฟเวอร์ \"{{key}}\": ไม่สามารถใช้งานได้ โปรดตรวจสอบว่าคุณเขียนถูกต้อง",
    "unblock": "เลิกปิดกั้น",
@@ -169,6 +169,9 @@
    "custom_ip": "IP กำหนดเอง",
    "blocking_ipv4": "ปิดกั้น IPv4",
    "blocking_ipv6": "ปิดกั้น IPv6",
+    "dnscrypt": "DNSCrypt",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
    "form_enter_rate_limit": "ป้อนขีดจำกัดอัตรา",
    "rate_limit": "จำกัดอัตรา",
    "edns_enable": "เปิดใช้งานซับเน็ตไคลเอ็นต์ EDNS",
@@ -333,6 +336,7 @@
    "encryption_key_source_content": "วางเนื้อหาคีย์ส่วนตัว",
    "stats_params": "การกำหนดค่าสถิติ",
    "config_successfully_saved": "บันทึกการตั้งค่าเรีบยร้อยแล้ว",
+    "interval_6_hour": "6 ชั่วโมง",
    "interval_24_hour": "24 ชั่วโมง",
    "interval_days": "{{count}} วัน",
    "interval_days_plural": "{{count}} วัน",
@@ -383,5 +387,10 @@
    "form_select_tags": "เลือกแท็กเครื่อง",
    "check_title": "ตรวจสอบการกรอง",
    "check_desc": "ตรวจสอบว่าชื่อโฮสต์ถูกกรอง",
-    "form_enter_host": "ป้อนชื่อโฮสต์"
+    "form_enter_host": "ป้อนชื่อโฮสต์",
+    "show_processed_responses": "การประมวลผล",
+    "blocked_adult_websites": "ถูกปิดกั้นโดยการควบคุมของผู้ปกครอง",
+    "safe_search": "ค้นหาอย่างปลอดภัย",
+    "filter_category_other": "อื่น ๆ",
+    "parental_control": "ควบคุมโดยผู้ปกครอง"
 }
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -7,7 +7,7 @@
    "load_balancing": "Yük dengeleme",
    "load_balancing_desc": "Her seferde bir üst sunucuyu sorgulayın. AdGuard Home, sunucuyu seçmek için ağırlıklı rastgele algoritmasını kullanır, böylece en hızlı sunucu daha sık kullanılır.",
    "bootstrap_dns": "DNS Önyükleme sunucuları",
-    "bootstrap_dns_desc": "DNS Önyükleme sunucuları, belirttiğiniz üst sunucuların DoH/DoT çözücülerine ait IP adreslerinin çözülmesi için kullanılır.",
+    "bootstrap_dns_desc": "DNS Önyükleme sunucuları, belirttiğiniz üst sunucuların DoH/DoT çözümleyicilerine ait IP adreslerinin çözümlemek için kullanılır.",
    "local_ptr_title": "Özel ters DNS sunucuları",
    "local_ptr_desc": "AdGuard Home'un yerel PTR sorguları için kullandığı DNS sunucuları. Bu sunucular, rDNS kullanarak \"192.168.12.34\" gibi özel IP adreslerine sahip istemcilerin ana bilgisayar adlarını çözmek için kullanılır. Ayarlanmadığı durumda AdGuard Home, işletim sisteminizin varsayılan DNS çözümleme adreslerini kullanır.",
    "local_ptr_default_resolver": "AdGuard Home, varsayılan olarak aşağıdaki ters DNS çözümleyicilerini kullanır: {{ip}}.",
@@ -36,21 +36,28 @@
    "dhcp_ipv4_settings": "DHCP IPv4 Ayarları",
    "dhcp_ipv6_settings": "DHCP IPv6 Ayarları",
    "form_error_required": "Gerekli alan",
-    "form_error_ip4_format": "Geçersiz IPv4 biçimi",
-    "form_error_ip6_format": "Geçersiz IPv6 biçimi",
-    "form_error_ip_format": "Geçersiz IP biçimi",
-    "form_error_mac_format": "Geçersiz MAC biçimi",
-    "form_error_client_id_format": "Geçersiz istemci kimliği biçimi",
-    "form_error_server_name": "Geçersiz sunucu adı",
+    "form_error_ip4_format": "IPv4 adresi geçersiz",
+    "form_error_ip4_range_start_format": "Başlangıç aralığı IPv4 adresi geçersiz",
+    "form_error_ip4_range_end_format": "Bitiş aralığı IPv4 adresi geçersiz",
+    "form_error_ip4_gateway_format": "Ağ geçidi IPv4 adresi geçersiz",
+    "form_error_ip6_format": "IPv6 adresi geçersiz",
+    "form_error_ip_format": "IP adresi geçersiz",
+    "form_error_mac_format": "MAC adresi geçersiz",
+    "form_error_client_id_format": "İstemci kimliği geçersiz",
+    "form_error_server_name": "Sunucu adı geçersiz",
    "form_error_subnet": "\"{{cidr}}\" alt ağı, \"{{ip}}\" IP adresini içermiyor",
    "form_error_positive": "0'dan büyük olmalıdır",
-    "form_error_negative": "0 veya daha büyük olmalıdır",
-    "range_end_error": "Başlangıç aralığından daha büyük olmalı",
+    "out_of_range_error": "\"{{start}}\"-\"{{end}}\" aralığının dışında olmalıdır",
+    "lower_range_start_error": "Başlangıç aralığından daha düşük olmalıdır",
+    "greater_range_start_error": "Başlangıç aralığından daha büyük olmalıdır",
+    "greater_range_end_error": "Bitiş aralığından daha büyük olmalıdır",
+    "subnet_error": "Adresler bir alt ağda olmalıdır",
+    "gateway_or_subnet_invalid": "Alt ağ maskesi geçersiz",
    "dhcp_form_gateway_input": "Ağ Geçidi IP'si",
    "dhcp_form_subnet_input": "Alt ağ maskesi",
    "dhcp_form_range_title": "IP adresi aralığı",
-    "dhcp_form_range_start": "Aralık başlangıcı",
-    "dhcp_form_range_end": "Aralık sonu",
+    "dhcp_form_range_start": "Başlangıç aralığı",
+    "dhcp_form_range_end": "Bitiş aralığı",
    "dhcp_form_lease_title": "DHCP kira süresi (saniye olarak)",
    "dhcp_form_lease_input": "Kira süresi",
    "dhcp_interface_select": "DHCP arayüzünü seç",
@@ -58,7 +65,7 @@
    "dhcp_ip_addresses": "IP adresleri",
    "ip": "IP",
    "dhcp_table_hostname": "Bilgisayar Adı",
-    "dhcp_table_expires": "Geçerlilik Tarihi",
+    "dhcp_table_expires": "Bitiş tarihi",
    "dhcp_warning": "DHCP sunucusunu yine de etkinleştirmek istiyorsanız, ağınızda başka aktif DHCP sunucusu olmadığından emin olun, aksi takdirde ağa bağlı cihazların İnternet bağlantısı kesilebilir!",
    "dhcp_error": "AdGuard Home, ağda başka bir etkin DHCP sunucusu olup olmadığını belirleyemedi.",
    "dhcp_static_ip_error": "DHCP sunucusunu kullanmak için sabit bir IP adresi ayarlanmalıdır. AdGuard Home, bu ağ arayüzünün sabit bir IP adresi kullanılarak yapılandırılıp yapılandırılmadığını belirleyemedi. Lütfen sabit IP adresini elle ayarlayın.",
@@ -95,19 +102,19 @@
    "protocol": "Protokol",
    "on": "AÇIK",
    "off": "KAPALI",
-    "copyright": "Telif hakkı",
-    "homepage": "Ana sayfa",
+    "copyright": "Telif Hakkı",
+    "homepage": "Ana Sayfa",
    "report_an_issue": "Bir sorun bildir",
-    "privacy_policy": "Gizlilik ilkesi",
+    "privacy_policy": "Gizlilik Politikası",
    "enable_protection": "Korumayı etkinleştir",
    "enabled_protection": "Koruma etkileştirildi",
    "disable_protection": "Korumayı durdur",
    "disabled_protection": "Koruma durduruldu",
    "refresh_statics": "İstatistikleri yenile",
    "dns_query": "DNS Sorguları",
-    "blocked_by": "<0>Filtreler tarafından engellendi</0>",
-    "stats_malware_phishing": "Kötü amaçlı yazılım ve kimlik avı engellendi",
-    "stats_adult": "Yetişkin içerikli site engellendi",
+    "blocked_by": "<0>Filtreler tarafından engellenen</0>",
+    "stats_malware_phishing": "Engellenen kötü amaçlı yazılım ve kimlik avı",
+    "stats_adult": "Engellenen yetişkin içerikli siteler",
    "stats_query_domain": "En fazla sorgulanan alan adları",
    "for_last_24_hours": "son 24 saat içindekiler",
    "for_last_days": "son {{count}} gün boyunca",
@@ -123,43 +130,43 @@
    "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 engelleme listeleri tarafından engellenen DNS isteklerinin sayısı",
+    "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve engel listeleri tarafından engellenen DNS isteklerinin sayısı",
    "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard gezinti koruması modülü tarafından engellenen DNS isteklerinin sayısı",
    "number_of_dns_query_blocked_24_hours_adult": "Engellenen yetişkin içerikli sitelerin sayısı",
    "enforced_save_search": "Uygulanan güvenli arama",
    "number_of_dns_query_to_safe_search": "Güvenli Aramanın uygulandığı 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",
+    "average_processing_time_hint": "Bir DNS isteğinin milisaniye cinsinden ortalama işlem süresi",
    "block_domain_use_filters_and_hosts": "Filtre ve ana bilgisayar listelerini kullanarak alan adlarını engelle",
    "filters_block_toggle_hint": "<a>Filtreler</a> sayfasından engelleme kurallarını ayarlayabilirsiniz.",
    "use_adguard_browsing_sec": "AdGuard gezinti koruması web hizmetini kullan",
    "use_adguard_browsing_sec_hint": "AdGuard Home, alan adının gezinti koruması web hizmeti tarafından engellenip engellenmediğini kontrol eder. Kontrolü gerçekleştirmek için gizlilik dostu arama API'sini kullanır: sunucuya yalnızca SHA256 karma alan adının kısa bir ön eki gönderilir.",
-    "use_adguard_parental": "AdGuard ebeveyn kontrolü web hizmetini kullan",
+    "use_adguard_parental": "AdGuard ebeveyn denetimi web hizmetini kullan",
    "use_adguard_parental_hint": "AdGuard Home, alan adının yetişkin içerik bulundurup bulundurmadığını kontrol eder. Gezinti koruması web hizmeti ile kullandığımız aynı gizlilik dostu API'yi kullanır.",
    "enforce_safe_search": "Güvenli aramayı kullan",
    "enforce_save_search_hint": "AdGuard Home, şu arama motorlarında güvenli aramayı uygular: Google, YouTube, Bing, DuckDuckGo, Yandex ve Pixabay.",
    "no_servers_specified": "Sunucu belirtilmedi",
    "general_settings": "Genel ayarlar",
    "dns_settings": "DNS ayarları",
-    "dns_blocklists": "DNS engelleme listeleri",
+    "dns_blocklists": "DNS engel listeleri",
    "dns_allowlists": "DNS izin listeleri",
-    "dns_blocklists_desc": "AdGuard Home, engelleme listeleriyle eşleşen alan adlarını engeller.",
-    "dns_allowlists_desc": "DNS izin listesindeki alan adlarına, engelleme listesinde olsa bile izin verilir.",
+    "dns_blocklists_desc": "AdGuard Home, engel listeleriyle eşleşen alan adlarını engeller.",
+    "dns_allowlists_desc": "DNS izin listesindeki alan adlarına, engel listesinde olsa 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_configured_in_file": "{{path}} içinde yapılandırıldı",
+    "upstream_dns_configured_in_file": "{{path}} dosyasında yapılandırıldı",
    "test_upstream_btn": "Üst sunucuyu test et",
    "upstreams": "Üst kaynak",
    "apply_btn": "Uygula",
    "disabled_filtering_toast": "Filtreleme devre dışı",
    "enabled_filtering_toast": "Filtreleme etkin",
-    "disabled_safe_browsing_toast": "Güvenli gezinti devre dışı",
-    "enabled_safe_browsing_toast": "Güvenli gezinti etkin",
-    "disabled_parental_toast": "Ebeveyn kontrolü devre dışı",
-    "enabled_parental_toast": "Ebeveyn kontrolü etkin",
+    "disabled_safe_browsing_toast": "Güvenli Gezinti devre dışı bırakıldı",
+    "enabled_safe_browsing_toast": "Güvenli Gezinti etkinleştirildi",
+    "disabled_parental_toast": "Ebeveyn denetimi devre dışı",
+    "enabled_parental_toast": "Ebeveyn denetimi etkin",
    "disabled_safe_search_toast": "Güvenli arama devre dışı",
    "enabled_save_search_toast": "Güvenli arama etkin",
    "enabled_table_header": "Etkin",
@@ -173,26 +180,27 @@
    "delete_table_action": "Sil",
    "elapsed": "Geçen zaman",
    "filters_and_hosts_hint": "AdGuard Home, temel reklam engelleme kurallarını ve ana bilgisayar engelleme dosyalarının söz dizimini anlar.",
-    "no_blocklist_added": "Engelleme listesi eklenmedi",
+    "no_blocklist_added": "Engel listesi eklenmedi",
    "no_whitelist_added": "İzin listesi eklenmedi",
-    "add_blocklist": "Engelleme listesi ekle",
+    "add_blocklist": "Engel listesi ekle",
    "add_allowlist": "İzin listesi ekle",
    "cancel_btn": "İptal",
    "enter_name_hint": "İsim girin",
    "enter_url_or_path_hint": "Listenin URL adresini veya dosya konumunu girin",
    "check_updates_btn": "Güncellemeleri denetle",
-    "new_blocklist": "Yeni engelleme listesi",
+    "new_blocklist": "Yeni engel listesi",
    "new_allowlist": "Yeni izin listesi",
-    "edit_blocklist": "Engelleme listesini düzenle",
+    "edit_blocklist": "Engel listesini düzenle",
    "edit_allowlist": "İzin listesini düzenle",
-    "choose_blocklist": "Engelleme listelerini seçin",
+    "choose_blocklist": "Engel listelerini seçin",
    "choose_allowlist": "İzin listelerini seçin",
-    "enter_valid_blocklist": "Engelleme listesine geçerli bir URL girin.",
+    "enter_valid_blocklist": "Engel listesine geçerli bir URL girin.",
    "enter_valid_allowlist": "İzin listesine geçerli bir URL girin.",
-    "form_error_url_format": "Geçersiz URL biçimi",
+    "form_error_url_format": "URL biçimi geçersiz",
    "form_error_url_or_path_format": "Listenin URL adresi veya dosya konumu geçersiz",
    "custom_filter_rules": "Özel filtreleme kuralları",
    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklam engelleme kuralı veya ana bilgisayar dosyası söz dizimi kullanabilirsiniz.",
+    "system_host_files": "Sistem ana bilgisayar dosyaları",
    "examples_title": "Örnekler",
    "example_meaning_filter_block": "example.org alan adına ve tüm alt alan adlarına olan erişimi engeller",
    "example_meaning_filter_whitelist": "example.org alan adına ve tüm alt alan adlarına olan erişim engelini kaldırır",
@@ -208,7 +216,7 @@
    "example_upstream_sdns": "<1>DNSCrypt</1> veya <2>DNS-over-HTTPS</2> çözümleyicileri için <0>DNS Damgaları</0> kullanabilirsiniz",
    "example_upstream_tcp": "normal DNS (TCP üzerinden)",
    "all_lists_up_to_date_toast": "Tüm listeler güncel durumda",
-    "updated_upstream_dns_toast": "Üst DNS sunucuları güncellendi",
+    "updated_upstream_dns_toast": "Üst sunucular başarıyla kaydedildi",
    "dns_test_ok_toast": "Belirtilen DNS sunucuları düzgün çalışıyor",
    "dns_test_not_ok_toast": "Sunucu \"{{key}}\": kullanılamıyor, lütfen doğru yazdığınızdan emin olun",
    "unblock": "Engeli kaldır",
@@ -235,7 +243,7 @@
    "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",
+    "updated_custom_filtering_toast": "Özel kurallar başarıyla kaydedildi",
    "rule_removed_from_custom_filtering_toast": "Özel filtreleme kurallarından kaldırıldı: {{rule}}",
    "rule_added_to_custom_filtering_toast": "Özel filtreleme kurallarına eklendi: {{rule}}",
    "query_log_response_status": "Durum: {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "Cihazlarınızı veya yönlendiricinizi şu adresteki DNS sunucusunu kullanması için ayarlamanız gerekecek:",
    "install_settings_all_interfaces": "Tüm arayüzler",
    "install_auth_title": "Kimlik Doğrulama",
-    "install_auth_desc": "AdGuard Home yönetici web arayüzüne erişim için kullanıcı adı ve şifre yapılandırmanız önemle tavsiye edilir. Yalnızca yerel ağınızdan erişilebilir olsa bile izinsiz erişimden korumak yine de önemlidir.",
+    "install_auth_desc": "AdGuard Home yönetim web arayüzü için şifre doğrulaması yapılandırılmalıdır. AdGuard Home'a yalnızca yerel ağınızdan erişilebilir olsa bile, onu sınırsız erişimden korumak yine de önemlidir.",
    "install_auth_username": "Kullanıcı adı",
    "install_auth_password": "Parola",
    "install_auth_confirm": "Parolayı onayla",
@@ -316,7 +324,7 @@
    "install_devices_title": "Cihazlarınızı yapılandırın",
    "install_devices_desc": "AdGuard Home'u kullanmaya başlamak için, cihazlarınızı onu kullanacak şekilde yapılandırmanız gerekir.",
    "install_submit_title": "Tebrikler!",
-    "install_submit_desc": "Kurulum işlemi tamamlandı ve artık AdGuard Home'u kullanmaya hazırsınız.",
+    "install_submit_desc": "Yükleme işlemi tamamlandı ve artık AdGuard Home'u kullanmaya hazırsınız.",
    "install_devices_router": "Yönlendirici",
    "install_devices_router_desc": "Bu kurulum, ev yönlendiricinize bağlı tüm cihazları otomatik olarak kapsar ve her birini elle yapılandırmanıza gerek yoktur.",
    "install_devices_address": "AdGuard Home DNS sunucusu şu adresi dinleyecektir",
@@ -352,7 +360,7 @@
    "encryption_config_saved": "Şifreleme yapılandırması kaydedildi",
    "encryption_server": "Sunucu adı",
    "encryption_server_enter": "Alan adınızı girin",
-    "encryption_server_desc": "HTTPS kullanmak için SSL sertifikanızla veya Willcard sertifikanızla eşleşen sunucu adını girmeniz gerekir. Bu alan ayarlanmazsa, herhangi bir alan adının TLS bağlantılarını kabul eder.",
+    "encryption_server_desc": "HTTPS kullanmak için SSL sertifikanızla veya joker sertifikanızla eşleşen sunucu adını girmeniz gerekir. Bu alan ayarlanmazsa, herhangi bir alan adının TLS bağlantılarını kabul eder.",
    "encryption_redirect": "Otomatik olarak HTTPS'e yönlendir",
    "encryption_redirect_desc": "Etkinleştirirseniz, AdGuard Home sizi HTTP adresi yerine HTTPS adresine yönlendirir.",
    "encryption_https": "HTTPS bağlantı noktası",
@@ -362,7 +370,7 @@
    "encryption_doq": "DNS-over-QUIC bağlantı noktası",
    "encryption_doq_desc": "Bu bağlantı noktası yapılandırılırsa, AdGuard Home, DNS-over-QUIC sunucusunu bu bağlantı noktası üzerinden çalıştıracaktır. Bu özellik deneme aşamasındadır ve güvenilir olmayabilir. Ayrıca, şu anda bu özelliği destekleyen çok fazla istemci yok.",
    "encryption_certificates": "Sertifikalar",
-    "encryption_certificates_desc": "Şifrelemeyi kullanmak için alan adınız için geçerli bir SSL sertifika zinciri sağlamanız gerekir. <0>{{link}}</0> adresinden ücretsiz bir sertifika alabilir veya güvenilir Sertifika Yetkililerinden satın alabilirsiniz.",
+    "encryption_certificates_desc": "Şifrelemeyi kullanmak için alan adınıza geçerli bir SSL sertifika zinciri sağlamanız gerekir. <0>{{link}}</0> adresinden ücretsiz bir sertifika alabilir veya güvenilir Sertifika Yetkililerinden satın alabilirsiniz.",
    "encryption_certificates_input": "PEM biçimindeki sertifikalarınızı kopyalayıp buraya yapıştırın.",
    "encryption_status": "Durum",
    "encryption_expire": "Bitiş tarihi",
@@ -466,8 +474,8 @@
    "dns_rewrites": "DNS yeniden yazımları",
    "form_domain": "Alan adı veya joker karakter girin",
    "form_answer": "IP adresi veya alan adı girin",
-    "form_error_domain_format": "Geçersiz alan adı biçimi",
-    "form_error_answer_format": "Geçersiz yanıt biçimi",
+    "form_error_domain_format": "Alan adı biçimi geçersiz",
+    "form_error_answer_format": "Yanıt biçimi geçersiz",
    "configure": "Yapılandır",
    "main_settings": "Ana ayarlar",
    "block_services": "Belirli hizmetleri engelle",
@@ -476,7 +484,7 @@
    "blocked_services_saved": "Engellenen hizmetler başarıyla kaydedildi",
    "blocked_services_global": "Genel olarak engellenen hizmetleri kullan",
    "blocked_service": "Engellenen hizmet",
-    "block_all": "Hepsini engelle",
+    "block_all": "Tümünü engelle",
    "unblock_all": "Tüm engellemeyi kaldır",
    "encryption_certificate_path": "Sertifika yolu",
    "encryption_private_key_path": "Özel anahtar yolu",
@@ -501,13 +509,14 @@
    "statistics_retention_desc": "Zaman değerini azaltırsanız, bazı veriler kaybolacaktır",
    "statistics_clear": " İstatistikleri temizle",
    "statistics_clear_confirm": "İstatistikleri temizlemek istediğinizden emin misiniz?",
-    "statistics_retention_confirm": "İstatistik saklama süresini değiştirmek istediğinizden emin misiniz? Zaman değerini azaltırsanız, bazı veriler kaybolacaktır",
+    "statistics_retention_confirm": "İstatistik saklama süresini değiştirmek istediğinizden emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
    "statistics_cleared": "İstatistikler başarıyla temizlendi",
+    "statistics_enable": "İstatistikleri etkinleştir",
    "interval_hours": "{{count}} saat",
    "interval_hours_plural": "{{count}} saat",
    "filters_configuration": "Filtre yapılandırması",
    "filters_enable": "Filtreleri etkinleştir",
-    "filters_interval": "Filtreleri güncelleme sıklığı",
+    "filters_interval": "Filtre güncelleme sıklığı",
    "disabled": "Devre dışı",
    "username_label": "Kullanıcı adı",
    "username_placeholder": "Kullanıcı adını girin",
@@ -575,29 +584,29 @@
    "dnssec_enable_desc": "Giden DNS sorguları için DNSSEC özelliğini etkinleştir ve sonucu kontrol et (DNSSEC özellikli çözümleyici gerekli).",
    "validated_with_dnssec": "DNSSEC ile doğrulandı",
    "all_queries": "Tüm sorgular",
-    "show_blocked_responses": "Engellendi",
-    "show_whitelisted_responses": "İzin verildi",
-    "show_processed_responses": "İşlendi",
-    "blocked_safebrowsing": "Güvenli gezinti tarafından engellendi",
-    "blocked_adult_websites": "Yetişkin içerikli site engellendi",
-    "blocked_threats": "Engellenen Tehditler",
+    "show_blocked_responses": "Engellenen",
+    "show_whitelisted_responses": "İzin verilen",
+    "show_processed_responses": "İşlenen",
+    "blocked_safebrowsing": "Güvenli Gezinti tarafından engellendi",
+    "blocked_adult_websites": "Ebeveyn Denetimi tarafından engellendi",
+    "blocked_threats": "Engellenen tehditler",
    "allowed": "İzin verilen",
    "filtered": "Filtrelenen",
    "rewritten": "Yeniden yazılan",
    "safe_search": "Güvenli arama",
-    "blocklist": "Engelleme listesi",
+    "blocklist": "Engel listesi",
    "milliseconds_abbreviation": "ms",
    "cache_size": "Önbellek boyutu",
    "cache_size_desc": "DNS önbellek boyutu (bayt cinsinden)",
-    "cache_ttl_min_override": "Minimum TTL'yi değiştir",
-    "cache_ttl_max_override": "Maksimum TTL'yi değiştir",
+    "cache_ttl_min_override": "Minimum TTL'i değiştir",
+    "cache_ttl_max_override": "Maksimum TTL'i değiştir",
    "enter_cache_size": "Önbellek boyutunu girin (bayt)",
    "enter_cache_ttl_min_override": "Minimum TTL değerini girin (saniye)",
    "enter_cache_ttl_max_override": "Maksimum TTL değerini girin (saniye)",
    "cache_ttl_min_override_desc": "DNS yanıtlarını önbelleğe alırken üst sunucudan alınan kullanım süresi değerini uzatın (saniye olarak)",
    "cache_ttl_max_override_desc": "DNS önbelleğindeki girişler için maksimum kullanım süresi değerini ayarlayın (saniye olarak)",
    "ttl_cache_validation": "Minimum önbellek TTL değeri, maksimum değerden küçük veya bu değere eşit olmalıdır",
-    "cache_optimistic": "İyimser",
+    "cache_optimistic": "İyimser önbelleğe alma",
    "cache_optimistic_desc": "Girişlerin süresi dolduğunda bile AdGuard Home'un önbellekten yanıt vermesini sağlayın ve bunları yenilemeye çalışın.",
    "filter_category_general": "Genel",
    "filter_category_security": "Güvenlik",
@@ -606,12 +615,16 @@
    "filter_category_general_desc": "Çoğu cihazda izlemeyi ve reklamları engelleyen listeler",
    "filter_category_security_desc": "Kötü amaçlı, kimlik avı ve dolandırıcılık alan adlarını engellemek için özel olarak tasarlanmış listeler",
    "filter_category_regional_desc": "Bölgesel reklamlara ve izleme sunucularına odaklanan listeler",
-    "filter_category_other_desc": "Diğer engelleme listeleri",
+    "filter_category_other_desc": "Diğer engel listeleri",
    "setup_config_to_enable_dhcp_server": "DHCP sunucusunu etkinleştirmek için kurulum yapılandırması",
    "original_response": "Gerçek yanıt",
    "click_to_view_queries": "Sorguları görmek için tıklayın",
    "port_53_faq_link": "53 numaralı bağlantı noktası genellikle \"DNSStubListener\" veya \"systemd-resolved\" hizmetleri tarafından kullanılır. Lütfen bu sorunun 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ı yok sayar.",
-    "client_not_in_allowed_clients": "\"İzin verilen istemciler\" listesinde olmadığı için istemciye izin verilmiyor.",
-    "experimental": "Deneysel"
+    "filter_allowlist": "UYARI: Bu işlem ayrıca \"{{disallowed_rule}}\" kuralını izin verilen istemciler listesinden hariç tutacaktır.",
+    "last_rule_in_allowlist": "\"{{disallowed_rule}}\" kuralı hariç tutulduğunda \"İzin verilen istemciler\" listesi DEVRE DIŞI bırakılacağı için bu istemciye izin verilemez.",
+    "experimental": "Deneysel",
+    "use_saved_key": "Önceden kaydedilmiş anahtarı kullan",
+    "parental_control": "Ebeveyn Denetimi",
+    "safe_browsing": "Güvenli Gezinti"
 }
--- a/client/src/__locales/uk.json
+++ b/client/src/__locales/uk.json
@@ -0,0 +1,631 @@
+{
+    "client_settings": "Налаштування клієнта",
+    "example_upstream_reserved": "Ви можете вказати DNS-сервер <0>для певних доменів</0>",
+    "example_upstream_comment": "Ви можете вказати коментар",
+    "upstream_parallel": "Використовувати паралельні запити, щоб пришвидшити вирішення одночасною чергою всіх оригінальних серверів.",
+    "parallel_requests": "Паралельні запити",
+    "load_balancing": "Балансування навантаження",
+    "load_balancing_desc": "Запитувати один сервер за раз. AdGuard Home використовуватиме зважений випадковий алгоритм для вибору сервера, щоб найшвидший сервер використовувався частіше.",
+    "bootstrap_dns": "Bootstrap DNS-сервери",
+    "bootstrap_dns_desc": "Bootstrap DNS-сервери використовуються для пошуку IP-адреси DoH/DoT серверів, які ви встановили.",
+    "local_ptr_title": "Приватні сервери для зворотного DNS",
+    "local_ptr_desc": "DNS-сервери, які AdGuard Home використовує для локальних PTR-запитів. Ці сервери, використовуючи rDNS, використовуються для отримання доменних імен клієнтів у приватних мережах, наприклад, «192.168.12.34». Якщо список порожній, буде використовуватись системний DNS-сервер.",
+    "local_ptr_default_resolver": "AdGuard Home усталено використовує такі зворотні DNS-резолвери: {{ip}}.",
+    "local_ptr_no_default_resolver": "AdGuard Home не зміг визначити приватні реверсивні DNS-резолвери, що були б придатними для цієї системи.",
+    "local_ptr_placeholder": "Вводьте одну адресу на рядок",
+    "resolve_clients_title": "Увімкнути запитування доменних імен для IP-адрес клієнтів",
+    "resolve_clients_desc": "Визначати доменні імена клієнтів за допомогою PTR-запитів до відповідних серверів — приватних DNS-серверів для локальних клієнтів та upstream-серверів для клієнтів з публічними IP-адресами.",
+    "use_private_ptr_resolvers_title": "Використовувати приватні зворотні DNS-резолвери",
+    "use_private_ptr_resolvers_desc": "Надсилати зворотні DNS-запити до вказаних серверів для клієнтів, що обслуговуються локально. Якщо вимкнено, AdGuard Home буде відповідати NXDOMAIN на всі такі PTR-запити, окрім запитів про клієнтів, що уже відомі по DHCP, /etc/hosts тощо.",
+    "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-сервера в мережі. Однак, ми радимо вам ще раз перевірити вручну, тому що наш автоматичний тест наразі не дає 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_ip4_range_start_format": "Неправильна IPv4-адреса для початку діапазону",
+    "form_error_ip4_range_end_format": "Неправильна IPv4-адреса для кінця діапазону",
+    "form_error_ip4_gateway_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_server_name": "Неправильна назва сервера",
+    "form_error_subnet": "Підмережа «{{cidr}}» не містить IP-адресу «{{ip}}»",
+    "form_error_positive": "Повинно бути більше 0",
+    "out_of_range_error": "Не повинна бути в діапазоні «{{start}}»−«{{end}}»",
+    "lower_range_start_error": "Має бути меншим за початкову адресу",
+    "greater_range_start_error": "Має бути більшим за початкову адресу",
+    "greater_range_end_error": "Має бути більшим за кінцеву адресу",
+    "subnet_error": "Адреси повинні бути в одній підмережі",
+    "gateway_or_subnet_invalid": "Неправильна маска підмережі",
+    "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-адреси. Встановіть статичну IP-адресу вручну.",
+    "dhcp_dynamic_ip_found": "Ваша система використовує конфігурацію з динамічною IP-адресою для інтерфейсу <0>{{interfaceName}}</0>. Для використання DHCP-сервера необхідно встановити статичну IP-адресу. Ваша поточна IP-адреса <0>{{ipAddress}}</0>. Ми автоматично встановимо цю IP-адресу як статичну, якщо ви натиснете кнопку «Увімкнути 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_leases": "Скинути всі аренди",
+    "dhcp_reset_leases_confirm": "Ви дійсно хочете скинути усі аренди?",
+    "dhcp_reset_leases_success": "Аренди DHCP успішно скинуто",
+    "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": "за останній день",
+    "for_last_days_plural": "за останні {{count}} днів",
+    "stats_disabled": "Статистику вимкнено. Ви можете увімкнути її на <0>сторінці налаштувань</0>.",
+    "stats_disabled_short": "Статистику вимкнено",
+    "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-запитів, заблокованих фільтрами і списками блокування hosts",
+    "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": "Блокувати домени з використанням фільтрів та hosts-файлів",
+    "filters_block_toggle_hint": "Ви можете налаштувати правила блокування в розділі <a>Фільтри</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 перевірятиме, чи домен містить матеріали для дорослих. Він використовує той самий орієнтований на приватність 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-серверів.",
+    "upstream_dns_configured_in_file": "Налаштовано в {{path}}",
+    "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.",
+    "system_host_files": "Системні 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": "блокує доступ до доменів, що відповідають вказаному звичайному виразу",
+    "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}}»: неможливо використати. Перевірте правильність введення",
+    "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": "Назва домену",
+    "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",
+    "refused": "REFUSED",
+    "null_ip": "Нульовий IP",
+    "custom_ip": "Власний IP",
+    "blocking_ipv4": "Блокування IPv4",
+    "blocking_ipv6": "Блокування IPv6",
+    "dnscrypt": "DNSCrypt",
+    "dns_over_https": "DNS-over-HTTPS",
+    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
+    "client_id": "Ідентифікатор клієнта",
+    "client_id_placeholder": "Введіть ідентифікатор клієнта",
+    "client_id_desc": "Різні клієнти можуть бути розпізнані завдяки спеціальному ідентифікатору. <a>Докладніше про ідентифікацію клієнтів</a>.",
+    "download_mobileconfig_doh": "Завантажити .mobileconfig для DNS-over-HTTPS",
+    "download_mobileconfig_dot": "Завантажити .mobileconfig для DNS-over-TLS",
+    "download_mobileconfig": "Завантажити файл конфігурації",
+    "plain_dns": "Звичайний DNS",
+    "form_enter_rate_limit": "Уведіть обмеження швидкості",
+    "rate_limit": "Обмеження швидкості",
+    "edns_enable": "Увімкнути відправку EDNS Client Subnet",
+    "edns_cs_desc": "Надсилати підмережі клієнтів на DNS-сервери.",
+    "rate_limit_desc": "Кількість запитів в секунду, які може робити один клієнт. Встановлене значення «0» означатиме необмежену кількість.",
+    "blocking_ipv4_desc": "IP-адреса, яку потрібно видати для заблокованого A запиту",
+    "blocking_ipv6_desc": "IP-адреса, яку потрібно видати для заблокованого АААА запиту",
+    "blocking_mode_default": "Усталено: відповідь із нульовою IP-адресою (0.0.0.0 для A; :: для AAAA), якщо заблоковано правилом у Adblock-стилі; відповідь зазначеною у правилі IP-адресою, якщо заблокувано правилом у hosts-стилі",
+    "blocking_mode_refused": "ВІДМОВЛЕНО: Відповісти з кодом ВІДМОВЛЕНО",
+    "blocking_mode_nxdomain": "NXDOMAIN: Відповісти з кодом NXDOMAIN",
+    "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. Навіть якщо він доступний лише у вашій локальній мережі, важливо захистити його від необмеженого доступу.\n\nДолжна быть настроена аутентификация паролем для веб-интерфейса 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": "Відкрийте налаштування маршрутизатора. Зазвичай ви можете отримати до нього доступ із браузера за допомогою URL-адреси, наприклад, http://192.168.0.1/ або http://192.168.1.1/. Можливо, треба буде ввести пароль. Якщо ви його не знаєте, часто можна скинути пароль, натиснувши кнопку на самому маршрутизаторі. Для деяких маршрутизаторів потрібна спеціальна програма, яка в такому випадку повинна бути вже встановлена на вашому комп’ютері чи телефоні.",
+    "install_devices_router_list_2": "Знайдіть налаштування DHCP/DNS. Шукайте літери DNS поруч із полем, в яке можна ввести два або три набори чисел, кожен з яких розбитий на чотири групи від однієї до трьох цифр.",
+    "install_devices_router_list_3": "Введіть туди адреси вашого домашнього сервера AdGuard.",
+    "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": "Знайдіть у списку пункт «Internet Protocol Version 4 (TCP/IPv4)» або «Internet Protocol Version 6 (TCP/IPv6)», виберіть його та натисніть кнопку Властивості ще раз.",
+    "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": "На головному екрані меню Android торкніться Налаштування.",
+    "install_devices_android_list_2": "У меню торкніться Wi-Fi. З'явиться екран із переліком усіх доступних мереж (неможливо встановити власний DNS для мобільного з'єднання).",
+    "install_devices_android_list_3": "Довго натисніть на мережу, до якої ви приєднані, та торкніться «Змінити мережу».",
+    "install_devices_android_list_4": "На деяких пристроях вам може знадобитися встановити прапорець Додатково, щоб побачити подальші налаштування. Щоб відредагувати налаштування DNS для Android, вам потрібно буде переключити налаштування IP з DHCP на статичні.",
+    "install_devices_android_list_5": "Змініть встановлені значення DNS 1 і DNS 2 на адреси вашого домашнього сервера AdGuard.",
+    "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-сертифікату або сертифікату з підтримкою піддоменів. Якщо значення не вказано, то сервер буде приймати TLS-з'єднання для будь-якого домену.",
+    "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_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 сертифікати.",
+    "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-адресами або ж за спеціальним клієнтським ідентифікатором (можливий для DoT, DoH та DoQ). <0>Докладніше про ідентифікацію клієнтів</0>.",
+    "form_enter_ip": "Введіть IP",
+    "form_enter_subnet_ip": "Введіть IP-адресу в підмережі «{{cidr}}»",
+    "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": "Клієнти (поза налаштуванням)",
+    "auto_clients_desc": "Дані про клієнтів, які використовують AdGuard Home, але не зберігаються в конфігурації",
+    "access_title": "Налаштування доступу",
+    "access_desc": "Тут ви можете налаштувати правила доступу для DNS-сервера AdGuard Home.",
+    "access_allowed_title": "Дозволені клієнти",
+    "access_allowed_desc": "Перелік CIDR-, IP-адрес та клієнтських ідентифікаторів. Якщо налаштовано, AdGuard Home прийматиме запити лише від цих клієнтів.",
+    "access_disallowed_title": "Заборонені клієнти",
+    "access_disallowed_desc": "Перелік CIDR-, IP-адрес та клієнтських ідентифікаторів. Якщо налаштовано, AdGuard Home буде скасовувати запити від цих клієнтів. Проте якщо налаштовано список дозволених клієнтів, то це поле проігнорується.",
+    "access_blocked_title": "Заборонені домени",
+    "access_blocked_desc": "Не плутайте з фільтрами. AdGuard Home буде ігнорувати DNS-запити з цими доменами, такі запити навіть не будуть записані до журналу. Ви можете вказати точні доменні імена, замінні знаки та правила фільтрування URL-адрес, наприклад, '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>Ось перелік програмного забезпечення, яке можете використати.</0>",
+    "setup_dns_privacy_4": "На пристрої iOS 14 або macOS Big Sur ви можете завантажити спеціальний файл .mobileconfig, який додасть до налаштувань DNS сервери <highlight>DNS-over-HTTPS</highlight> або <highlight>DNS-over-TLS</highlight>.",
+    "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 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_privacy_ioc_mac": "Конфігурація для iOS та macOS",
+    "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_6_hour": "6 годин",
+    "interval_24_hour": "24 години",
+    "interval_days": "{{count}} день",
+    "interval_days_plural": "{{count}} дні(в)",
+    "domain": "Домен",
+    "punycode": "Punycode",
+    "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": "Статистика успішно очищена",
+    "statistics_enable": "Увімкнути статистику",
+    "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>.",
+    "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-адресу у відповіді 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": "Ігнорувати DNS-запити для IPv6-адрес (тип AAAA).",
+    "fastest_addr": "Найшвидша IP-адреса",
+    "fastest_addr_desc": "Опитати всі DNS-сервери й повернути найшвидшу IP-адресу серед усіх наданих. Це сповільнить швидкість DNS-запитів, оскільки AdGuard Home повинен буде чекати відповіді усіх 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 (перезапустить сервіс systemd-resolved)</0>",
+    "autofix_warning_result": "В результаті буде усталено, що усі DNS-запити вашої системи будуть опрацьовані AdGuard Home.",
+    "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_service": "Назва сервісу: {{service}}",
+    "service_name": "Назва сервісу",
+    "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": "AdGuard Home виявив, що використовується динамічна 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": "Заблоковано Безпечним переглядом",
+    "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": "Розширити короткі значення time-to-live (секунди) отримані від основного сервера під час кешування відповідей DNS",
+    "cache_ttl_max_override_desc": "Встановіть максимальне значення time-to-live (секунди) для записів у кеші DNS",
+    "ttl_cache_validation": "Мінімальне значення TTL кеш-пам'яті має бути меншим або рівним максимальному значенню",
+    "cache_optimistic": "Оптимістичне кешування",
+    "cache_optimistic_desc": "AdGuard Home буде відповідати з кешу, навіть якщо відповіді в ньому застарілі, а також спробує оновити їх.",
+    "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>.",
+    "adg_will_drop_dns_queries": "AdGuard Home буде видаляти всі запити DNS із цього клієнта.",
+    "filter_allowlist": "ПОПЕРЕДЖЕННЯ: Таким чином ви також виключите правило «{{disallowed_rule}}» зі списку дозволених клієнтів.",
+    "last_rule_in_allowlist": "Неможливо заблокувати цього клієнта, тому що правило «{{disallowed_rule}}» ВИМКНЕ режим списку дозволів.",
+    "experimental": "Експериментальний",
+    "use_saved_key": "Використати раніше збережений ключ",
+    "parental_control": "Батьківський контроль",
+    "safe_browsing": "Безпечний перегляд",
+    "served_from_cache": "{{value}} <i>(отримано з кешу)</i>"
+}
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -8,10 +8,15 @@
    "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.",
+    "local_ptr_title": "Máy chủ DNS riêng tư",
    "local_ptr_desc": "Máy chủ DNS hoặc các máy chủ mà AdGuard Home sẽ sử dụng cho các truy vấn về tài nguyên được phân phối cục bộ. Ví dụ: máy chủ này sẽ được sử dụng để phân giải tên máy khách của máy khách cho các máy khách có địa chỉ IP riêng. Nếu không được cài đặt, AdGuard Home sẽ tự động sử dụng trình phân giải DNS mặc định của bạn.",
+    "local_ptr_default_resolver": "Theo mặc định, AdGuard Home sử dụng các hệ thống phân giải tên miền ngược sau: {{ip}}.",
+    "local_ptr_no_default_resolver": "AdGuard Home không thể xác định hệ thống phân giải tên miền ngược riêng phù hợp cho hệ thống này.",
    "local_ptr_placeholder": "Nhập một địa chỉ máy chủ trên mỗi dòng",
    "resolve_clients_title": "Kích hoạt cho phép phân giải ngược về địa chỉ IP của máy khách",
    "resolve_clients_desc": "Nếu được bật, AdGuard Home sẽ cố gắng phân giải ngược lại địa chỉ IP của khách hàng thành tên máy chủ của họ bằng cách gửi các truy vấn PTR tới trình phân giải tương ứng (máy chủ DNS riêng cho máy khách cục bộ, máy chủ ngược dòng cho máy khách có địa chỉ IP công cộng).",
+    "use_private_ptr_resolvers_title": "Sử dụng trình rDNS riêng tư",
+    "use_private_ptr_resolvers_desc": "Thực hiện tra cứu ngược DNS cho các địa chỉ được phân phối cục bộ bằng cách sử dụng các máy chủ nguồn. Nếu bị vô hiệu hóa, AdGuard Home sẽ phản hồi với NXDOMAIN cho tất cả các yêu cầu PTR ngoại trừ các ứng dụng khách được biết đến bởi DHCP, / etc / hosts, v. v.",
    "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",
@@ -33,14 +38,12 @@
    "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ệ",
-    "form_error_ip_format": "Định dạng IPv4 không hợp lệ",
+    "form_error_ip_format": "Địa chỉ IP không hợp lệ",
    "form_error_mac_format": "Định dạng MAC không hợp lệ",
    "form_error_client_id_format": "Định dạng client ID không hợp lệ",
    "form_error_server_name": "Tên máy chủ không hợp lệ",
    "form_error_subnet": "Mạng con \"{{cidr}}\" không chứa địa chỉ IP \"{{ip}}\"",
    "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",
@@ -63,6 +66,9 @@
    "dhcp_new_static_lease": "Cho thuê tĩnh mới",
    "dhcp_static_leases_not_found": "Không tìm thấy DHCP cho thuê tĩnh",
    "dhcp_add_static_lease": "Thêm thuê tĩnh",
+    "dhcp_reset_leases": "Đặt lại tất cả các hợp đồng thuê",
+    "dhcp_reset_leases_confirm": "Bạn có chắc chắn muốn đặt lại tất cả các hợp đồng thuê không?",
+    "dhcp_reset_leases_success": "DHCP cho thuê đã đặt lại thành công",
    "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ố",
@@ -104,6 +110,8 @@
    "for_last_24_hours": "trong 24 giờ qua",
    "for_last_days": "trong {{count}} ngày qua",
    "for_last_days_plural": "trong {{count}} ngày qua",
+    "stats_disabled": "Số liệu thống kê đã bị vô hiệu hóa. Bạn có thể bật nó từ <0> trang cài đặt </0>.",
+    "stats_disabled_short": "Số liệu thống kê đã bị vô hiệu hóa",
    "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",
@@ -198,7 +206,7 @@
    "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",
+    "updated_upstream_dns_toast": "Các máy chủ thượng nguồn đã được lưu thành công",
    "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",
@@ -225,7 +233,7 @@
    "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",
+    "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}}",
    "rule_added_to_custom_filtering_toast": "Quy tắc đã được thêm vào quy tắc lọc tuỳ chỉnh: {{rule}}",
    "query_log_response_status": "Trạng thái: {{value}}",
@@ -306,7 +314,9 @@
    "install_devices_title": "Định cấu hình thiết bị của bạn",
    "install_devices_desc": "Để bắt đầu sử dụng AdGuard Home, bạn cần định cấu hình thiết bị của mình để sử dụng nó.",
    "install_submit_title": "Xin chúc mừng!",
+    "install_submit_desc": "Quy trình thiết lập đã kết thúc và bạn đã sẵn sàng bắt đầu sử dụng AdGuard Home.",
    "install_devices_router": "Bộ định tuyến",
+    "install_devices_router_desc": "Thiết lập này sẽ tự động bao gồm tất cả các thiết bị được kết nối với bộ định tuyến gia đình của bạn và bạn sẽ không cần phải định cấu hình từng thiết bị theo cách thủ công.",
    "install_devices_address": "Máy chủ DNS của AdGuard Home đang lắng nghe các địa chỉ sau",
    "install_devices_router_list_1": "Mở 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, chẳng hạn như http://192.168.0.1/ hoặc http://192.168.1.1/. Bạn có thể được nhắc nhập mật khẩu. Nếu bạn không nhớ nó, bạn có thể đặt lại mật khẩu bằng cách nhấn nút khởi động lại trên chính bộ định tuyến, nhưng lưu ý rằng nếu khởi động lại, bạn có thể sẽ mất toàn bộ cấu hình bộ định tuyến. Một số bộ định tuyến sẽ yêu cầu đăng nhập từ một ứng dụng cụ thể đã được cài đặt trên máy tính hoặc đ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ố.",
@@ -326,6 +336,7 @@
    "install_devices_android_list_2": "Nhấp Wi-Fi trên trình đơn. Màn hình liệt kê tất cả các mạng khả dụng sẽ được hiển thị (không thể đặt DNS tùy chỉnh cho kết nối di động).",
    "install_devices_android_list_3": "Nhấn và giữ mạng mà bạn đã kết nối và chạm Sửa Đổi Mạng.",
    "install_devices_android_list_4": "Trên một số thiết bị, bạn có thể cần chọn hộp Nâng cao để xem thêm cài đặt. Để điều chỉnh cài đặt DNS Android của bạn, bạn sẽ cần chuyển cài đặt IP từ DHCP sang Tĩnh.",
+    "install_devices_android_list_5": "Thay đổi giá trị DNS 1 và DNS 2 thành địa chỉ máy chủ AdGuard Home của bạn.",
    "install_devices_ios_list_1": "Từ màn hình chính, chạm Cài đặt.",
    "install_devices_ios_list_2": "Chọn Wi-Fi trong trình đơn bên trái (không thể định cấu hình DNS cho mạng di động).",
    "install_devices_ios_list_3": "Chạm vào tên của mạng hiện đang hoạt động.",
@@ -395,6 +406,7 @@
    "client_edit": "Chỉnh Sửa Máy Khách",
    "client_identifier": "Định danh",
    "ip_address": "Địa chỉ IP",
+    "client_identifier_desc": "Các máy khách có thể được xác định bằng địa chỉ IP, CIDR, địa chỉ MAC hoặc một ID khách đặc biệt(có thể được dùng cho DoT/DoH/DoQ). Xem thêm cách xác định máy khách tại <0>đây</0>.",
    "form_enter_ip": "Nhập IP",
    "form_enter_subnet_ip": "Nhập địa chỉ IP vào mạng con \"{{cidr}}\"",
    "form_enter_mac": "Nhập MAC",
@@ -418,6 +430,7 @@
    "access_disallowed_title": "Máy chủ không được phép",
    "access_disallowed_desc": "Một danh sách các địa chỉ CIDR hoặc IP. Nếu được định cấu hình, AdGuard Home sẽ bỏ yêu cầu từ các địa chỉ IP này.",
    "access_blocked_title": "Tên miền bị chặn",
+    "access_blocked_desc": "Đừng nhầm lẫn điều này với các bộ lọc. AdGuard Home sẽ bỏ các truy vấn DNS với các tên miền này trong câu hỏi của truy vấn.",
    "access_settings_saved": "Cài đặt truy cập đã lưu thành công",
    "updates_checked": "Đã kiểm tra thành công cập nhật",
    "updates_version_equal": "AdGuard Home đã được cập nhật",
@@ -471,10 +484,12 @@
    "encryption_key_source_content": "Dán nội dung khóa riêng",
    "stats_params": "Cấu hình thống kê",
    "config_successfully_saved": "Cấu hình được lưu thành công",
+    "interval_6_hour": "6 tiếng",
    "interval_24_hour": "24 giờ",
    "interval_days": "{{count}} ngày",
    "interval_days_plural": "{{count}} ngày",
    "domain": "Tên miền",
+    "punycode": "Punycode",
    "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",
@@ -482,10 +497,11 @@
    "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",
-    "statistics_clear": " Xoá thống kê",
+    "statistics_clear": "Xoá thống kê",
    "statistics_clear_confirm": "Bạn có chắc chắn muốn xóa số liệu thống kê?",
    "statistics_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ số liệu thống kê? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
    "statistics_cleared": "Xoá thống kê thành công",
+    "statistics_enable": "Bật thống kê",
    "interval_hours": "{{count}} giờ",
    "interval_hours_plural": "{{count}} giờ",
    "filters_configuration": "Cấu hình bộ lọc",
@@ -520,6 +536,7 @@
    "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.",
@@ -561,7 +578,7 @@
    "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_adult_websites": "Bị chặn bởi Quản lý của Phụ huynh",
    "blocked_threats": "Mối nguy hiểm đã chặn",
    "allowed": "Được phép",
    "filtered": "Đã lọc",
@@ -584,6 +601,7 @@
    "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",
@@ -591,6 +609,8 @@
    "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.",
    "adg_will_drop_dns_queries": "AdGuard Home sẽ loại bỏ tất cả các truy vấn DNS từ ứng dụng khách này.",
-    "client_not_in_allowed_clients": "Ứng dụng khách không được phép vì nó không có trong danh sách \"Ứng dụng khách được phép\".",
-    "experimental": "Thử nghiệm"
+    "filter_allowlist": "CẢNH BÁO: Hành động này cũng sẽ loại trừ quy tắc \"{{disallowed_rule}}\" khỏi danh sách các ứng dụng khách được phép.",
+    "last_rule_in_allowlist": "Không thể không cho phép ứng dụng khách này vì việc loại trừ quy tắc \"{{disallowed_rule}}\" sẽ TẮT danh sách \"Ứng dụng khách được phép\".",
+    "experimental": "Thử nghiệm",
+    "parental_control": "Quản lý của phụ huynh"
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -36,16 +36,23 @@
    "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_ip4_format": "无效的 IPv4 地址",
+    "form_error_ip4_range_start_format": "范围起始值的 IPv4 地址无效",
+    "form_error_ip4_range_end_format": "范围终值的 IPv4 地址无效",
+    "form_error_ip4_gateway_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_server_name": "无效的服务器名",
    "form_error_subnet": "子网 \"{{cidr}}\" 不包含 IP 地址 \"{{ip}}\"",
    "form_error_positive": "必须大于 0",
-    "form_error_negative": "必须大于等于 0",
-    "range_end_error": "必须大于范围起始值",
+    "out_of_range_error": "必定超出了范围 \"{{start}}\"-\"{{end}}\"",
+    "lower_range_start_error": "必须小于范围起始值",
+    "greater_range_start_error": "必须大于范围起始值",
+    "greater_range_end_error": "必须大于范围终值",
+    "subnet_error": "地址必须在一个子网内",
+    "gateway_or_subnet_invalid": "子网掩码无效",
    "dhcp_form_gateway_input": "网关 IP",
    "dhcp_form_subnet_input": "子网掩码",
    "dhcp_form_range_title": "IP 地址范围",
@@ -98,7 +105,7 @@
    "copyright": "版权",
    "homepage": "主页",
    "report_an_issue": "问题反馈",
-    "privacy_policy": "隐私策略",
+    "privacy_policy": "隐私政策",
    "enable_protection": "启用保护",
    "enabled_protection": "保护已启用",
    "disable_protection": "禁用保护",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "无效的URL或列表的绝对路径",
    "custom_filter_rules": "自定义过滤器规则",
    "custom_filter_rules_hint": "请确保每行只输入一条规则。你可以输入符合 adblock 语法或 Hosts 语法的规则。",
+    "system_host_files": "系统主机文件",
    "examples_title": "范例",
    "example_meaning_filter_block": "拦截 example.org 域名及其所有子域名",
    "example_meaning_filter_whitelist": "放行 example.org 及其所有子域名",
@@ -208,7 +216,7 @@
    "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": "所有列表都是最新的",
-    "updated_upstream_dns_toast": "上游 DNS 已更新",
+    "updated_upstream_dns_toast": "上游服务器保存成功",
    "dns_test_ok_toast": "指定的 DNS 服务器现已正常运行",
    "dns_test_not_ok_toast": "服务器 \"{{key}}\"：无法使用，请检查你输入的是否正确",
    "unblock": "放行",
@@ -235,7 +243,7 @@
    "loading_table_status": "加载中……",
    "page_table_footer_text": "页",
    "rows_table_footer_text": "行",
-    "updated_custom_filtering_toast": "自定义过滤规则已更新",
+    "updated_custom_filtering_toast": "自定义规则保存成功",
    "rule_removed_from_custom_filtering_toast": "规则已从自定义过滤规则列表中移除 {{rule}}",
    "rule_added_to_custom_filtering_toast": "规则已添加到自定义过滤规则列表中 {{rule}}",
    "query_log_response_status": "状态： {{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "您将需要使用以下地址来设置您的设备或路由器的 DNS 服务器：",
    "install_settings_all_interfaces": "所有接口",
    "install_auth_title": "身份认证",
-    "install_auth_desc": "我们强烈建议您为 AdGuard Home 的网页管理界面配置密码。即使该页面只能通过您的本地网络访问，但避免它被不加限制地访问仍十分重要。",
+    "install_auth_desc": "您需要对 AdGuard Home 的网页管理界面配置密码认证。即使该 AdGuard Home 只能通过您的本地网络访问，避免 AdGuard Home 被不受限制地访问依旧十分重要。",
    "install_auth_username": "用户名",
    "install_auth_password": "密码",
    "install_auth_confirm": "确认密码",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "您确定要清除统计数据？",
    "statistics_retention_confirm": "您确定要更改统计记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
    "statistics_cleared": "统计数据已成功清除",
+    "statistics_enable": "启用统计数据",
    "interval_hours": "{{count}} 小时",
    "interval_hours_plural": "{{count}} 小时",
    "filters_configuration": "过滤器配置",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "已列入白名单",
    "show_processed_responses": "已处理",
    "blocked_safebrowsing": "被安全浏览阻止",
-    "blocked_adult_websites": "拦截的成人网站",
+    "blocked_adult_websites": "已由家长控制拦截",
    "blocked_threats": "拦截的威胁",
    "allowed": "允许项",
    "filtered": "已过滤",
@@ -597,7 +606,7 @@
    "cache_ttl_min_override_desc": "缓存 DNS 响应时，延长从上游服务器接收到的 TTL 值 (秒)",
    "cache_ttl_max_override_desc": "设定 DNS 缓存条目的最大 TTL 值（秒）",
    "ttl_cache_validation": "最小缓存TTL值必须小于或等于最大值",
-    "cache_optimistic": "优化的",
+    "cache_optimistic": "乐观缓存",
    "cache_optimistic_desc": "即使条目已过期，也让 AdGuard Home 从缓存中响应，并尝试刷新它们。",
    "filter_category_general": "常规",
    "filter_category_security": "安全",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "点击查看查询",
    "port_53_faq_link": "53端口常被DNSStubListener或systemdn解析的服务占用。请阅读<0>这份关于如何解决这一问题的说明</0>",
    "adg_will_drop_dns_queries": "AdGuard Home 会终止所有来自此客户端的DNS查询。",
-    "client_not_in_allowed_clients": "此客户端不被允许，因为它不在“允许的客户端”列表中。",
-    "experimental": "实验性的"
+    "filter_allowlist": "警告：此操作将把规则 \"{{disallowed_rule}}\" 排除在允许客户端的列表之外。",
+    "last_rule_in_allowlist": "无法禁止此客户端，因为排除 “{{disallowed_rule}}” 规则将禁用“允许客户端”的列表。",
+    "experimental": "实验性的",
+    "use_saved_key": "使用之前保存的密钥",
+    "parental_control": "家长控制",
+    "safe_browsing": "安全浏览",
+    "served_from_cache": "{{value}}<i>(由缓存提供)</i>"
 }
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -38,14 +38,12 @@
    "form_error_required": "必要欄位",
    "form_error_ip4_format": "無效的 IPv4 格式",
    "form_error_ip6_format": "無效的 IPv6 格式",
-    "form_error_ip_format": "無效的 IP 格式",
+    "form_error_ip_format": "無效的 IP 位址",
    "form_error_mac_format": "無效的 「MAC 位址」格式",
    "form_error_client_id_format": "無效的「客戶端 ID」格式",
    "form_error_server_name": "無效伺服器名稱",
    "form_error_subnet": "子網路 \"{{cidr}}\" 不包含 IP 位址 \"{{ip}}\"",
    "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 位址範圍",
@@ -208,7 +206,6 @@
    "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": "DNS 設定中的 \"{{key}}\" 出現錯誤，請確認是否正確輸入",
    "unblock": "解除封鎖",
@@ -612,6 +609,5 @@
    "click_to_view_queries": "按一下以檢視查詢結果",
    "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。",
-    "client_not_in_allowed_clients": "此用戶端不被允許，它不在\"允許的用戶端\"列表中。",
    "experimental": "實驗性"
 }
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -36,16 +36,23 @@
    "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_ip4_format": "無效的 IPv4 位址",
+    "form_error_ip4_range_start_format": "無效起始範圍的 IPv4 位址",
+    "form_error_ip4_range_end_format": "無效結束範圍的 IPv4 位址",
+    "form_error_ip4_gateway_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_server_name": "無效的伺服器名稱",
    "form_error_subnet": "子網路 \"{{cidr}}\" 不包含該 IP 位址 \"{{ip}}\"",
    "form_error_positive": "必須大於 0",
-    "form_error_negative": "必須等於或大於 0",
-    "range_end_error": "必須大於起始範圍",
+    "out_of_range_error": "必須在\"{{start}}\"-\"{{end}}\"範圍之外",
+    "lower_range_start_error": "必須低於起始範圍",
+    "greater_range_start_error": "必須大於起始範圍",
+    "greater_range_end_error": "必須大於結束範圍",
+    "subnet_error": "位址必須在子網路中",
+    "gateway_or_subnet_invalid": "無效的子網路遮罩",
    "dhcp_form_gateway_input": "閘道 IP",
    "dhcp_form_subnet_input": "子網路遮罩",
    "dhcp_form_range_title": "IP 位址範圍",
@@ -134,7 +141,7 @@
    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設置封鎖規則。",
    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查該網域是否被瀏覽安全網路服務封鎖。它將使用友好的隱私查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到該伺服器。",
-    "use_adguard_parental": "使用 AdGuard 家長監控之網路服務",
+    "use_adguard_parental": "使用 AdGuard 家長控制之網路服務",
    "use_adguard_parental_hint": "AdGuard Home 將檢查網域是否包含成人資料。它使用如同瀏覽安全網路服務一樣之友好的隱私應用程式介面（API）。",
    "enforce_safe_search": "使用安全搜尋",
    "enforce_save_search_hint": "AdGuard Home 將在下列的搜尋引擎：Google、YouTube、Bing、DuckDuckGo、Yandex 和 Pixabay 中強制執行安全搜尋。",
@@ -158,8 +165,8 @@
    "enabled_filtering_toast": "已啟用過濾",
    "disabled_safe_browsing_toast": "已禁用安全瀏覽",
    "enabled_safe_browsing_toast": "已啟用安全瀏覽",
-    "disabled_parental_toast": "已禁用家長監控",
-    "enabled_parental_toast": "已啟用家長監控",
+    "disabled_parental_toast": "已禁用家長控制",
+    "enabled_parental_toast": "已啟用家長控制",
    "disabled_safe_search_toast": "已禁用安全搜尋",
    "enabled_save_search_toast": "已啟用安全搜尋",
    "enabled_table_header": "已啟用",
@@ -193,6 +200,7 @@
    "form_error_url_or_path_format": "該清單之網址或絕對的路徑為無效的",
    "custom_filter_rules": "自訂的過濾規則",
    "custom_filter_rules_hint": "於一行上輸入一項規則。您可使用廣告封鎖規則或主機檔案語法。",
+    "system_host_files": "系統主機檔案",
    "examples_title": "範例",
    "example_meaning_filter_block": "封鎖至 example.org 網域及其所有的子網域之存取",
    "example_meaning_filter_whitelist": "解除封鎖至 example.org 網域及其所有的子網域之存取",
@@ -208,15 +216,15 @@
    "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": "所有的清單已是最新的",
-    "updated_upstream_dns_toast": "已更新上游的 DNS 伺服器",
+    "updated_upstream_dns_toast": "上游的伺服器被成功地儲存",
    "dns_test_ok_toast": "已明確指定的 DNS 伺服器正在正確地運作",
    "dns_test_not_ok_toast": "伺服器 \"{{key}}\"：無法被使用，請檢查您已正確地填寫它",
    "unblock": "解除封鎖",
    "block": "封鎖",
    "disallow_this_client": "不允許此用戶端",
    "allow_this_client": "允許此用戶端",
-    "block_for_this_client_only": "僅封鎖此用戶端",
-    "unblock_for_this_client_only": "僅解除封鎖此用戶端",
+    "block_for_this_client_only": "僅對此用戶端封鎖",
+    "unblock_for_this_client_only": "僅對此用戶端解除封鎖",
    "time_table_header": "時間",
    "date": "日期",
    "domain_name_table_header": "域名",
@@ -235,7 +243,7 @@
    "loading_table_status": "正在載入…",
    "page_table_footer_text": "頁面",
    "rows_table_footer_text": "列",
-    "updated_custom_filtering_toast": "已更新自訂的過濾規則",
+    "updated_custom_filtering_toast": "自訂的規則被成功地儲存",
    "rule_removed_from_custom_filtering_toast": "從自訂的過濾規則中被移除的規則：{{rule}}",
    "rule_added_to_custom_filtering_toast": "被加至自訂的過濾規則中的規則：{{rule}}",
    "query_log_response_status": "狀態：{{value}}",
@@ -306,7 +314,7 @@
    "install_settings_dns_desc": "您將需要配置您的裝置或路由器以使用於下列的位址上之 DNS 伺服器：",
    "install_settings_all_interfaces": "所有的介面",
    "install_auth_title": "驗證",
-    "install_auth_desc": "配置屬於您的 AdGuard Home 管理員網路介面之密碼驗證是被非常建議的。即使它僅在您的區域網路中為可存取的，保護它免於不受限制的存取為仍然重要的。",
+    "install_auth_desc": "往您的 AdGuard Home 管理員網路介面之密碼驗證必須被配置。即使 AdGuard Home 僅在您的區域網路中為可存取的，保護它免於不受限制的存取為仍然重要的。",
    "install_auth_username": "使用者名稱",
    "install_auth_password": "密碼",
    "install_auth_confirm": "確認密碼",
@@ -320,7 +328,7 @@
    "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/，從您的瀏覽器中存取它。您可能被提醒輸入密碼。如果您不記得它，您經常可透過按壓於該路由器本身上的按鈕來重置密碼，但請明白如果此步驟被選擇，您將可能失去整個路由器配置。如果您的路由器需要應用程式去設置它，請於您的手機或個人電腦上安裝該應用程式，並使用它來存取該路由器的設定。",
+    "install_devices_router_list_1": "開啟用於您的路由器之偏好設定。通常，您可透過網址，諸如 http://192.168.0.1/ 或 http://192.168.1.1/，從您的瀏覽器中存取它。您可能被提醒去輸入密碼。如果您不記得它，您經常可透過按壓於該路由器本身上的按鈕來重置密碼，但請明白如果此步驟被選擇，您將可能失去整個路由器配置。如果您的路由器需要應用程式去設置它，請於您的手機或個人電腦上安裝該應用程式，並使用它來存取該路由器的設定。",
    "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 伺服器之路由器用法說明。",
@@ -503,6 +511,7 @@
    "statistics_clear_confirm": "您確定您想要清除統計資料嗎？",
    "statistics_retention_confirm": "您確定您想要更改統計資料保留嗎？如果您減少該間隔值，某些資料將被丟失",
    "statistics_cleared": "統計資料被成功地清除",
+    "statistics_enable": "啟用統計資料",
    "interval_hours": "{{count}} 小時",
    "interval_hours_plural": "{{count}} 小時",
    "filters_configuration": "過濾器配置",
@@ -528,7 +537,7 @@
    "blocked_by_cname_or_ip": "被正規名稱（CNAME）或 IP 封鎖",
    "try_again": "再次嘗試",
    "domain_desc": "輸入您想要被改寫的域名或萬用字元（wildcard）。",
-    "example_rewrite_domain": "僅對於此域名改寫回應。",
+    "example_rewrite_domain": "僅對此域名改寫回應。",
    "example_rewrite_wildcard": "對於所有的 <0>example.org</0> 子網域改寫回應。",
    "rewrite_ip_address": "IP 位址：在一個 A 或 AAAA 回應中使用此 IP",
    "rewrite_domain_name": "域名：新增一筆正規名稱（CNAME）記錄",
@@ -539,7 +548,7 @@
    "fastest_addr": "最快的 IP 位址",
    "fastest_addr_desc": "查詢所有的 DNS 伺服器並返回在所有的回應之中最快的 IP 位址。因為 AdGuard Home 必須等待來自所有的 DNS 伺服器之回應，這使 DNS 查詢變慢，但改善總體的連線。",
    "autofix_warning_text": "如果您點擊\"修復\"，AdGuard Home 將配置您的系統使用 AdGuard Home DNS 伺服器。",
-    "autofix_warning_list": "它將執行這些任務：<0>撤銷系統 DNSStubListener</0> <0>設定 DNS 伺服器位址為 127.0.0.1</0> <0>用 /run/systemd/resolve/resolv.conf 取代 /etc/resolv.conf 的符號連結目標</0> <0>停止 DNSStubListener（重新載入 systemd 已解析的服務）</0>",
+    "autofix_warning_list": "它將執行這些任務：<0>撤銷系統 DNSStubListener</0> <0>設定 DNS 伺服器位址為 127.0.0.1</0> <0>用 /run/systemd/resolve/resolv.conf 取代 /etc/resolv.conf 的符號連結目標</0> <0>停止 DNSStubListener（重新載入 systemd-resolved 服務）</0>",
    "autofix_warning_result": "因此，預設下，來自您的系統之所有的 DNS 請求將被 AdGuard Home 處理。",
    "tags_title": "標記",
    "tags_desc": "您可選擇對應該用戶端的標記。標記可被包括在過濾規則中並允許您更準確地套用它們。<0>了解更多</0>",
@@ -557,7 +566,7 @@
    "check_reason": "原因：{{reason}}",
    "check_service": "服務名稱：{{service}}",
    "service_name": "服務名稱",
-    "check_not_found": "未在您的過濾器中被找到",
+    "check_not_found": "未在您的過濾器清單中被找到",
    "client_confirm_block": "您確定您想要封鎖該用戶端 \"{{ip}}\" 嗎？",
    "client_confirm_unblock": "您確定您想要解除封鎖該用戶端 \"{{ip}}\" 嗎？",
    "client_blocked": "用戶端 \"{{ip}}\" 被成功地封鎖",
@@ -579,7 +588,7 @@
    "show_whitelisted_responses": "已允許的",
    "show_processed_responses": "已處理的",
    "blocked_safebrowsing": "被安全瀏覽封鎖",
-    "blocked_adult_websites": "已封鎖的成人網站",
+    "blocked_adult_websites": "被家長控制封鎖",
    "blocked_threats": "已封鎖的威脅",
    "allowed": "已允許的",
    "filtered": "受過濾的",
@@ -597,14 +606,14 @@
    "cache_ttl_min_override_desc": "當快取 DNS 回應時，延長從上游的伺服器收到的短存活時間數值（秒）",
    "cache_ttl_max_override_desc": "設定最大的存活時間數值（秒）供在 DNS 快取中的項目",
    "ttl_cache_validation": "最小的快取存活時間（TTL）數值必須小於或等於最大的數值",
-    "cache_optimistic": "樂觀快取模式",
+    "cache_optimistic": "樂觀快取",
    "cache_optimistic_desc": "即使當項目為已到期的，從快取使 AdGuard Home 回覆，並還嘗試重新整理它們。",
    "filter_category_general": "一般的",
    "filter_category_security": "安全性",
    "filter_category_regional": "區域性的",
    "filter_category_other": "其它的",
    "filter_category_general_desc": "封鎖大多數朝向裝置的追蹤和廣告之清單",
-    "filter_category_security_desc": "專門地封鎖惡意、網路釣魚和詐騙的網域之清單",
+    "filter_category_security_desc": "專門地旨在封鎖惡意、網路釣魚和詐騙的網域之清單",
    "filter_category_regional_desc": "專注於區域性的廣告和追蹤伺服器之清單",
    "filter_category_other_desc": "其它的封鎖清單",
    "setup_config_to_enable_dhcp_server": "設置配置以啟用 DHCP 伺服器",
@@ -612,6 +621,11 @@
    "click_to_view_queries": "點擊以檢視查詢",
    "port_53_faq_link": "連接埠 53 常被 \"DNSStubListener\" 或 \"systemd-resolved\" 服務佔用。請閱讀有關如何解決這個的<0>用法說明</0>。",
    "adg_will_drop_dns_queries": "AdGuard Home 將持續排除來自此用戶端之所有的 DNS 查詢。",
-    "client_not_in_allowed_clients": "該用戶端未被允許，因為它不在\"已允許的用戶端\"清單中。",
-    "experimental": "實驗性的"
+    "filter_allowlist": "警告：此操作將把 \"{{disallowed_rule}}\" 規則排除在已允許用戶端的清單之外。",
+    "last_rule_in_allowlist": "無法禁止此用戶端，因為排除 “{{disallowed_rule}}” 規則將禁用“已允許用戶端”的清單。",
+    "experimental": "實驗性的",
+    "use_saved_key": "使用該先前已儲存的金鑰",
+    "parental_control": "家長控制",
+    "safe_browsing": "安全瀏覽",
+    "served_from_cache": "{{value}} <i>（由快取提供）</i>"
 }
--- a/client/src/actions/access.js
+++ b/client/src/actions/access.js
@@ -52,25 +52,34 @@ export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dis
    dispatch(toggleClientBlockRequest());
    try {
        const accessList = await apiClient.getAccessList();
-        const allowed_clients = accessList.allowed_clients ?? [];
        const blocked_hosts = accessList.blocked_hosts ?? [];
-        const disallowed_clients = accessList.disallowed_clients ?? [];
-
-        const updatedDisallowedClients = disallowed
-            ? disallowed_clients.filter((client) => client !== disallowed_rule)
-            : disallowed_clients.concat(ip);
+        let allowed_clients = accessList.allowed_clients ?? [];
+        let disallowed_clients = accessList.disallowed_clients ?? [];

+        if (disallowed) {
+            if (!disallowed_rule) {
+                allowed_clients = allowed_clients.concat(ip);
+            } else {
+                disallowed_clients = disallowed_clients
+                    .filter((client) => client !== disallowed_rule);
+            }
+        } else if (allowed_clients.length > 1) {
+            allowed_clients = allowed_clients
+                .filter((client) => client !== disallowed_rule);
+        } else {
+            disallowed_clients = disallowed_clients.concat(ip);
+        }
        const values = {
            allowed_clients,
            blocked_hosts,
-            disallowed_clients: updatedDisallowedClients,
+            disallowed_clients,
        };

        await apiClient.setAccessList(values);
        dispatch(toggleClientBlockSuccess(values));

        if (disallowed) {
-            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
+            dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule || ip })));
        } else {
            dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
        }
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -451,7 +451,6 @@ export const findActiveDhcp = (name) => async (dispatch, getState) => {
            dispatch(addErrorToast({ error: 'dhcp_static_ip_error' }));
        }

-
        if (isError) {
            dispatch(addErrorToast({ error: 'dhcp_error' }));
        }
@@ -638,7 +637,11 @@ export const toggleBlocking = (
 };

 export const toggleBlockingForClient = (type, domain, client) => {
-    const baseRule = `||${domain}^$client='${client.replace(/'/g, '/\'')}'`;
+    const escapedClientName = client.replace(/'/g, '\\\'')
+        .replace(/"/g, '\\"')
+        .replace(/,/g, '\\,')
+        .replace(/\|/g, '\\|');
+    const baseRule = `||${domain}^$client='${escapedClientName}'`;
    const baseUnblocking = `@@${baseRule}`;

    return toggleBlocking(type, domain, baseRule, baseUnblocking);
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -52,7 +52,7 @@ body {

 .modal-body--medium {
    max-height: 20rem;
-    overflow-y: scroll;
+    overflow-y: auto;
 }

 .modal-body__item:not(:first-child) {
--- a/client/src/components/App/index.js
+++ b/client/src/components/App/index.js
@@ -39,7 +39,6 @@ import CustomRules from '../../containers/CustomRules';
 import Services from '../Filters/Services';
 import Logs from '../Logs';

-
 const ROUTES = [
    {
        path: MENU_URLS.root,
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -38,15 +38,23 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
    const dispatch = useDispatch();
    const { t } = useTranslation();
    const processingSet = useSelector((state) => state.access.processingSet);
+    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);

    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 })}`;
+        let confirmMessage;
+
+        if (disallowed) {
+            confirmMessage = t('client_confirm_unblock', { ip: disallowed_rule || ip });
+        } else {
+            confirmMessage = `${t('adg_will_drop_dns_queries')} ${t('client_confirm_block', { ip })}`;
+            if (allowedСlients.length > 0) {
+                confirmMessage = confirmMessage.concat(`\n\n${t('filter_allowlist', { disallowed_rule })}`);
+            }
+        }

        if (window.confirm(confirmMessage)) {
            await dispatch(toggleClientBlock(ip, disallowed, disallowed_rule));
@@ -58,15 +66,16 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {

    const text = disallowed ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;

-    const isNotInAllowedList = disallowed && disallowed_rule === '';
+    const lastRuleInAllowlist = !disallowed && allowedСlients === disallowed_rule;
+    const disabled = processingSet || lastRuleInAllowlist;
    return (
        <div className="table__action pl-4">
            <button
                type="button"
                className={buttonClass}
-                onClick={isNotInAllowedList ? undefined : onClick}
-                disabled={isNotInAllowedList || processingSet}
-                title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
+                onClick={onClick}
+                disabled={disabled}
+                title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''}
            >
                <Trans>{text}</Trans>
            </button>
--- a/client/src/components/Dashboard/Counters.js
+++ b/client/src/components/Dashboard/Counters.js
@@ -16,18 +16,31 @@ const Row = ({
        ? <LogsSearchLink response_status={response_status}>{formatNumber(count)}</LogsSearchLink>
        : count;

-    return <tr key={label}>
-        <td>
-            <Trans components={translationComponents}>{label}</Trans>
-            <Tooltip content={tooltipTitle} placement="top"
-                     className="tooltip-container tooltip-custom--narrow text-center">
-                <svg className="icons icon--20 icon--lightgray ml-2">
-                    <use xlinkHref="#question" />
-                </svg>
-            </Tooltip>
-        </td>
-        <td className="text-right"><strong>{content}</strong></td>
-    </tr>;
+    return (
+        <div className="counters__row" key={label}>
+            <div className="counters__column">
+                <span className="counters__title">
+                    <Trans components={translationComponents}>
+                        {label}
+                    </Trans>
+                </span>
+                <span className="counters__tooltip">
+                    <Tooltip
+                        content={tooltipTitle}
+                        placement="top"
+                        className="tooltip-container tooltip-custom--narrow text-center"
+                    >
+                        <svg className="icons icon--20 icon--lightgray ml-2">
+                            <use xlinkHref="#question" />
+                        </svg>
+                    </Tooltip>
+                </span>
+            </div>
+            <div className="counters__column counters__column--value">
+                <strong>{content}</strong>
+            </div>
+        </div>
+    );
 };

 const Counters = ({ refreshButton, subtitle }) => {
@@ -88,9 +101,9 @@ const Counters = ({ refreshButton, subtitle }) => {
            bodyType="card-table"
            refresh={refreshButton}
        >
-            <table className="table card-table">
-                <tbody>{rows.map(Row)}</tbody>
-            </table>
+            <div className="counters">
+                {rows.map(Row)}
+            </div>
        </Card>
    );
 };
--- a/client/src/components/Dashboard/Dashboard.css
+++ b/client/src/components/Dashboard/Dashboard.css
@@ -49,3 +49,39 @@
        display: block;
    }
 }
+
+.counters__row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-top: 1px solid #dee2e6;
+    padding: 0.75rem 1.5rem;
+}
+
+.counters__column--value {
+    flex-shrink: 0;
+    margin-left: 1.5rem;
+    text-align: right;
+    white-space: nowrap;
+}
+
+@media screen and (min-width: 768px) {
+    .counters__column {
+        display: flex;
+        align-items: center;
+        overflow: hidden;
+    }
+
+    .counters__title {
+        display: block;
+        max-width: 100%;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+
+    .counters__tooltip {
+        display: block;
+        flex-shrink: 0;
+    }
+}
--- a/client/src/components/Dashboard/DomainCell.js
+++ b/client/src/components/Dashboard/DomainCell.js
@@ -17,7 +17,6 @@ const renderLink = ({ url, name }) => <a
    <strong>{name}</strong>
 </a>;

-
 const getTrackerInfo = (trackerData) => [{
    key: 'name_table_header',
    value: trackerData,
--- a/client/src/components/Filters/CustomRules.js
+++ b/client/src/components/Filters/CustomRules.js
@@ -1,13 +1,12 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
-import classnames from 'classnames';
 import Card from '../ui/Card';
 import PageTitle from '../ui/PageTitle';
 import Examples from './Examples';
 import Check from './Check';
 import { getTextareaCommentsHighlight, syncScroll } from '../../helpers/highlightTextareaComments';
-import { COMMENT_LINE_DEFAULT_TOKEN, isFirefox } from '../../helpers/constants';
+import { COMMENT_LINE_DEFAULT_TOKEN } from '../../helpers/constants';
 import '../ui/texareaCommentsHighlight.css';

 class CustomRules extends Component {
@@ -52,26 +51,19 @@ class CustomRules extends Component {
        return (
            <>
                <PageTitle title={t('custom_filtering_rules')} />
-                <Card
-                    subtitle={t('custom_filter_rules_hint')}
-                >
+                <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,
-                                })}
+                        <div className="text-edit-container mb-4">
+                            <textarea
+                                className="form-control font-monospace text-input"
                                value={userRules}
                                onChange={this.handleChange}
                                onScroll={this.onScroll}
-                        />
+                            />
                            {getTextareaCommentsHighlight(
                                this.ref,
                                userRules,
-                                classnames({ 'form-control--textarea-large': isFirefox }),
+                                undefined,
                                [COMMENT_LINE_DEFAULT_TOKEN, '!'],
                            )}
                        </div>
--- a/client/src/components/Logs/Cells/ClientCell.js
+++ b/client/src/components/Logs/Cells/ClientCell.js
@@ -28,6 +28,8 @@ const ClientCell = ({
    const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
    const processingRules = useSelector((state) => state.filtering.processingRules);
    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
+    const processingSet = useSelector((state) => state.access.processingSet);
+    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);
    const [isOptionsOpened, setOptionsOpened] = useState(false);

    const autoClient = autoClients.find((autoClient) => autoClient.name === client);
@@ -71,11 +73,12 @@ const ClientCell = ({
        const {
            confirmMessage,
            buttonKey: blockingClientKey,
-            isNotInAllowedList,
+            lastRuleInAllowlist,
        } = getBlockClientInfo(
            client,
            client_info?.disallowed || false,
            client_info?.disallowed_rule || '',
+            allowedСlients,
        );

        const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
@@ -100,7 +103,7 @@ const ClientCell = ({
                        await dispatch(updateLogs());
                    }
                },
-                disabled: isNotInAllowedList,
+                disabled: processingSet || lastRuleInAllowlist,
            },
        ];

--- a/client/src/components/Logs/Cells/IconTooltip.css
+++ b/client/src/components/Logs/Cells/IconTooltip.css
@@ -6,7 +6,7 @@
    pointer-events: auto !important;
    background-color: var(--white);
    z-index: 102;
-    overflow-y: scroll;
+    overflow-y: auto;
    max-height: 100%;
 }

--- a/client/src/components/Logs/Cells/ResponseCell.js
+++ b/client/src/components/Logs/Cells/ResponseCell.js
@@ -21,6 +21,7 @@ const ResponseCell = ({
    upstream,
    rules,
    service_name,
+    cached,
 }) => {
    const { t } = useTranslation();
    const filters = useSelector((state) => state.filtering.filters, shallowEqual);
@@ -36,6 +37,9 @@ const ResponseCell = ({

    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 upstreamString = cached
+        ? t('served_from_cache', { value: upstream, i: <i /> })
+        : upstream;

    const renderResponses = (responseArr) => {
        if (!responseArr || responseArr.length === 0) {
@@ -53,7 +57,7 @@ const ResponseCell = ({

    const COMMON_CONTENT = {
        encryption_status: boldStatusLabel,
-        install_settings_dns: upstream,
+        install_settings_dns: upstreamString,
        elapsed: formattedElapsedMs,
        response_code: status,
        ...(service_name
@@ -90,8 +94,9 @@ const ResponseCell = ({

    const detailedInfo = getDetailedInfo(reason);

-    return <div className="logs__cell logs__cell--response" role="gridcell">
-        <IconTooltip
+    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'
@@ -100,14 +105,15 @@ const ResponseCell = ({
                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 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>
-    </div>;
+    );
 };

 ResponseCell.propTypes = {
@@ -117,6 +123,7 @@ ResponseCell.propTypes = {
    response: propTypes.array.isRequired,
    status: propTypes.string.isRequired,
    upstream: propTypes.string.isRequired,
+    cached: propTypes.bool.isRequired,
    rules: propTypes.arrayOf(propTypes.shape({
        text: propTypes.string.isRequired,
        filter_list_id: propTypes.number.isRequired,
--- a/client/src/components/Logs/Cells/helpers/index.js
+++ b/client/src/components/Logs/Cells/helpers/index.js
@@ -2,17 +2,24 @@ 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 })}`;
+export const getBlockClientInfo = (ip, disallowed, disallowed_rule, allowedСlients) => {
+    let confirmMessage;
+
+    if (disallowed) {
+        confirmMessage = i18next.t('client_confirm_unblock', { ip: disallowed_rule || ip });
+    } else {
+        confirmMessage = `${i18next.t('adg_will_drop_dns_queries')} ${i18next.t('client_confirm_block', { ip })}`;
+        if (allowedСlients.length > 0) {
+            confirmMessage = confirmMessage.concat(`\n\n${i18next.t('filter_allowlist', { disallowed_rule })}`);
+        }
+    }

    const buttonKey = i18next.t(disallowed ? 'allow_this_client' : 'disallow_this_client');
-    const isNotInAllowedList = disallowed && disallowed_rule === '';
+    const lastRuleInAllowlist = !disallowed && allowedСlients === disallowed_rule;

    return {
        confirmMessage,
        buttonKey,
-        isNotInAllowedList,
+        lastRuleInAllowlist,
    };
 };
--- a/client/src/components/Logs/Cells/index.js
+++ b/client/src/components/Logs/Cells/index.js
@@ -50,6 +50,8 @@ const Row = memo(({
    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 processingSet = useSelector((state) => state.access.processingSet);
+    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);

    const clients = useSelector((state) => state.dashboard.clients);

@@ -74,6 +76,7 @@ const Row = memo(({
            originalResponse,
            status,
            service_name,
+            cached,
        } = rowProps;

        const hasTracker = !!tracker;
@@ -104,15 +107,19 @@ const Row = memo(({
        const {
            confirmMessage,
            buttonKey: blockingClientKey,
-            isNotInAllowedList,
+            lastRuleInAllowlist,
        } = getBlockClientInfo(
            client,
            client_info?.disallowed || false,
            client_info?.disallowed_rule || '',
+            allowedСlients,
        );

        const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
        const clientNameBlockingFor = getBlockingClientName(clients, client);
+        const upstreamString = cached
+            ? t('served_from_cache', { value: upstream, i: <i /> })
+            : upstream;

        const onBlockingForClientClick = () => {
            dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
@@ -147,7 +154,7 @@ const Row = memo(({
        const blockClientButton = <button
                className='text-center font-weight-bold py-2 button-action--arrow-option'
                onClick={onBlockingClientClick}
-                disabled={isNotInAllowedList}>
+                disabled={processingSet || lastRuleInAllowlist}>
            {t(blockingClientKey)}
        </button>;

@@ -172,7 +179,7 @@ const Row = memo(({
                            className="link--green">{sourceData.name}
                    </a>,
            response_details: 'title',
-            install_settings_dns: upstream,
+            install_settings_dns: upstreamString,
            elapsed: formattedElapsedMs,
            ...(rules.length > 0
                    && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
@@ -227,6 +234,7 @@ Row.propTypes = {
        time: propTypes.string.isRequired,
        tracker: propTypes.object,
        upstream: propTypes.string.isRequired,
+        cached: propTypes.bool.isRequired,
        type: propTypes.string.isRequired,
        client_proto: propTypes.string.isRequired,
        client_id: propTypes.string,
--- a/client/src/components/Logs/Logs.css
+++ b/client/src/components/Logs/Logs.css
@@ -388,7 +388,7 @@
    border-collapse: collapse;
    contain: layout;
    overflow-x: hidden;
-    overflow-y: scroll;
+    overflow-y: auto;
    will-change: scroll-position;
 }

--- a/client/src/components/Logs/index.js
+++ b/client/src/components/Logs/index.js
@@ -15,6 +15,7 @@ import Disabled from './Disabled';
 import { getFilteringStatus } from '../../actions/filtering';
 import { getClients } from '../../actions';
 import { getDnsConfig } from '../../actions/dnsConfig';
+import { getAccessList } from '../../actions/access';
 import {
    getLogsConfig,
    resetFilteredLogs,
@@ -76,8 +77,8 @@ const Logs = () => {
    const filter = useSelector((state) => state.queryLogs.filter, shallowEqual);
    const logs = useSelector((state) => state.queryLogs.logs, shallowEqual);

-    const search = filter?.search || search_url_param || '';
-    const response_status = filter?.response_status || response_status_url_param || '';
+    const search = search_url_param || filter?.search || '';
+    const response_status = response_status_url_param || filter?.response_status || '';

    const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < SMALL_SCREEN_SIZE);
    const [detailedDataCurrent, setDetailedDataCurrent] = useState({});
@@ -126,6 +127,7 @@ const Logs = () => {
                await Promise.all([
                    dispatch(getLogsConfig()),
                    dispatch(getDnsConfig()),
+                    dispatch(getAccessList()),
                ]);
            } catch (err) {
                console.error(err);
--- a/client/src/components/Settings/Dhcp/FormDHCPv4.js
+++ b/client/src/components/Settings/Dhcp/FormDHCPv4.js
@@ -13,6 +13,9 @@ import {
    validateIpv4,
    validateRequiredValue,
    validateIpv4RangeEnd,
+    validateGatewaySubnetMask,
+    validateIpForGatewaySubnetMask,
+    validateNotInRange,
 } from '../../../helpers/validators';

 const FormDHCPv4 = ({
@@ -54,7 +57,11 @@ const FormDHCPv4 = ({
                        type="text"
                        className="form-control"
                        placeholder={t(ipv4placeholders.gateway_ip)}
-                        validate={[validateIpv4, validateRequired]}
+                        validate={[
+                            validateIpv4,
+                            validateRequired,
+                            validateNotInRange,
+                        ]}
                        disabled={!isInterfaceIncludesIpv4}
                    />
                </div>
@@ -66,7 +73,11 @@ const FormDHCPv4 = ({
                        type="text"
                        className="form-control"
                        placeholder={t(ipv4placeholders.subnet_mask)}
-                        validate={[validateIpv4, validateRequired]}
+                        validate={[
+                            validateIpv4,
+                            validateRequired,
+                            validateGatewaySubnetMask,
+                        ]}
                        disabled={!isInterfaceIncludesIpv4}
                    />
                </div>
@@ -84,7 +95,11 @@ const FormDHCPv4 = ({
                                type="text"
                                className="form-control"
                                placeholder={t(ipv4placeholders.range_start)}
-                                validate={[validateIpv4]}
+                                validate={[
+                                    validateIpv4,
+                                    validateGatewaySubnetMask,
+                                    validateIpForGatewaySubnetMask,
+                                ]}
                                disabled={!isInterfaceIncludesIpv4}
                            />
                        </div>
@@ -95,7 +110,12 @@ const FormDHCPv4 = ({
                                type="text"
                                className="form-control"
                                placeholder={t(ipv4placeholders.range_end)}
-                                validate={[validateIpv4, validateIpv4RangeEnd]}
+                                validate={[
+                                    validateIpv4,
+                                    validateIpv4RangeEnd,
+                                    validateGatewaySubnetMask,
+                                    validateIpForGatewaySubnetMask,
+                                ]}
                                disabled={!isInterfaceIncludesIpv4}
                            />
                        </div>
--- a/client/src/components/Settings/Dhcp/Interfaces.js
+++ b/client/src/components/Settings/Dhcp/Interfaces.js
@@ -20,7 +20,6 @@ const renderInterfaces = (interfaces) => Object.keys(interfaces)
        return <option value={name} key={name}>{optionContent}</option>;
    });

-
 const getInterfaceValues = ({
    gateway_ip,
    hardware_address,
--- a/client/src/components/Settings/Dhcp/StaticLeases/Form.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Form.js
@@ -53,7 +53,11 @@ const Form = ({
                        type="text"
                        className="form-control"
                        placeholder={t('form_enter_subnet_ip', { cidr })}
-                        validate={[validateRequiredValue, validateIpv4, validateIpv4InCidr]}
+                        validate={[
+                            validateRequiredValue,
+                            validateIpv4,
+                            validateIpv4InCidr,
+                        ]}
                    />
                </div>
                <div className="form__group">
--- a/client/src/components/Settings/Dhcp/StaticLeases/Modal.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Modal.js
@@ -11,6 +11,8 @@ const Modal = ({
    handleSubmit,
    processingAdding,
    cidr,
+    rangeStart,
+    rangeEnd,
 }) => {
    const dispatch = useDispatch();

@@ -38,10 +40,14 @@ const Modal = ({
                        ip: '',
                        hostname: '',
                        cidr,
+                        rangeStart,
+                        rangeEnd,
                    }}
                    onSubmit={handleSubmit}
                    processingAdding={processingAdding}
                    cidr={cidr}
+                    rangeStart={rangeStart}
+                    rangeEnd={rangeEnd}
                />
            </div>
        </ReactModal>
@@ -53,6 +59,8 @@ Modal.propTypes = {
    handleSubmit: PropTypes.func.isRequired,
    processingAdding: PropTypes.bool.isRequired,
    cidr: PropTypes.string.isRequired,
+    rangeStart: PropTypes.string,
+    rangeEnd: PropTypes.string,
 };

 export default withTranslation()(Modal);
--- a/client/src/components/Settings/Dhcp/StaticLeases/index.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/index.js
@@ -22,6 +22,8 @@ const StaticLeases = ({
    processingDeleting,
    staticLeases,
    cidr,
+    rangeStart,
+    rangeEnd,
 }) => {
    const [t] = useTranslation();
    const dispatch = useDispatch();
@@ -100,6 +102,8 @@ const StaticLeases = ({
                handleSubmit={handleSubmit}
                processingAdding={processingAdding}
                cidr={cidr}
+                rangeStart={rangeStart}
+                rangeEnd={rangeEnd}
            />
        </>
    );
@@ -111,6 +115,8 @@ StaticLeases.propTypes = {
    processingAdding: PropTypes.bool.isRequired,
    processingDeleting: PropTypes.bool.isRequired,
    cidr: PropTypes.string.isRequired,
+    rangeStart: PropTypes.string,
+    rangeEnd: PropTypes.string,
 };

 cellWrap.propTypes = {
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -102,6 +102,7 @@ const Dhcp = () => {
            Object.values(DHCP_FORM_NAMES)
                .forEach((formName) => dispatch(destroy(formName)));
            dispatch(resetDhcp());
+            dispatch(getDhcpStatus());
        }
    };

@@ -275,6 +276,8 @@ const Dhcp = () => {
                            processingAdding={processingAdding}
                            processingDeleting={processingDeleting}
                            cidr={cidr}
+                            rangeStart={dhcp?.values?.v4?.range_start}
+                            rangeEnd={dhcp?.values?.v4?.range_end}
                        />
                        <div className="btn-list mt-2">
                            <button
--- a/client/src/components/Settings/Dns/Access/Form.js
+++ b/client/src/components/Settings/Dns/Access/Form.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
+import { connect } from 'react-redux';
+import { Field, reduxForm, formValueSelector } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 import { renderTextareaField } from '../../../../helpers/form';
@@ -31,16 +32,20 @@ const fields = [
    },
 ];

-const Form = (props) => {
+let Form = (props) => {
    const {
-        handleSubmit, submitting, invalid, processingSet,
+        allowedClients, handleSubmit, submitting, invalid, processingSet,
    } = props;

    const renderField = ({
-        id, title, subtitle, disabled = processingSet, normalizeOnBlur,
+        id, title, subtitle, disabled = false, processingSet, normalizeOnBlur,
    }) => <div key={id} className="form__group mb-5">
        <label className="form__label form__label--with-desc" htmlFor={id}>
            <Trans>{title}</Trans>
+            {disabled && <>
+                <span> </span>
+                (<Trans>disabled</Trans>)
+            </>}
        </label>
        <div className="form__desc form__desc--top">
            <Trans>{subtitle}</Trans>
@@ -51,7 +56,7 @@ const Form = (props) => {
            component={renderTextareaField}
            type="text"
            className="form-control form-control--textarea font-monospace"
-            disabled={disabled}
+            disabled={disabled || processingSet}
            normalizeOnBlur={normalizeOnBlur}
        />
    </div>;
@@ -66,7 +71,15 @@ const Form = (props) => {

    return (
        <form onSubmit={handleSubmit}>
-            {fields.map(renderField)}
+            {
+                fields.map((f) => {
+                    const props = { ...f };
+                    if (allowedClients && f.id === 'disallowed_clients') {
+                        props.disabled = true;
+                    }
+                    return renderField(props);
+                })
+            }
            <div className="card-actions">
                <div className="btn-list">
                    <button
@@ -90,6 +103,21 @@ Form.propTypes = {
    processingSet: PropTypes.bool.isRequired,
    t: PropTypes.func.isRequired,
    textarea: PropTypes.bool,
+    allowedClients: PropTypes.string,
 };

-export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
+const selector = formValueSelector(FORM_NAME.ACCESS);
+
+Form = connect((state) => {
+    const allowedClients = selector(state, 'allowed_clients');
+    return {
+        allowedClients,
+    };
+})(Form);
+
+export default flow([
+    withTranslation(),
+    reduxForm({
+        form: FORM_NAME.ACCESS,
+    }),
+])(Form);
--- a/client/src/components/Settings/Dns/Upstream/Form.js
+++ b/client/src/components/Settings/Dns/Upstream/Form.js
@@ -9,7 +9,6 @@ import { renderRadioField, renderTextareaField, CheckboxField } from '../../../.
 import {
    DNS_REQUEST_OPTIONS,
    FORM_NAME,
-    isFirefox,
    UPSTREAM_CONFIGURATION_WIKI_LINK,
 } from '../../../../helpers/constants';
 import { testUpstreamWithFormValues } from '../../../../actions';
@@ -90,25 +89,10 @@ renderTextareaWithHighlightField.propTypes = {
    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',
@@ -176,6 +160,20 @@ const Form = ({
                    dns_providers
                </Trans>
            </label>
+            <div className="col-12 mb-4">
+                <div className="text-edit-container">
+                    <Field
+                        id={UPSTREAM_DNS_NAME}
+                        name={UPSTREAM_DNS_NAME}
+                        component={renderTextareaWithHighlightField}
+                        type="text"
+                        className="form-control form-control--textarea font-monospace text-input"
+                        placeholder={t('upstream_dns')}
+                        disabled={processingSetConfig || processingTestUpstream}
+                        normalizeOnBlur={removeEmptyLines}
+                    />
+                </div>
+            </div>
            {INPUT_FIELDS.map(renderField)}
            <div className="col-12">
                <Examples />
--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -18,7 +18,7 @@ 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,
+    DNS_OVER_QUIC_PORT, DNS_OVER_TLS_PORT, FORM_NAME, STANDARD_HTTPS_PORT, ENCRYPTION_SOURCE,
 } from '../../../helpers/constants';

 const validate = (values) => {
@@ -46,6 +46,7 @@ const clearFields = (change, setTlsConfig, t) => {
        server_name: '',
        force_https: false,
        enabled: false,
+        private_key_saved: false,
    };
    // eslint-disable-next-line no-alert
    if (window.confirm(t('encryption_reset'))) {
@@ -83,6 +84,7 @@ let Form = (props) => {
        setTlsConfig,
        certificateSource,
        privateKeySource,
+        privateKeySaved,
    } = props;

    const isSavingDisabled = invalid
@@ -265,7 +267,7 @@ let Form = (props) => {
                            </div>
                        </div>

-                        {certificateSource === 'content' && (
+                        {certificateSource === ENCRYPTION_SOURCE.CONTENT && (
                            <Field
                                id="certificate_chain"
                                name="certificate_chain"
@@ -277,7 +279,7 @@ let Form = (props) => {
                                disabled={!isEnabled}
                            />
                        )}
-                        {certificateSource === 'path' && (
+                        {certificateSource === ENCRYPTION_SOURCE.PATH && (
                            <Field
                                id="certificate_path"
                                name="certificate_path"
@@ -318,7 +320,7 @@ let Form = (props) => {
                                    component={renderRadioField}
                                    type="radio"
                                    className="form-control mr-2"
-                                    value="path"
+                                    value={ENCRYPTION_SOURCE.PATH}
                                    placeholder={t('encryption_key_source_path')}
                                    disabled={!isEnabled}
                                />
@@ -327,28 +329,15 @@ let Form = (props) => {
                                    component={renderRadioField}
                                    type="radio"
                                    className="form-control mr-2"
-                                    value="content"
+                                    value={ENCRYPTION_SOURCE.CONTENT}
                                    placeholder={t('encryption_key_source_content')}
                                    disabled={!isEnabled}
                                />
                            </div>
                        </div>

-                        {privateKeySource === 'content' && (
+                        {privateKeySource === ENCRYPTION_SOURCE.PATH && (
                            <Field
-                                id="private_key"
-                                name="private_key"
-                                component="textarea"
-                                type="text"
-                                className="form-control form-control--textarea"
-                                placeholder={t('encryption_key_input')}
-                                onChange={handleChange}
-                                disabled={!isEnabled}
-                            />
-                        )}
-                        {privateKeySource === 'path' && (
-                            <Field
-                                id="private_key_path"
                                name="private_key_path"
                                component={renderInputField}
                                type="text"
@@ -358,6 +347,36 @@ let Form = (props) => {
                                disabled={!isEnabled}
                            />
                        )}
+                        {privateKeySource === ENCRYPTION_SOURCE.CONTENT && [
+                            <Field
+                                key="private_key_saved"
+                                name="private_key_saved"
+                                type="checkbox"
+                                className="form__group form__group--settings mb-2"
+                                component={CheckboxField}
+                                disabled={!isEnabled}
+                                placeholder={t('use_saved_key')}
+                                onChange={(event) => {
+                                    if (event.target.checked) {
+                                        change('private_key', '');
+                                    }
+                                    if (handleChange) {
+                                        handleChange(event);
+                                    }
+                                }}
+                            />,
+                            <Field
+                                id="private_key"
+                                key="private_key"
+                                name="private_key"
+                                component="textarea"
+                                type="text"
+                                className="form-control form-control--textarea"
+                                placeholder={t('encryption_key_input')}
+                                onChange={handleChange}
+                                disabled={!isEnabled || privateKeySaved}
+                            />,
+                        ]}
                    </div>
                    <div className="form__status">
                        {(privateKey || privateKeyPath) && (
@@ -422,6 +441,7 @@ Form.propTypes = {
    setTlsConfig: PropTypes.func.isRequired,
    certificateSource: PropTypes.string,
    privateKeySource: PropTypes.string,
+    privateKeySaved: PropTypes.bool,
 };

 const selector = formValueSelector(FORM_NAME.ENCRYPTION);
@@ -434,6 +454,7 @@ Form = connect((state) => {
    const privateKeyPath = selector(state, 'private_key_path');
    const certificateSource = selector(state, 'certificate_source');
    const privateKeySource = selector(state, 'key_source');
+    const privateKeySaved = selector(state, 'private_key_saved');
    return {
        isEnabled,
        certificateChain,
@@ -442,6 +463,7 @@ Form = connect((state) => {
        privateKeyPath,
        certificateSource,
        privateKeySource,
+        privateKeySaved,
    };
 })(Form);

--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -29,9 +29,13 @@ class Encryption extends Component {
    }, DEBOUNCE_TIMEOUT);

    getInitialValues = (data) => {
-        const { certificate_chain, private_key } = data;
-        const certificate_source = certificate_chain ? 'content' : 'path';
-        const key_source = private_key ? 'content' : 'path';
+        const { certificate_chain, private_key, private_key_saved } = data;
+        const certificate_source = certificate_chain
+            ? ENCRYPTION_SOURCE.CONTENT
+            : ENCRYPTION_SOURCE.PATH;
+        const key_source = private_key || private_key_saved
+            ? ENCRYPTION_SOURCE.CONTENT
+            : ENCRYPTION_SOURCE.PATH;

        return {
            ...data,
@@ -41,7 +45,9 @@ class Encryption extends Component {
    };

    getSubmitValues = (values) => {
-        const { certificate_source, key_source, ...config } = values;
+        const {
+            certificate_source, key_source, private_key_saved, ...config
+        } = values;

        if (certificate_source === ENCRYPTION_SOURCE.PATH) {
            config.certificate_chain = '';
@@ -49,10 +55,15 @@ class Encryption extends Component {
            config.certificate_path = '';
        }

-        if (values.key_source === ENCRYPTION_SOURCE.PATH) {
+        if (key_source === ENCRYPTION_SOURCE.PATH) {
            config.private_key = '';
        } else {
            config.private_key_path = '';
+
+            if (private_key_saved) {
+                config.private_key = '';
+                config.private_key_saved = private_key_saved;
+            }
        }

        return config;
@@ -71,6 +82,7 @@ class Encryption extends Component {
            private_key,
            certificate_path,
            private_key_path,
+            private_key_saved,
        } = encryption;

        const initialValues = this.getInitialValues({
@@ -84,6 +96,7 @@ class Encryption extends Component {
            private_key,
            certificate_path,
            private_key_path,
+            private_key_saved,
        });

        return (
--- a/client/src/components/Settings/StatsConfig/Form.js
+++ b/client/src/components/Settings/StatsConfig/Form.js
@@ -4,14 +4,12 @@ import { Field, reduxForm } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';

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

 const getIntervalTitle = (interval, t) => {
    switch (interval) {
-        case 0:
-            return t('disabled');
        case 1:
            return t('interval_24_hour');
        default:
@@ -19,24 +17,36 @@ const getIntervalTitle = (interval, t) => {
    }
 };

-const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => <Field
-    key={interval}
-    name="interval"
-    type="radio"
-    component={renderRadioField}
-    value={interval}
-    placeholder={getIntervalTitle(interval, t)}
-    normalize={toNumber}
-    disabled={processing}
-/>);
-
 const Form = (props) => {
    const {
-        handleSubmit, processing, submitting, invalid, handleReset, processingReset, t,
+        handleSubmit,
+        change,
+        processing,
+        submitting,
+        invalid,
+        handleReset,
+        processingReset,
+        t,
    } = props;

    return (
        <form onSubmit={handleSubmit}>
+            <div className="form__group form__group--settings">
+                <Field
+                    name="enabled"
+                    type="checkbox"
+                    component={CheckboxField}
+                    placeholder={t('statistics_enable')}
+                    disabled={processing}
+                    onChange={(event) => {
+                        if (event.target.checked) {
+                            change('interval', STATS_INTERVALS_DAYS[0]);
+                        } else {
+                            change('interval', DISABLED_STATS_INTERVAL);
+                        }
+                    }}
+                />
+            </div>
            <label className="form__label form__label--with-desc">
                <Trans>statistics_retention</Trans>
            </label>
@@ -45,7 +55,23 @@ const Form = (props) => {
            </div>
            <div className="form__group form__group--settings mt-2">
                <div className="custom-controls-stacked">
-                    {getIntervalFields(processing, t, toNumber)}
+                    {STATS_INTERVALS_DAYS.map((interval) => (
+                        <Field
+                            key={interval}
+                            name="interval"
+                            type="radio"
+                            component={renderRadioField}
+                            value={interval}
+                            placeholder={getIntervalTitle(interval, t)}
+                            normalize={toNumber}
+                            disabled={processing}
+                            onChange={(event) => {
+                                if (event.target.checked) {
+                                    change('enabled', true);
+                                }
+                            }}
+                        />
+                    ))}
                </div>
            </div>
            <div className="mt-5">
--- a/client/src/components/Settings/StatsConfig/index.js
+++ b/client/src/components/Settings/StatsConfig/index.js
@@ -8,13 +8,14 @@ import Form from './Form';
 class StatsConfig extends Component {
    handleFormSubmit = (values) => {
        const { t, interval: prevInterval } = this.props;
+        const config = { interval: values.interval };

-        if (values.interval < prevInterval) {
+        if (config.interval < prevInterval) {
            if (window.confirm(t('statistics_retention_confirm'))) {
-                this.props.setStatsConfig(values);
+                this.props.setStatsConfig(config);
            }
        } else {
-            this.props.setStatsConfig(values);
+            this.props.setStatsConfig(config);
        }
    };

@@ -39,7 +40,10 @@ class StatsConfig extends Component {
            >
                <div className="form">
                    <Form
-                        initialValues={{ interval }}
+                        initialValues={{
+                            interval,
+                            enabled: !!interval,
+                        }}
                        onSubmit={this.handleFormSubmit}
                        processing={processing}
                        processingReset={processingReset}
--- a/client/src/components/ui/Guide/MobileConfigForm.js
+++ b/client/src/components/ui/Guide/MobileConfigForm.js
@@ -14,7 +14,7 @@ import {
    toNumber,
 } from '../../../helpers/form';
 import {
-    validateClientId,
+    validateConfigClientId,
    validateServerName,
    validatePort,
    validateIsSafePort,
@@ -132,7 +132,7 @@ const MobileConfigForm = ({ invalid }) => {
                        component={renderInputField}
                        className="form-control"
                        placeholder={i18next.t('client_id_placeholder')}
-                        validate={validateClientId}
+                        validate={validateConfigClientId}
                    />
                </div>
                <div className="form__group form__group--settings">
--- a/client/src/components/ui/texareaCommentsHighlight.css
+++ b/client/src/components/ui/texareaCommentsHighlight.css
@@ -1,6 +1,7 @@
 .text-edit-container {
    position: relative;
-    height: 10rem;
+    min-height: 240px;
+    overflow: hidden;
 }

 .text-input,
@@ -10,33 +11,20 @@
    left: 0;
    width: 100%;
    height: 100%;
-    padding: 1rem;
+    padding: 16px;
    background: transparent;
    white-space: pre-wrap;
-    line-height: 1.5rem;
+    line-height: 24px;
    word-wrap: break-word;
    font-size: var(--font-size-disable-autozoom);
    margin: 0;
-}
-
-.form--upstream .text-input,
-.form--upstream .text-output {
-    width: 98%;
-    left: 1%;
+    overscroll-behavior: none;
 }

 .text-input {
+    position: relative;
    opacity: 1;
-    resize: none;
-    height: 10rem;
-}
-
-.text-input--larger {
-    height: 11rem;
-}
-
-.text-input--largest {
-    height: 16rem;
+    min-height: 240px;
 }

 .text-output {
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -24,7 +24,7 @@ export const R_UNIX_ABSOLUTE_PATH = /^(\/[^/\x00]+)+$/;
 // eslint-disable-next-line no-control-regex
 export const R_WIN_ABSOLUTE_PATH = /^([a-zA-Z]:)?(\\|\/)(?:[^\\/:*?"<>|\x00]+\\)*[^\\/:*?"<>|\x00]*$/;

-export const R_CLIENT_ID = /^[a-z0-9-]{1,64}$/;
+export const R_CLIENT_ID = /^[a-z0-9-]{1,63}$/;

 export const HTML_PAGES = {
    INSTALL: '/install.html',
@@ -202,7 +202,7 @@ export const FILTERS_URLS = {
 export const SERVICES = [
    {
        id: '9gag',
-        name: '9Gag',
+        name: '9GAG',
    },
    {
        id: 'amazon',
@@ -355,7 +355,8 @@ export const ENCRYPTION_SOURCE = {
 export const FILTERED = 'Filtered';
 export const NOT_FILTERED = 'NotFiltered';

-export const STATS_INTERVALS_DAYS = [0, 1, 7, 30, 90];
+export const DISABLED_STATS_INTERVAL = 0;
+export const STATS_INTERVALS_DAYS = [1, 7, 30, 90];

 export const QUERY_LOG_INTERVALS_DAYS = [0.25, 1, 7, 30, 90];

@@ -527,7 +528,14 @@ export const DETAILED_DATE_FORMAT_OPTIONS = {
    month: 'long',
 };

-export const CUSTOM_FILTERING_RULES_ID = 0;
+export const SPECIAL_FILTER_ID = {
+    CUSTOM_FILTERING_RULES: 0,
+    SYSTEM_HOSTS: -1,
+    BLOCKED_SERVICES: -2,
+    PARENTAL: -3,
+    SAFE_BROWSING: -4,
+    SAFE_SEARCH: -5,
+};

 export const BLOCK_ACTIONS = {
    BLOCK: 'block',
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -42,6 +42,12 @@
            "homepage": "https://someonewhocares.org/",
            "source": "https://someonewhocares.org/hosts/zero/hosts"
        },
+        "oisd": {
+            "name": "OISD Blocklist Basic",
+            "categoryId": "general",
+            "homepage": "https://oisd.nl/",
+            "source": "https://abp.oisd.nl/basic/"
+        },
        "game-console-adblock-list": {
            "name": "Game Console Adblock List",
            "categoryId": "general",
@@ -54,18 +60,6 @@
            "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
            "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt"
        },
-        "windows-spy-blocker" : {
-            "name": "WindowsSpyBlocker - Hosts spy rules",
-            "categoryId": "general",
-            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
-            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
-        },
-        "spam404": {
-            "name": "Spam404",
-            "categoryId": "security",
-            "homepage": "https://github.com/Spam404/lists",
-            "source": "https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt"
-        },
        "nocoin-filter-list": {
            "name": "NoCoin Filter List",
            "categoryId": "security",
@@ -90,18 +84,18 @@
            "homepage": "https://gitlab.com/curben/urlhaus-filter",
            "source": "https://curben.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt"
        },
+        "dandelion-sprouts-anti-malware-list": {
+            "name": "Dandelion Sprout's Anti-Malware List",
+            "categoryId": "security",
+            "homepage": "https://github.com/DandelionSprout/adfilt",
+            "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareAdGuardHome.txt"
+        },
        "NOR-dandelion-sprouts-nordiske-filtre": {
            "name": "NOR: Dandelion Sprouts nordiske filtre",
            "categoryId": "regional",
            "homepage": "https://github.com/DandelionSprout/adfilt",
            "source": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersAdGuardHome.txt"
        },
-        "TUR-nurcan-turk-ad-list": {
-            "name": "TUR: nurcan Türk ad-list",
-            "categoryId": "regional",
-            "homepage": "https://github.com/DandelionSprout/adfilt",
-            "source": "https://raw.githubusercontent.com/xorcan/hosts/master/xhosts.txt"
-        },
        "POL-polish-filters-for-pihole": {
            "name": "POL: Polish filters for Pi hole",
            "categoryId": "regional",
@@ -156,11 +150,17 @@
            "homepage": "https://github.com/ABPindo/indonesianadblockrules/",
            "source": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt"
        },
-        "barb-block": {
-            "name": "BarbBlock",
+        "NLD-Easylist": {
+            "name": "NLD: Easylist",
+            "categoryId": "regional",
+            "homepage": "https://forums.lanik.us/viewforum.php?f=100",
+            "source": "https://easylist-downloads.adblockplus.org/easylistdutch.txt"
+        },
+        "windows-spy-blocker" : {
+            "name": "WindowsSpyBlocker - Hosts spy rules",
            "categoryId": "other",
-            "homepage": "https://github.com/paulgb/BarbBlock/",
-            "source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt"
+            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
        }
    }
 }
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -13,7 +13,6 @@ import {
    ADDRESS_TYPES,
    CHECK_TIMEOUT,
    COMMENT_LINE_DEFAULT_TOKEN,
-    CUSTOM_FILTERING_RULES_ID,
    DEFAULT_DATE_FORMAT_OPTIONS,
    DEFAULT_LANGUAGE,
    DEFAULT_TIME_FORMAT,
@@ -26,6 +25,7 @@ import {
    STANDARD_DNS_PORT,
    STANDARD_HTTPS_PORT,
    STANDARD_WEB_PORT,
+    SPECIAL_FILTER_ID,
 } from './constants';

 /**
@@ -75,6 +75,7 @@ export const normalizeLogs = (logs) => logs.map((log) => {
        service_name,
        original_answer,
        upstream,
+        cached,
    } = log;

    const { name: domain, unicode_name: unicodeName, type } = question;
@@ -116,6 +117,7 @@ export const normalizeLogs = (logs) => logs.map((log) => {
        answer_dnssec,
        elapsedMs,
        upstream,
+        cached,
    };
 });

@@ -299,10 +301,10 @@ export const redirectToCurrentProtocol = (values, httpPort = 80) => {
    const {
        protocol, hostname, hash, port,
    } = window.location;
-    const { enabled, port_https } = values;
+    const { enabled, force_https, port_https } = values;
    const httpsPort = port_https !== STANDARD_HTTPS_PORT ? `:${port_https}` : '';

-    if (protocol !== 'https:' && enabled && port_https) {
+    if (protocol !== 'https:' && enabled && force_https && port_https) {
        checkRedirect(`https://${hostname}${httpsPort}/${hash}`);
    } else if (protocol === 'https:' && enabled && port_https && port_https !== parseInt(port, 10)) {
        checkRedirect(`https://${hostname}${httpsPort}/${hash}`);
@@ -552,6 +554,20 @@ export const isIpInCidr = (ip, cidr) => {
    }
 };

+/**
+ *
+ * @param {string} subnetMask
+ * @returns {IPv4 | null}
+ */
+export const parseSubnetMask = (subnetMask) => {
+    try {
+        return ipaddr.parse(subnetMask).prefixLengthFromSubnetMask();
+    } catch (e) {
+        console.error(e);
+        return null;
+    }
+};
+
 /**
 *
 * @param {string} subnetMask
@@ -759,6 +775,30 @@ export const sortIp = (a, b) => {
    }
 };

+
+/**
+ * @param {number} filterId
+ * @returns {string}
+ */
+export const getSpecialFilterName = (filterId) => {
+    switch (filterId) {
+        case SPECIAL_FILTER_ID.CUSTOM_FILTERING_RULES:
+            return i18n.t('custom_filter_rules');
+        case SPECIAL_FILTER_ID.SYSTEM_HOSTS:
+            return i18n.t('system_host_files');
+        case SPECIAL_FILTER_ID.BLOCKED_SERVICES:
+            return i18n.t('blocked_services');
+        case SPECIAL_FILTER_ID.PARENTAL:
+            return i18n.t('parental_control');
+        case SPECIAL_FILTER_ID.SAFE_BROWSING:
+            return i18n.t('safe_browsing');
+        case SPECIAL_FILTER_ID.SAFE_SEARCH:
+            return i18n.t('safe_search');
+        default:
+            return i18n.t('unknown_filter', { filterId });
+    }
+};
+
 /**
 * @param {array} filters
 * @param {array} whitelistFilters
@@ -770,16 +810,15 @@ export const getFilterName = (
    filters,
    whitelistFilters,
    filterId,
-    customFilterTranslationKey = 'custom_filter_rules',
    resolveFilterName = (filter) => (filter ? filter.name : i18n.t('unknown_filter', { filterId })),
 ) => {
-    if (filterId === CUSTOM_FILTERING_RULES_ID) {
-        return i18n.t(customFilterTranslationKey);
+    const specialFilterIds = Object.values(SPECIAL_FILTER_ID);
+    if (specialFilterIds.includes(filterId)) {
+        return getSpecialFilterName(filterId);
    }

    const matchIdPredicate = (filter) => filter.id === filterId;
    const filter = filters.find(matchIdPredicate) || whitelistFilters.find(matchIdPredicate);
-
    return resolveFilterName(filter);
 };

--- a/client/src/helpers/trackers/adguard.json
+++ b/client/src/helpers/trackers/adguard.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2018-10-14",
+    "timeUpdated": "2021-12-15",
    "categories": {
        "0": "audio_video_player",
        "1": "comments",
@@ -14,6 +14,7 @@
        "10": "hosting",
        "11": "unknown",
        "12": "extensions",
+        "13": "email",
        "101": "mobile_analytics"
    },
    "trackers": {
--- a/client/src/helpers/trackers/whotracksme.json
+++ b/client/src/helpers/trackers/whotracksme.json
--- a/client/src/helpers/twosky.js
+++ b/client/src/helpers/twosky.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 import twosky from 'MainRoot/.twosky.json';

 export const {
--- a/client/src/helpers/validators.js
+++ b/client/src/helpers/validators.js
@@ -1,4 +1,5 @@
 import i18next from 'i18next';
+
 import {
    MAX_PORT,
    R_CIDR,
@@ -14,7 +15,7 @@ import {
    R_DOMAIN,
 } from './constants';
 import { ip4ToInt, isValidAbsolutePath } from './form';
-import { isIpInCidr } from './helpers';
+import { isIpInCidr, parseSubnetMask } from './helpers';

 // Validation functions
 // https://redux-form.com/8.3.0/examples/fieldlevelvalidation/
@@ -44,7 +45,7 @@ export const validateIpv4RangeEnd = (_, allValues) => {
    const { range_end, range_start } = allValues.v4;

    if (ip4ToInt(range_end) <= ip4ToInt(range_start)) {
-        return 'range_end_error';
+        return 'greater_range_start_error';
    }

    return undefined;
@@ -61,6 +62,89 @@ export const validateIpv4 = (value) => {
    return undefined;
 };

+/**
+ * @returns {undefined|string}
+ * @param _
+ * @param allValues
+ */
+export const validateNotInRange = (value, allValues) => {
+    if (!allValues.v4) {
+        return undefined;
+    }
+
+    const { range_start, range_end } = allValues.v4;
+
+    if (range_start && validateIpv4(range_start)) {
+        return 'form_error_ip4_range_start_format';
+    }
+
+    if (range_end && validateIpv4(range_end)) {
+        return 'form_error_ip4_range_end_format';
+    }
+
+    const isAboveMin = range_start && ip4ToInt(value) >= ip4ToInt(range_start);
+    const isBelowMax = range_end && ip4ToInt(value) <= ip4ToInt(range_end);
+
+    if (isAboveMin && isBelowMax) {
+        return i18next.t('out_of_range_error', {
+            start: range_start,
+            end: range_end,
+        });
+    }
+
+    if (!range_end && isAboveMin) {
+        return 'lower_range_start_error';
+    }
+
+    if (!range_start && isBelowMax) {
+        return 'greater_range_end_error';
+    }
+
+    return undefined;
+};
+
+/**
+ * @returns {undefined|string}
+ * @param _
+ * @param allValues
+ */
+export const validateGatewaySubnetMask = (_, allValues) => {
+    if (!allValues || !allValues.v4 || !allValues.v4.subnet_mask || !allValues.v4.gateway_ip) {
+        return 'gateway_or_subnet_invalid';
+    }
+
+    const { subnet_mask, gateway_ip } = allValues.v4;
+
+    if (validateIpv4(gateway_ip)) {
+        return 'form_error_ip4_gateway_format';
+    }
+
+    return parseSubnetMask(subnet_mask) ? undefined : 'gateway_or_subnet_invalid';
+};
+
+/**
+ * @returns {undefined|string}
+ * @param value
+ * @param allValues
+ */
+export const validateIpForGatewaySubnetMask = (value, allValues) => {
+    if (!allValues || !allValues.v4 || !value) {
+        return undefined;
+    }
+
+    const {
+        gateway_ip, subnet_mask,
+    } = allValues.v4;
+
+    const subnetPrefix = parseSubnetMask(subnet_mask);
+
+    if (!isIpInCidr(value, `${gateway_ip}/${subnetPrefix}`)) {
+        return 'subnet_error';
+    }
+
+    return undefined;
+};
+
 /**
 * @param value {string}
 * @returns {undefined|string}
@@ -83,6 +167,21 @@ export const validateClientId = (value) => {
    return undefined;
 };

+/**
+ * @param value {string}
+ * @returns {undefined|string}
+ */
+export const validateConfigClientId = (value) => {
+    if (!value) {
+        return undefined;
+    }
+    const formattedValue = value.trim();
+    if (formattedValue && !R_CLIENT_ID.test(formattedValue)) {
+        return 'form_error_client_id_format';
+    }
+    return undefined;
+};
+
 /**
 * @param value {string}
 * @returns {undefined|string}
@@ -131,17 +230,6 @@ export const validateMac = (value) => {
    return undefined;
 };

-/**
- * @param value {number}
- * @returns {boolean|*}
- */
-export const validateBiggerOrEqualZeroValue = (value) => {
-    if (value < 0) {
-        return 'form_error_negative';
-    }
-    return false;
-};
-
 /**
 * @param value {number}
 * @returns {undefined|string}
--- a/client/src/i18n.js
+++ b/client/src/i18n.js
@@ -12,6 +12,7 @@ import de from './__locales/de.json';
 import en from './__locales/en.json';
 import es from './__locales/es.json';
 import fa from './__locales/fa.json';
+import fi from './__locales/fi.json';
 import fr from './__locales/fr.json';
 import hr from './__locales/hr.json';
 import hu from './__locales/hu.json';
@@ -33,6 +34,7 @@ import srCS from './__locales/sr-cs.json';
 import sv from './__locales/sv.json';
 import th from './__locales/th.json';
 import tr from './__locales/tr.json';
+import uk from './__locales/uk.json';
 import vi from './__locales/vi.json';
 import zhCN from './__locales/zh-cn.json';
 import zhHK from './__locales/zh-hk.json';
@@ -40,108 +42,42 @@ import zhTW from './__locales/zh-tw.json';
 import { setHtmlLangAttr } from './helpers/helpers';

 const resources = {
-    en: {
-        translation: en,
-    },
-    enUS: {
-        translation: en,
-    },
-    vi: {
-        translation: vi,
-    },
-    ru: {
-        translation: ru,
-    },
-    es: {
-        translation: es,
-    },
-    fr: {
-        translation: fr,
-    },
-    ja: {
-        translation: ja,
-    },
-    sv: {
-        translation: sv,
-    },
-    'pt-br': {
-        translation: ptBR,
-    },
-    'zh-hk': {
-        translation: zhHK,
-    },
-    'zh-tw': {
-        translation: zhTW,
-    },
-    bg: {
-        translation: bg,
-    },
-    be: {
-        translation: be,
-    },
-    'zh-cn': {
-        translation: zhCN,
-    },
-    cs: {
-        translation: cs,
-    },
-    da: {
-        translation: da,
-    },
-    de: {
-        translation: de,
-    },
-    id: {
-        translation: id,
-    },
-    it: {
-        translation: it,
-    },
-    ko: {
-        translation: ko,
-    },
-    no: {
-        translation: no,
-    },
-    nl: {
-        translation: nl,
-    },
-    pl: {
-        translation: pl,
-    },
-    'pt-pt': {
-        translation: ptPT,
-    },
-    sk: {
-        translation: sk,
-    },
-    sl: {
-        translation: sl,
-    },
-    tr: {
-        translation: tr,
-    },
-    'sr-cs': {
-        translation: srCS,
-    },
-    hr: {
-        translation: hr,
-    },
-    hu: {
-        translation: hu,
-    },
-    fa: {
-        translation: fa,
-    },
-    th: {
-        translation: th,
-    },
-    ro: {
-        translation: ro,
-    },
-    'si-lk': {
-        translation: siLk,
-    },
+    be: { translation: be },
+    bg: { translation: bg },
+    cs: { translation: cs },
+    da: { translation: da },
+    de: { translation: de },
+    en: { translation: en },
+    'en-us': { translation: en },
+    es: { translation: es },
+    fa: { translation: fa },
+    fi: { translation: fi },
+    fr: { translation: fr },
+    hr: { translation: hr },
+    hu: { translation: hu },
+    id: { translation: id },
+    it: { translation: it },
+    ja: { translation: ja },
+    ko: { translation: ko },
+    nl: { translation: nl },
+    no: { translation: no },
+    pl: { translation: pl },
+    'pt-br': { translation: ptBR },
+    'pt-pt': { translation: ptPT },
+    ro: { translation: ro },
+    ru: { translation: ru },
+    'si-lk': { translation: siLk },
+    sk: { translation: sk },
+    sl: { translation: sl },
+    'sr-cs': { translation: srCS },
+    sv: { translation: sv },
+    th: { translation: th },
+    tr: { translation: tr },
+    uk: { translation: uk },
+    vi: { translation: vi },
+    'zh-cn': { translation: zhCN },
+    'zh-hk': { translation: zhHK },
+    'zh-tw': { translation: zhTW },
 };

 const availableLanguages = Object.keys(LANGUAGES);
--- a/client/src/install/Setup/Submit.js
+++ b/client/src/install/Setup/Submit.js
@@ -47,7 +47,6 @@ Submit = connect((state) => {
    };
 })(Submit);

-
 export default flow([
    withTranslation(),
    reduxForm({
--- a/go.mod
+++ b/go.mod
@@ -3,33 +3,34 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.16

 require (
-	github.com/AdguardTeam/dnsproxy v0.39.2
-	github.com/AdguardTeam/golibs v0.8.4
-	github.com/AdguardTeam/urlfilter v0.14.6
+	github.com/AdguardTeam/dnsproxy v0.40.3-0.20211229125141-da9b0c6cf76a
+	github.com/AdguardTeam/golibs v0.10.3
+	github.com/AdguardTeam/urlfilter v0.15.1
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ameshkov/dnscrypt/v2 v2.2.1
+	github.com/ameshkov/dnscrypt/v2 v2.2.3
 	github.com/digineo/go-ipset/v2 v2.2.1
-	github.com/fsnotify/fsnotify v1.4.9
+	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
 	github.com/google/go-cmp v0.5.5
+	github.com/google/gopacket v1.1.19
 	github.com/google/renameio v1.0.1
 	github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
 	github.com/kardianos/service v1.2.0
-	github.com/lucas-clemente/quic-go v0.21.1
+	github.com/lucas-clemente/quic-go v0.24.0
+	github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
 	github.com/mdlayher/netlink v1.4.0
-	github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf // indirect
-	github.com/miekg/dns v1.1.42
+	github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
+	github.com/miekg/dns v1.1.45
 	github.com/satori/go.uuid v1.2.0
-	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/ti-mo/netfilter v0.4.0
-	go.etcd.io/bbolt v1.3.5
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
-	golang.org/x/net v0.0.0-20210510120150-4163338589ed
-	golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
+	go.etcd.io/bbolt v1.3.6
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
+	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.4.0
 	howett.net/plist v0.0.0-20201203080718-1454fab16a06
 )

-replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
+require github.com/stretchr/objx v0.1.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -7,31 +7,28 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr
 dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
-github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf h1:gc042VRSIRSUzZ+Px6xQCRWNJZTaPkomisDfUZmoFNk=
-github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
-github.com/AdguardTeam/dnsproxy v0.39.2 h1:GqsR1S4fFfVsVCSrdrfa0RfsQ2u+MeNUMqDkxdTD3gU=
-github.com/AdguardTeam/dnsproxy v0.39.2/go.mod h1:aNXKNdTyKfgAG2OS712SYSaGIM9AasZsZxfiY4YiR/0=
+github.com/AdguardTeam/dnsproxy v0.40.3-0.20211229125141-da9b0c6cf76a h1:m+84VGYbDBq55L5apbHj1UqbZOcK1lqmnZVlBvzycmk=
+github.com/AdguardTeam/dnsproxy v0.40.3-0.20211229125141-da9b0c6cf76a/go.mod h1:+NlQl9lcVKjbecYlCumfjMzDk2BblySEX7WOHhQBbXk=
 github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
-github.com/AdguardTeam/golibs v0.8.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
-github.com/AdguardTeam/golibs v0.8.4 h1:jd6GwvQQtfSLOKn30qisDVujvas3q7Agjm3BOEqRWpQ=
-github.com/AdguardTeam/golibs v0.8.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
+github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY=
+github.com/AdguardTeam/golibs v0.10.3 h1:FBgk17zf35ESVWQKIqEUiqqB2bDaCBC8X5vMU760yB4=
+github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
-github.com/AdguardTeam/urlfilter v0.14.6 h1:emqoKZElooHACYehRBYENeKVN1a/rspxiqTIMYLuoIo=
-github.com/AdguardTeam/urlfilter v0.14.6/go.mod h1:klx4JbOfc4EaNb5lWLqOwfg+pVcyRukmoJRvO55lL5U=
+github.com/AdguardTeam/urlfilter v0.15.1 h1:dP6S7J6eFAk8MN4IDpUq2fZoBo8K8fmc6pXpxNIv84M=
+github.com/AdguardTeam/urlfilter v0.15.1/go.mod h1:EwXwrYhowP7bedqmOrmKKmQtpBYFyDNEBFQ+lxdUgQU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
+github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
-github.com/ameshkov/dnscrypt/v2 v2.1.3/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
-github.com/ameshkov/dnscrypt/v2 v2.2.1 h1:+cApRxzeBZqjUNsN26TTz7r5A8U+buON3kJgIYE3QWQ=
-github.com/ameshkov/dnscrypt/v2 v2.2.1/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
+github.com/ameshkov/dnscrypt/v2 v2.2.3 h1:X9UP5AHtwp46Ji+sGFfF/1Is6OPI/SjxLqhKpx0P5UI=
+github.com/ameshkov/dnscrypt/v2 v2.2.3/go.mod h1:xJB9cE1/GF+NB6EEQqRlkoa4bjcV2w7VYn1G+zVq7Bs=
 github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
 github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
 github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
@@ -56,17 +53,18 @@ github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:Pjfxu
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
+github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
+github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
+github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020 h1:mdi6AbCEoKCA1xKCmp7UtRB5fvGFlP92PvlhxgdvXEw=
 github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020/go.mod h1:KmHOjTUmJh/l04ukqPoBWPEZr9jwN05h5NXQl5C+DyY=
-github.com/go-test/deep v1.0.5 h1:AKODKU3pDH1RzZzm6YZu77YWtEAq6uh1rLIAQlay2qc=
-github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
@@ -83,6 +81,9 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -94,6 +95,8 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
+github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
@@ -106,11 +109,11 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 h1:NpTIlXznCStsY88jU+Gh1Dy5dt/jYV4z4uU8h2TUOt4=
+github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ=
-github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
-github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
+github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
 github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
@@ -134,17 +137,16 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lucas-clemente/quic-go v0.21.1 h1:uuhCcu885TE9u/piPYMChI/yqA1lXfaLUEx8uCMxf8w=
-github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
+github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
+github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
-github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
 github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
-github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
-github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
-github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
-github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
+github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
+github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
+github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
+github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
 github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
@@ -169,25 +171,31 @@ github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZ
 github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
 github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.42 h1:gWGe42RGaIqXQZ+r3WUGEKBEtvPHY2SXo4dqixDNxuY=
-github.com/miekg/dns v1.1.42/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/miekg/dns v1.1.45 h1:g5fRIhm9nx7g8osrAvgb16QJfmyMsyOCb+J7LSv+Qzk=
+github.com/miekg/dns v1.1.45/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
+github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
@@ -204,8 +212,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil v2.20.3+incompatible h1:0JVooMPsT7A7HqEYdydp/OfjSOYSjhXV7w1hkKj/NPQ=
-github.com/shirou/gopsutil v2.20.3+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
+github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
@@ -245,13 +253,19 @@ github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cb
 github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
 github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
 github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
+github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
+github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
+github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
+github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
 github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
-go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
+go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
@@ -262,15 +276,18 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
-golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -294,14 +311,21 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210908191846-a5e095526f91/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM=
+golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -312,6 +336,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -327,16 +352,17 @@ golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -347,24 +373,30 @@ golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 h1:hZR0X1kPW+nwyJ9xRxqZk1vx5RUObAPBdKVvXPDUH/E=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -376,7 +408,12 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
+golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -404,6 +441,9 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
@@ -422,8 +462,8 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/internal/aghalgo/aghalgo.go
+++ b/internal/aghalgo/aghalgo.go
@@ -0,0 +1,75 @@
+// Package aghalgo contains common generic algorithms and data structures.
+//
+// TODO(a.garipov): Update to use type parameters in Go 1.18.
+package aghalgo
+
+import (
+	"fmt"
+	"sort"
+)
+
+// comparable is an alias for interface{}.  Values passed as arguments of this
+// type alias must be comparable.
+//
+// TODO(a.garipov): Remove in Go 1.18.
+type comparable = interface{}
+
+// UniquenessValidator allows validating uniqueness of comparable items.
+type UniquenessValidator map[comparable]int64
+
+// Add adds a value to the validator.  v must not be nil.
+func (v UniquenessValidator) Add(elems ...comparable) {
+	for _, e := range elems {
+		v[e]++
+	}
+}
+
+// Merge returns a validator containing data from both v and other.
+func (v UniquenessValidator) Merge(other UniquenessValidator) (merged UniquenessValidator) {
+	merged = make(UniquenessValidator, len(v)+len(other))
+	for elem, num := range v {
+		merged[elem] += num
+	}
+
+	for elem, num := range other {
+		merged[elem] += num
+	}
+
+	return merged
+}
+
+// Validate returns an error enumerating all elements that aren't unique.
+// isBefore is an optional sorting function to make the error message
+// deterministic.
+func (v UniquenessValidator) Validate(isBefore func(a, b comparable) (less bool)) (err error) {
+	var dup []comparable
+	for elem, num := range v {
+		if num > 1 {
+			dup = append(dup, elem)
+		}
+	}
+
+	if len(dup) == 0 {
+		return nil
+	}
+
+	if isBefore != nil {
+		sort.Slice(dup, func(i, j int) (less bool) {
+			return isBefore(dup[i], dup[j])
+		})
+	}
+
+	return fmt.Errorf("duplicated values: %v", dup)
+}
+
+// IntIsBefore is a helper sort function for UniquenessValidator.Validate.
+// a and b must be of type int.
+func IntIsBefore(a, b comparable) (less bool) {
+	return a.(int) < b.(int)
+}
+
+// StringIsBefore is a helper sort function for UniquenessValidator.Validate.
+// a and b must be of type string.
+func StringIsBefore(a, b comparable) (less bool) {
+	return a.(string) < b.(string)
+}
--- a/internal/aghhttp/aghhttp.go
+++ b/internal/aghhttp/aghhttp.go
@@ -0,0 +1,24 @@
+// Package aghhttp provides some common methods to work with HTTP.
+package aghhttp
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+
+	"github.com/AdguardTeam/golibs/log"
+)
+
+// OK responds with word OK.
+func OK(w http.ResponseWriter) {
+	if _, err := io.WriteString(w, "OK\n"); err != nil {
+		log.Error("couldn't write body: %s", err)
+	}
+}
+
+// Error writes formatted message to w and also logs it.
+func Error(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
+	text := fmt.Sprintf(format, args...)
+	log.Error("%s %s: %s", r.Method, r.URL, text)
+	http.Error(w, text, code)
+}
--- a/internal/aghio/limitedreader.go
+++ b/internal/aghio/limitedreader.go
@@ -11,7 +11,7 @@ type LimitReachedError struct {
 	Limit int64
 }

-// Error implements error interface for LimitReachedError.
+// Error implements the error interface for LimitReachedError.
 //
 // TODO(a.garipov): Think about error string format.
 func (lre *LimitReachedError) Error() string {
@@ -35,7 +35,7 @@ func (lr *limitedReader) Read(p []byte) (n int, err error) {
 	}

 	if int64(len(p)) > lr.n {
-		p = p[0:lr.n]
+		p = p[:lr.n]
 	}

 	n, err = lr.r.Read(p)
--- a/internal/aghio/limitedreader_test.go
+++ b/internal/aghio/limitedreader_test.go
@@ -1,38 +1,38 @@
 package aghio

 import (
-	"fmt"
 	"io"
 	"strings"
 	"testing"

+	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

 func TestLimitReader(t *testing.T) {
 	testCases := []struct {
-		want error
-		name string
-		n    int64
+		wantErrMsg string
+		name       string
+		n          int64
 	}{{
-		want: nil,
-		name: "positive",
-		n:    1,
+		wantErrMsg: "",
+		name:       "positive",
+		n:          1,
 	}, {
-		want: nil,
-		name: "zero",
-		n:    0,
+		wantErrMsg: "",
+		name:       "zero",
+		n:          0,
 	}, {
-		want: fmt.Errorf("aghio: invalid n in LimitReader: -1"),
-		name: "negative",
-		n:    -1,
+		wantErrMsg: "aghio: invalid n in LimitReader: -1",
+		name:       "negative",
+		n:          -1,
 	}}

 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			_, err := LimitReader(nil, tc.n)
-			assert.Equal(t, tc.want, err)
+			testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
 		})
 	}
 }
@@ -73,36 +73,23 @@ func TestLimitedReader_Read(t *testing.T) {
 	}}

 	for _, tc := range testCases {
+		readCloser := io.NopCloser(strings.NewReader(tc.rStr))
+		lreader, err := LimitReader(readCloser, tc.limit)
+		require.NoError(t, err)
+		require.NotNil(t, lreader)
+
 		t.Run(tc.name, func(t *testing.T) {
-			readCloser := io.NopCloser(strings.NewReader(tc.rStr))
 			buf := make([]byte, tc.limit+1)
+			n, rerr := lreader.Read(buf)
+			require.Equal(t, rerr, tc.err)

-			lreader, err := LimitReader(readCloser, tc.limit)
-			require.NoError(t, err)
-
-			n, err := lreader.Read(buf)
-			require.Equal(t, tc.err, err)
 			assert.Equal(t, tc.want, n)
 		})
 	}
 }

 func TestLimitedReader_LimitReachedError(t *testing.T) {
-	testCases := []struct {
-		err  error
-		name string
-		want string
-	}{{
-		err: &LimitReachedError{
-			Limit: 0,
-		},
-		name: "simplest",
-		want: "attempted to read more than 0 bytes",
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.want, tc.err.Error())
-		})
-	}
+	testutil.AssertErrorMsg(t, "attempted to read more than 0 bytes", &LimitReachedError{
+		Limit: 0,
+	})
 }
--- a/internal/aghnet/addr.go
+++ b/internal/aghnet/addr.go
@@ -1,206 +0,0 @@
-package aghnet
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-
-	"github.com/AdguardTeam/golibs/errors"
-	"golang.org/x/net/idna"
-)
-
-// CloneIP returns a clone of an IP address.
-func CloneIP(ip net.IP) (clone net.IP) {
-	if ip != nil && len(ip) == 0 {
-		return net.IP{}
-	}
-
-	return append(clone, ip...)
-}
-
-// CloneMAC returns a clone of a MAC address.
-func CloneMAC(mac net.HardwareAddr) (clone net.HardwareAddr) {
-	if mac != nil && len(mac) == 0 {
-		return net.HardwareAddr{}
-	}
-
-	return append(clone, mac...)
-}
-
-// IPFromAddr returns an IP address from addr.  If addr is neither
-// a *net.TCPAddr nor a *net.UDPAddr, it returns nil.
-func IPFromAddr(addr net.Addr) (ip net.IP) {
-	switch addr := addr.(type) {
-	case *net.TCPAddr:
-		return addr.IP
-	case *net.UDPAddr:
-		return addr.IP
-	}
-
-	return nil
-}
-
-// IsValidHostOuterRune returns true if r is a valid initial or final rune for
-// a hostname label.
-func IsValidHostOuterRune(r rune) (ok bool) {
-	return (r >= 'a' && r <= 'z') ||
-		(r >= 'A' && r <= 'Z') ||
-		(r >= '0' && r <= '9')
-}
-
-// JoinHostPort is a convinient wrapper for net.JoinHostPort with port of type
-// int.
-func JoinHostPort(host string, port int) (hostport string) {
-	return net.JoinHostPort(host, strconv.Itoa(port))
-}
-
-// isValidHostRune returns true if r is a valid rune for a hostname label.
-func isValidHostRune(r rune) (ok bool) {
-	return r == '-' || IsValidHostOuterRune(r)
-}
-
-// ValidateHardwareAddress returns an error if hwa is not a valid EUI-48,
-// EUI-64, or 20-octet InfiniBand link-layer address.
-func ValidateHardwareAddress(hwa net.HardwareAddr) (err error) {
-	defer func() { err = errors.Annotate(err, "validating hardware address %q: %w", hwa) }()
-
-	switch l := len(hwa); l {
-	case 0:
-		return errors.Error("address is empty")
-	case 6, 8, 20:
-		return nil
-	default:
-		return fmt.Errorf("bad len: %d", l)
-	}
-}
-
-// maxDomainLabelLen is the maximum allowed length of a domain name label
-// according to RFC 1035.
-const maxDomainLabelLen = 63
-
-// MaxDomainNameLen is the maximum allowed length of a full domain name
-// according to RFC 1035.
-//
-// See https://stackoverflow.com/a/32294443/1892060.
-const MaxDomainNameLen = 253
-
-// ValidateDomainNameLabel returns an error if label is not a valid label of
-// a domain name.
-func ValidateDomainNameLabel(label string) (err error) {
-	defer func() { err = errors.Annotate(err, "validating label %q: %w", label) }()
-
-	l := len(label)
-	if l > maxDomainLabelLen {
-		return fmt.Errorf("label is too long, max: %d", maxDomainLabelLen)
-	} else if l == 0 {
-		return errors.Error("label is empty")
-	}
-
-	if r := label[0]; !IsValidHostOuterRune(rune(r)) {
-		return fmt.Errorf("invalid char %q at index %d", r, 0)
-	} else if l == 1 {
-		return nil
-	}
-
-	for i, r := range label[1 : l-1] {
-		if !isValidHostRune(r) {
-			return fmt.Errorf("invalid char %q at index %d", r, i+1)
-		}
-	}
-
-	if r := label[l-1]; !IsValidHostOuterRune(rune(r)) {
-		return fmt.Errorf("invalid char %q at index %d", r, l-1)
-	}
-
-	return nil
-}
-
-// ValidateDomainName validates the domain name in accordance to RFC 952, RFC
-// 1035, and with RFC-1123's inclusion of digits at the start of the host.  It
-// doesn't validate against two or more hyphens to allow punycode and
-// internationalized domains.
-//
-// TODO(a.garipov): After making sure that this works correctly, port this into
-// module golibs.
-func ValidateDomainName(name string) (err error) {
-	defer func() { err = errors.Annotate(err, "validating domain name %q: %w", name) }()
-
-	name, err = idna.ToASCII(name)
-	if err != nil {
-		return err
-	}
-
-	l := len(name)
-	if l == 0 {
-		return errors.Error("domain name is empty")
-	} else if l > MaxDomainNameLen {
-		return fmt.Errorf("too long, max: %d", MaxDomainNameLen)
-	}
-
-	labels := strings.Split(name, ".")
-	for i, l := range labels {
-		err = ValidateDomainNameLabel(l)
-		if err != nil {
-			return fmt.Errorf("invalid domain name label at index %d: %w", i, err)
-		}
-	}
-
-	return nil
-}
-
-// The maximum lengths of generated hostnames for different IP versions.
-const (
-	ipv4HostnameMaxLen = len("192-168-100-100")
-	ipv6HostnameMaxLen = len("ff80-f076-0000-0000-0000-0000-0000-0010")
-)
-
-// generateIPv4Hostname generates the hostname for specific IP version.
-func generateIPv4Hostname(ipv4 net.IP) (hostname string) {
-	hnData := make([]byte, 0, ipv4HostnameMaxLen)
-	for i, part := range ipv4 {
-		if i > 0 {
-			hnData = append(hnData, '-')
-		}
-		hnData = strconv.AppendUint(hnData, uint64(part), 10)
-	}
-
-	return string(hnData)
-}
-
-// generateIPv6Hostname generates the hostname for specific IP version.
-func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
-	hnData := make([]byte, 0, ipv6HostnameMaxLen)
-	for i, partsNum := 0, net.IPv6len/2; i < partsNum; i++ {
-		if i > 0 {
-			hnData = append(hnData, '-')
-		}
-		for _, val := range ipv6[i*2 : i*2+2] {
-			if val < 10 {
-				hnData = append(hnData, '0')
-			}
-			hnData = strconv.AppendUint(hnData, uint64(val), 16)
-		}
-	}
-
-	return string(hnData)
-}
-
-// GenerateHostname generates the hostname from ip.  In case of using IPv4 the
-// result should be like:
-//
-//   192-168-10-1
-//
-// In case of using IPv6, the result is like:
-//
-//   ff80-f076-0000-0000-0000-0000-0000-0010
-//
-func GenerateHostname(ip net.IP) (hostname string) {
-	if ipv4 := ip.To4(); ipv4 != nil {
-		return generateIPv4Hostname(ipv4)
-	} else if ipv6 := ip.To16(); ipv6 != nil {
-		return generateIPv6Hostname(ipv6)
-	}
-
-	return ""
-}
--- a/internal/aghnet/addr_test.go
+++ b/internal/aghnet/addr_test.go
@@ -1,228 +0,0 @@
-package aghnet
-
-import (
-	"net"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCloneIP(t *testing.T) {
-	assert.Equal(t, net.IP(nil), CloneIP(nil))
-	assert.Equal(t, net.IP{}, CloneIP(net.IP{}))
-
-	ip := net.IP{1, 2, 3, 4}
-	clone := CloneIP(ip)
-	assert.Equal(t, ip, clone)
-	assert.NotSame(t, &ip[0], &clone[0])
-}
-
-func TestCloneMAC(t *testing.T) {
-	assert.Equal(t, net.HardwareAddr(nil), CloneMAC(nil))
-	assert.Equal(t, net.HardwareAddr{}, CloneMAC(net.HardwareAddr{}))
-
-	mac := net.HardwareAddr{0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC}
-	clone := CloneMAC(mac)
-	assert.Equal(t, mac, clone)
-	assert.NotSame(t, &mac[0], &clone[0])
-}
-
-func TestIPFromAddr(t *testing.T) {
-	ip := net.IP{1, 2, 3, 4}
-	assert.Equal(t, net.IP(nil), IPFromAddr(nil))
-	assert.Equal(t, net.IP(nil), IPFromAddr(struct{ net.Addr }{}))
-	assert.Equal(t, ip, IPFromAddr(&net.TCPAddr{IP: ip}))
-	assert.Equal(t, ip, IPFromAddr(&net.UDPAddr{IP: ip}))
-}
-
-func TestValidateHardwareAddress(t *testing.T) {
-	testCases := []struct {
-		name       string
-		wantErrMsg string
-		in         net.HardwareAddr
-	}{{
-		name:       "success_eui_48",
-		wantErrMsg: "",
-		in:         net.HardwareAddr{0x00, 0x01, 0x02, 0x03, 0x04, 0x05},
-	}, {
-		name:       "success_eui_64",
-		wantErrMsg: "",
-		in:         net.HardwareAddr{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
-	}, {
-		name:       "success_infiniband",
-		wantErrMsg: "",
-		in: net.HardwareAddr{
-			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-			0x10, 0x11, 0x12, 0x13,
-		},
-	}, {
-		name:       "error_nil",
-		wantErrMsg: `validating hardware address "": address is empty`,
-		in:         nil,
-	}, {
-		name:       "error_empty",
-		wantErrMsg: `validating hardware address "": address is empty`,
-		in:         net.HardwareAddr{},
-	}, {
-		name:       "error_bad",
-		wantErrMsg: `validating hardware address "00:01:02:03": bad len: 4`,
-		in:         net.HardwareAddr{0x00, 0x01, 0x02, 0x03},
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateHardwareAddress(tc.in)
-			if tc.wantErrMsg == "" {
-				assert.NoError(t, err)
-			} else {
-				require.Error(t, err)
-
-				assert.Equal(t, tc.wantErrMsg, err.Error())
-			}
-		})
-	}
-}
-
-func TestJoinHostPort(t *testing.T) {
-	assert.Equal(t, ":0", JoinHostPort("", 0))
-	assert.Equal(t, "host:12345", JoinHostPort("host", 12345))
-	assert.Equal(t, "1.2.3.4:12345", JoinHostPort("1.2.3.4", 12345))
-	assert.Equal(t, "[1234::5678]:12345", JoinHostPort("1234::5678", 12345))
-	assert.Equal(t, "[1234::5678%lo]:12345", JoinHostPort("1234::5678%lo", 12345))
-}
-
-func repeatStr(b *strings.Builder, s string, n int) {
-	for i := 0; i < n; i++ {
-		_, _ = b.WriteString(s)
-	}
-}
-
-func TestValidateDomainName(t *testing.T) {
-	b := &strings.Builder{}
-	repeatStr(b, "a", 255)
-	longDomainName := b.String()
-
-	b.Reset()
-	repeatStr(b, "a", 64)
-	longLabel := b.String()
-
-	_, _ = b.WriteString(".com")
-	longLabelDomainName := b.String()
-
-	testCases := []struct {
-		name       string
-		in         string
-		wantErrMsg string
-	}{{
-		name:       "success",
-		in:         "example.com",
-		wantErrMsg: "",
-	}, {
-		name:       "success_idna",
-		in:         "пример.рф",
-		wantErrMsg: "",
-	}, {
-		name:       "success_one",
-		in:         "e",
-		wantErrMsg: "",
-	}, {
-		name:       "empty",
-		in:         "",
-		wantErrMsg: `validating domain name "": domain name is empty`,
-	}, {
-		name: "bad_symbol",
-		in:   "!!!",
-		wantErrMsg: `validating domain name "!!!": invalid domain name label at index 0: ` +
-			`validating label "!!!": invalid char '!' at index 0`,
-	}, {
-		name:       "bad_length",
-		in:         longDomainName,
-		wantErrMsg: `validating domain name "` + longDomainName + `": too long, max: 253`,
-	}, {
-		name: "bad_label_length",
-		in:   longLabelDomainName,
-		wantErrMsg: `validating domain name "` + longLabelDomainName + `": ` +
-			`invalid domain name label at index 0: validating label "` + longLabel +
-			`": label is too long, max: 63`,
-	}, {
-		name: "bad_label_empty",
-		in:   "example..com",
-		wantErrMsg: `validating domain name "example..com": ` +
-			`invalid domain name label at index 1: ` +
-			`validating label "": label is empty`,
-	}, {
-		name: "bad_label_first_symbol",
-		in:   "example.-aa.com",
-		wantErrMsg: `validating domain name "example.-aa.com": ` +
-			`invalid domain name label at index 1: ` +
-			`validating label "-aa": invalid char '-' at index 0`,
-	}, {
-		name: "bad_label_last_symbol",
-		in:   "example-.aa.com",
-		wantErrMsg: `validating domain name "example-.aa.com": ` +
-			`invalid domain name label at index 0: ` +
-			`validating label "example-": invalid char '-' at index 7`,
-	}, {
-		name: "bad_label_symbol",
-		in:   "example.a!!!.com",
-		wantErrMsg: `validating domain name "example.a!!!.com": ` +
-			`invalid domain name label at index 1: ` +
-			`validating label "a!!!": invalid char '!' at index 1`,
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := ValidateDomainName(tc.in)
-			if tc.wantErrMsg == "" {
-				assert.NoError(t, err)
-			} else {
-				require.Error(t, err)
-
-				assert.Equal(t, tc.wantErrMsg, err.Error())
-			}
-		})
-	}
-}
-
-func TestGenerateHostName(t *testing.T) {
-	testCases := []struct {
-		name string
-		want string
-		ip   net.IP
-	}{{
-		name: "good_ipv4",
-		want: "127-0-0-1",
-		ip:   net.IP{127, 0, 0, 1},
-	}, {
-		name: "bad_ipv4",
-		want: "",
-		ip:   net.IP{127, 0, 0, 1, 0},
-	}, {
-		name: "good_ipv6",
-		want: "fe00-0000-0000-0000-0000-0000-0000-0001",
-		ip:   net.ParseIP("fe00::1"),
-	}, {
-		name: "bad_ipv6",
-		want: "",
-		ip: net.IP{
-			0xff, 0xff, 0xff, 0xff,
-			0xff, 0xff, 0xff, 0xff,
-			0xff, 0xff, 0xff, 0xff,
-			0xff, 0xff, 0xff,
-		},
-	}, {
-		name: "nil",
-		want: "",
-		ip:   nil,
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			hostname := GenerateHostname(tc.ip)
-			assert.Equal(t, tc.want, hostname)
-		})
-	}
-}
--- a/internal/aghnet/dhcp.go
+++ b/internal/aghnet/dhcp.go
@@ -0,0 +1,6 @@
+package aghnet
+
+// CheckOtherDHCP tries to discover another DHCP server in the network.
+func CheckOtherDHCP(ifaceName string) (ok4, ok6 bool, err4, err6 error) {
+	return checkOtherDHCP(ifaceName)
+}
--- a/internal/aghnet/dhcp_unix.go
+++ b/internal/aghnet/dhcp_unix.go
@@ -1,95 +1,132 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris

-package dhcpd
+package aghnet

 import (
 	"bytes"
 	"fmt"
 	"net"
 	"os"
-	"runtime"
 	"time"

-	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
-	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/insomniacslk/dhcp/dhcpv4"
-	"github.com/insomniacslk/dhcp/dhcpv4/nclient4"
 	"github.com/insomniacslk/dhcp/dhcpv6"
 	"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
 	"github.com/insomniacslk/dhcp/iana"
 )

-// CheckIfOtherDHCPServersPresentV4 sends a DHCP request to the specified network interface,
-// and waits for a response for a period defined by defaultDiscoverTime
-func CheckIfOtherDHCPServersPresentV4(ifaceName string) (ok bool, err error) {
+// defaultDiscoverTime is the
+const defaultDiscoverTime = 3 * time.Second
+
+func checkOtherDHCP(ifaceName string) (ok4, ok6 bool, err4, err6 error) {
 	iface, err := net.InterfaceByName(ifaceName)
 	if err != nil {
-		return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err)
+		err = fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err)
+		err4, err6 = err, err
+
+		return false, false, err4, err6
 	}

-	ifaceIPNet, err := ifaceIPAddrs(iface, ipVersion4)
-	if err != nil {
-		return false, fmt.Errorf("getting ipv4 addrs for iface %s: %w", ifaceName, err)
-	}
-	if len(ifaceIPNet) == 0 {
-		return false, fmt.Errorf("interface %s has no ipv4 addresses", ifaceName)
+	ok4, err4 = checkOtherDHCPv4(iface)
+	ok6, err6 = checkOtherDHCPv6(iface)
+
+	return ok4, ok6, err4, err6
+}
+
+// ifaceIPv4Subnet returns the first suitable IPv4 subnetwork iface has.
+func ifaceIPv4Subnet(iface *net.Interface) (subnet *net.IPNet, err error) {
+	var addrs []net.Addr
+	if addrs, err = iface.Addrs(); err != nil {
+		return nil, err
 	}

-	// TODO(a.garipov): Find out what this is about.  Perhaps this
-	// information is outdated or at least incomplete.
-	if runtime.GOOS == "darwin" {
-		return false, aghos.Unsupported("CheckIfOtherDHCPServersPresentV4")
+	for _, a := range addrs {
+		switch a := a.(type) {
+		case *net.IPAddr:
+			subnet = &net.IPNet{
+				IP:   a.IP,
+				Mask: a.IP.DefaultMask(),
+			}
+		case *net.IPNet:
+			subnet = a
+		default:
+			continue
+		}
+
+		if ip4 := subnet.IP.To4(); ip4 != nil {
+			subnet.IP = ip4
+
+			return subnet, nil
+		}
 	}

-	srcIP := ifaceIPNet[0]
-	src := aghnet.JoinHostPort(srcIP.String(), 68)
-	dst := "255.255.255.255:67"
+	return nil, fmt.Errorf("interface %s has no ipv4 addresses", iface.Name)
+}

-	hostname, _ := os.Hostname()
-
-	req, err := dhcpv4.NewDiscovery(iface.HardwareAddr)
-	if err != nil {
-		return false, fmt.Errorf("dhcpv4.NewDiscovery: %w", err)
-	}
-	req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr))
-	req.Options.Update(dhcpv4.OptHostName(hostname))
-
-	// resolve 0.0.0.0:68
-	udpAddr, err := net.ResolveUDPAddr("udp4", src)
-	if err != nil {
-		return false, fmt.Errorf("couldn't resolve UDP address %s: %w", src, err)
+// checkOtherDHCPv4 sends a DHCP request to the specified network interface, and
+// waits for a response for a period defined by defaultDiscoverTime.
+func checkOtherDHCPv4(iface *net.Interface) (ok bool, err error) {
+	var subnet *net.IPNet
+	if subnet, err = ifaceIPv4Subnet(iface); err != nil {
+		return false, err
 	}

-	if !udpAddr.IP.To4().Equal(srcIP) {
-		return false, fmt.Errorf("resolved UDP address is not %s: %w", src, err)
-	}
-
-	// resolve 255.255.255.255:67
-	dstAddr, err := net.ResolveUDPAddr("udp4", dst)
-	if err != nil {
+	// Resolve broadcast addr.
+	dst := netutil.IPPort{
+		IP:   BroadcastFromIPNet(subnet),
+		Port: 67,
+	}.String()
+	var dstAddr *net.UDPAddr
+	if dstAddr, err = net.ResolveUDPAddr("udp4", dst); err != nil {
 		return false, fmt.Errorf("couldn't resolve UDP address %s: %w", dst, err)
 	}

-	// bind to 0.0.0.0:68
-	log.Tracef("Listening to udp4 %+v", udpAddr)
-	c, err := nclient4.NewRawUDPConn(ifaceName, 68)
-	if err != nil {
-		return false, fmt.Errorf("couldn't listen on :68: %w", err)
-	}
-	if c != nil {
-		defer func() { err = errors.WithDeferred(err, c.Close()) }()
+	var hostname string
+	if hostname, err = os.Hostname(); err != nil {
+		return false, fmt.Errorf("couldn't get hostname: %w", err)
 	}

-	// send to 255.255.255.255:67
-	_, err = c.WriteTo(req.ToBytes(), dstAddr)
-	if err != nil {
-		return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err)
+	return discover4(iface, dstAddr, hostname)
+}
+
+func discover4(iface *net.Interface, dstAddr *net.UDPAddr, hostname string) (ok bool, err error) {
+	var req *dhcpv4.DHCPv4
+	if req, err = dhcpv4.NewDiscovery(iface.HardwareAddr); err != nil {
+		return false, fmt.Errorf("dhcpv4.NewDiscovery: %w", err)
+	}
+
+	req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr))
+	req.Options.Update(dhcpv4.OptHostName(hostname))
+	req.SetBroadcast()
+
+	// Bind to 0.0.0.0:68.
+	//
+	// On OpenBSD binding to the port 68 competes with dhclient's binding,
+	// so that all incoming packets are ignored and the discovering process
+	// is spoiled.
+	//
+	// It's also known that listening on the specified interface's address
+	// ignores broadcasted packets when reading.
+	var c net.PacketConn
+	if c, err = listenPacketReusable(iface.Name, "udp4", ":68"); err != nil {
+		return false, fmt.Errorf("couldn't listen on :68: %w", err)
+	}
+	defer func() { err = errors.WithDeferred(err, c.Close()) }()
+
+	// Send to broadcast.
+	if _, err = c.WriteTo(req.ToBytes(), dstAddr); err != nil {
+		return false, fmt.Errorf("couldn't send a packet to %s: %w", dstAddr, err)
 	}

 	for {
+		if err = c.SetDeadline(time.Now().Add(defaultDiscoverTime)); err != nil {
+			return false, fmt.Errorf("setting deadline: %w", err)
+		}
+
 		var next bool
 		ok, next, err = tryConn4(req, c, iface)
 		if next {
@@ -116,11 +153,6 @@ func tryConn4(req *dhcpv4.DHCPv4, c net.PacketConn, iface *net.Interface) (ok, n
 	log.Tracef("dhcpv4: waiting %v for an answer", defaultDiscoverTime)

 	b := make([]byte, 1500)
-	err = c.SetDeadline(time.Now().Add(defaultDiscoverTime))
-	if err != nil {
-		return false, false, fmt.Errorf("setting deadline: %w", err)
-	}
-
 	n, _, err := c.ReadFrom(b)
 	if err != nil {
 		if isTimeout(err) {
@@ -159,31 +191,21 @@ func tryConn4(req *dhcpv4.DHCPv4, c net.PacketConn, iface *net.Interface) (ok, n
 	return true, false, nil
 }

-// CheckIfOtherDHCPServersPresentV6 sends a DHCP request to the specified network interface,
-// and waits for a response for a period defined by defaultDiscoverTime
-func CheckIfOtherDHCPServersPresentV6(ifaceName string) (ok bool, err error) {
-	iface, err := net.InterfaceByName(ifaceName)
+// checkOtherDHCPv6 sends a DHCP request to the specified network interface, and
+// waits for a response for a period defined by defaultDiscoverTime.
+func checkOtherDHCPv6(iface *net.Interface) (ok bool, err error) {
+	ifaceIPNet, err := IfaceIPAddrs(iface, IPVersion6)
 	if err != nil {
-		return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err)
-	}
-
-	ifaceIPNet, err := ifaceIPAddrs(iface, ipVersion6)
-	if err != nil {
-		return false, fmt.Errorf("getting ipv6 addrs for iface %s: %w", ifaceName, err)
+		return false, fmt.Errorf("getting ipv6 addrs for iface %s: %w", iface.Name, err)
 	}
 	if len(ifaceIPNet) == 0 {
-		return false, fmt.Errorf("interface %s has no ipv6 addresses", ifaceName)
+		return false, fmt.Errorf("interface %s has no ipv6 addresses", iface.Name)
 	}

 	srcIP := ifaceIPNet[0]
-	src := aghnet.JoinHostPort(srcIP.String(), 546)
+	src := netutil.JoinHostPort(srcIP.String(), 546)
 	dst := "[ff02::1:2]:547"

-	req, err := dhcpv6.NewSolicit(iface.HardwareAddr)
-	if err != nil {
-		return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err)
-	}
-
 	udpAddr, err := net.ResolveUDPAddr("udp6", src)
 	if err != nil {
 		return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err)
@@ -198,18 +220,25 @@ func CheckIfOtherDHCPServersPresentV6(ifaceName string) (ok bool, err error) {
 		return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err)
 	}

+	return discover6(iface, udpAddr, dstAddr)
+}
+
+func discover6(iface *net.Interface, udpAddr, dstAddr *net.UDPAddr) (ok bool, err error) {
+	req, err := dhcpv6.NewSolicit(iface.HardwareAddr)
+	if err != nil {
+		return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err)
+	}
+
 	log.Debug("DHCPv6: Listening to udp6 %+v", udpAddr)
-	c, err := nclient6.NewIPv6UDPConn(ifaceName, dhcpv6.DefaultClientPort)
+	c, err := nclient6.NewIPv6UDPConn(iface.Name, dhcpv6.DefaultClientPort)
 	if err != nil {
 		return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err)
 	}
-	if c != nil {
-		defer func() { err = errors.WithDeferred(err, c.Close()) }()
-	}
+	defer func() { err = errors.WithDeferred(err, c.Close()) }()

 	_, err = c.WriteTo(req.ToBytes(), dstAddr)
 	if err != nil {
-		return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err)
+		return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dstAddr, err)
 	}

 	for {
@@ -288,3 +317,15 @@ func tryConn6(req *dhcpv6.Message, c net.PacketConn) (ok, next bool, err error)

 	return true, false, nil
 }
+
+// isTimeout returns true if err is an operation timeout error from net package.
+//
+// TODO(e.burkov):  Consider moving into netutil.
+func isTimeout(err error) (ok bool) {
+	var operr *net.OpError
+	if errors.As(err, &operr) {
+		return operr.Timeout()
+	}
+
+	return false
+}
--- a/internal/aghnet/dhcp_windows.go
+++ b/internal/aghnet/dhcp_windows.go
@@ -0,0 +1,13 @@
+//go:build windows
+// +build windows
+
+package aghnet
+
+import "github.com/AdguardTeam/AdGuardHome/internal/aghos"
+
+func checkOtherDHCP(ifaceName string) (ok4, ok6 bool, err4, err6 error) {
+	return false,
+		false,
+		aghos.Unsupported("CheckIfOtherDHCPServersPresentV4"),
+		aghos.Unsupported("CheckIfOtherDHCPServersPresentV6")
+}
--- a/internal/aghnet/etchostscontainer.go
+++ b/internal/aghnet/etchostscontainer.go
@@ -1,384 +0,0 @@
-package aghnet
-
-import (
-	"bufio"
-	"net"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
-	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/log"
-	"github.com/fsnotify/fsnotify"
-	"github.com/miekg/dns"
-)
-
-type onChangedT func()
-
-// EtcHostsContainer - automatic DNS records
-//
-// TODO(e.burkov): Move the logic under interface.  Refactor.  Probably remove
-// the resolving logic.
-type EtcHostsContainer struct {
-	// lock protects table and tableReverse.
-	lock sync.RWMutex
-	// table is the host-to-IPs map.
-	table map[string][]net.IP
-	// tableReverse is the IP-to-hosts map.  The type of the values in the
-	// map is []string.
-	tableReverse *IPMap
-
-	hostsFn   string            // path to the main hosts-file
-	hostsDirs []string          // paths to OS-specific directories with hosts-files
-	watcher   *fsnotify.Watcher // file and directory watcher object
-
-	// onlyWritesChan used to contain only writing events from watcher.
-	onlyWritesChan chan fsnotify.Event
-
-	onChanged onChangedT // notification to other modules
-}
-
-// SetOnChanged - set callback function that will be called when the data is changed
-func (ehc *EtcHostsContainer) SetOnChanged(onChanged onChangedT) {
-	ehc.onChanged = onChanged
-}
-
-// Notify other modules
-func (ehc *EtcHostsContainer) notify() {
-	if ehc.onChanged == nil {
-		return
-	}
-	ehc.onChanged()
-}
-
-// Init - initialize
-// hostsFn: Override default name for the hosts-file (optional)
-func (ehc *EtcHostsContainer) Init(hostsFn string) {
-	ehc.table = make(map[string][]net.IP)
-	ehc.onlyWritesChan = make(chan fsnotify.Event, 2)
-
-	ehc.hostsFn = "/etc/hosts"
-	if runtime.GOOS == "windows" {
-		ehc.hostsFn = os.ExpandEnv("$SystemRoot\\system32\\drivers\\etc\\hosts")
-	}
-	if len(hostsFn) != 0 {
-		ehc.hostsFn = hostsFn
-	}
-
-	if aghos.IsOpenWrt() {
-		// OpenWrt: "/tmp/hosts/dhcp.cfg01411c".
-		ehc.hostsDirs = append(ehc.hostsDirs, "/tmp/hosts")
-	}
-
-	// Load hosts initially
-	ehc.updateHosts()
-
-	var err error
-	ehc.watcher, err = fsnotify.NewWatcher()
-	if err != nil {
-		log.Error("etchosts: %s", err)
-	}
-}
-
-// Start - start module
-func (ehc *EtcHostsContainer) Start() {
-	if ehc == nil {
-		return
-	}
-
-	log.Debug("Start etchostscontainer module")
-
-	ehc.updateHosts()
-
-	if ehc.watcher != nil {
-		go ehc.watcherLoop()
-
-		err := ehc.watcher.Add(ehc.hostsFn)
-		if err != nil {
-			log.Error("Error while initializing watcher for a file %s: %s", ehc.hostsFn, err)
-		}
-
-		for _, dir := range ehc.hostsDirs {
-			err = ehc.watcher.Add(dir)
-			if err != nil {
-				log.Error("Error while initializing watcher for a directory %s: %s", dir, err)
-			}
-		}
-	}
-}
-
-// Close - close module
-func (ehc *EtcHostsContainer) Close() {
-	if ehc == nil {
-		return
-	}
-
-	if ehc.watcher != nil {
-		_ = ehc.watcher.Close()
-	}
-
-	// Don't close onlyWritesChan here and let onlyWrites close it after
-	// watcher.Events is closed to prevent close races.
-}
-
-// Process returns the list of IP addresses for the hostname or nil if nothing
-// found.
-func (ehc *EtcHostsContainer) Process(host string, qtype uint16) []net.IP {
-	if qtype == dns.TypePTR {
-		return nil
-	}
-
-	var ipsCopy []net.IP
-	ehc.lock.RLock()
-	defer ehc.lock.RUnlock()
-
-	if ips, ok := ehc.table[host]; ok {
-		ipsCopy = make([]net.IP, len(ips))
-		copy(ipsCopy, ips)
-	}
-
-	log.Debug("etchosts: answer: %s -> %v", host, ipsCopy)
-	return ipsCopy
-}
-
-// ProcessReverse processes a PTR request.  It returns nil if nothing is found.
-func (ehc *EtcHostsContainer) ProcessReverse(addr string, qtype uint16) (hosts []string) {
-	if qtype != dns.TypePTR {
-		return nil
-	}
-
-	ip := UnreverseAddr(addr)
-	if ip == nil {
-		return nil
-	}
-
-	ehc.lock.RLock()
-	defer ehc.lock.RUnlock()
-
-	v, ok := ehc.tableReverse.Get(ip)
-	if !ok {
-		return nil
-	}
-
-	hosts, ok = v.([]string)
-	if !ok {
-		log.Error("etchosts: bad type %T in tableReverse for %s", v, ip)
-
-		return nil
-	} else if len(hosts) == 0 {
-		return nil
-	}
-
-	log.Debug("etchosts: reverse-lookup: %s -> %s", addr, hosts)
-
-	return hosts
-}
-
-// List returns an IP-to-hostnames table.  The type of the values in the map is
-// []string.  It is safe for concurrent use.
-func (ehc *EtcHostsContainer) List() (ipToHosts *IPMap) {
-	ehc.lock.RLock()
-	defer ehc.lock.RUnlock()
-
-	return ehc.tableReverse.ShallowClone()
-}
-
-// update table
-func (ehc *EtcHostsContainer) updateTable(table map[string][]net.IP, host string, ipAddr net.IP) {
-	ips, ok := table[host]
-	if ok {
-		for _, ip := range ips {
-			if ip.Equal(ipAddr) {
-				// IP already exists: don't add duplicates
-				ok = false
-				break
-			}
-		}
-		if !ok {
-			ips = append(ips, ipAddr)
-			table[host] = ips
-		}
-	} else {
-		table[host] = []net.IP{ipAddr}
-		ok = true
-	}
-	if ok {
-		log.Debug("etchosts: added %s -> %s", ipAddr, host)
-	}
-}
-
-// updateTableRev updates the reverse address table.
-func (ehc *EtcHostsContainer) updateTableRev(tableRev *IPMap, newHost string, ip net.IP) {
-	v, ok := tableRev.Get(ip)
-	if !ok {
-		tableRev.Set(ip, []string{newHost})
-		log.Debug("etchosts: added reverse-address %s -> %s", ip, newHost)
-
-		return
-	}
-
-	hosts, _ := v.([]string)
-	for _, host := range hosts {
-		if host == newHost {
-			return
-		}
-	}
-
-	hosts = append(hosts, newHost)
-	tableRev.Set(ip, hosts)
-
-	log.Debug("etchosts: added reverse-address %s -> %s", ip, newHost)
-}
-
-// parseHostsLine parses hosts from the fields.
-func parseHostsLine(fields []string) (hosts []string) {
-	for _, f := range fields {
-		hashIdx := strings.IndexByte(f, '#')
-		if hashIdx == 0 {
-			// The rest of the fields are a part of the comment.
-			// Skip immediately.
-			return
-		} else if hashIdx > 0 {
-			// Only a part of the field is a comment.
-			hosts = append(hosts, f[:hashIdx])
-
-			return hosts
-		}
-
-		hosts = append(hosts, f)
-	}
-
-	return hosts
-}
-
-// load reads IP-hostname pairs from the hosts file.  Multiple hostnames per
-// line for one IP are supported.
-func (ehc *EtcHostsContainer) load(
-	table map[string][]net.IP,
-	tableRev *IPMap,
-	fn string,
-) {
-	f, err := os.Open(fn)
-	if err != nil {
-		log.Error("etchosts: %s", err)
-
-		return
-	}
-
-	defer func() {
-		derr := f.Close()
-		if derr != nil {
-			log.Error("etchosts: closing file: %s", err)
-		}
-	}()
-
-	log.Debug("etchosts: loading hosts from file %s", fn)
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		line := strings.TrimSpace(s.Text())
-		fields := strings.Fields(line)
-		if len(fields) < 2 {
-			continue
-		}
-
-		ip := net.ParseIP(fields[0])
-		if ip == nil {
-			continue
-		}
-
-		hosts := parseHostsLine(fields[1:])
-		for _, host := range hosts {
-			ehc.updateTable(table, host, ip)
-			ehc.updateTableRev(tableRev, host, ip)
-		}
-	}
-
-	err = s.Err()
-	if err != nil {
-		log.Error("etchosts: %s", err)
-	}
-}
-
-// onlyWrites is a filter for (*fsnotify.Watcher).Events.
-func (ehc *EtcHostsContainer) onlyWrites() {
-	for event := range ehc.watcher.Events {
-		if event.Op&fsnotify.Write == fsnotify.Write {
-			ehc.onlyWritesChan <- event
-		}
-	}
-
-	close(ehc.onlyWritesChan)
-}
-
-// Receive notifications from fsnotify package
-func (ehc *EtcHostsContainer) watcherLoop() {
-	go ehc.onlyWrites()
-	for {
-		select {
-		case event, ok := <-ehc.onlyWritesChan:
-			if !ok {
-				return
-			}
-
-			// Assume that we sometimes have the same event occurred
-			// several times.
-			repeat := true
-			for repeat {
-				select {
-				case _, ok = <-ehc.onlyWritesChan:
-					repeat = ok
-				default:
-					repeat = false
-				}
-			}
-
-			if event.Op&fsnotify.Write == fsnotify.Write {
-				log.Debug("etchosts: modified: %s", event.Name)
-				ehc.updateHosts()
-			}
-
-		case err, ok := <-ehc.watcher.Errors:
-			if !ok {
-				return
-			}
-			log.Error("etchosts: %s", err)
-		}
-	}
-}
-
-// updateHosts - loads system hosts
-func (ehc *EtcHostsContainer) updateHosts() {
-	table := make(map[string][]net.IP)
-	tableRev := NewIPMap(0)
-
-	ehc.load(table, tableRev, ehc.hostsFn)
-
-	for _, dir := range ehc.hostsDirs {
-		des, err := os.ReadDir(dir)
-		if err != nil {
-			if !errors.Is(err, os.ErrNotExist) {
-				log.Error("etchosts: Opening directory: %q: %s", dir, err)
-			}
-
-			continue
-		}
-
-		for _, de := range des {
-			ehc.load(table, tableRev, filepath.Join(dir, de.Name()))
-		}
-	}
-
-	func() {
-		ehc.lock.Lock()
-		defer ehc.lock.Unlock()
-
-		ehc.table = table
-		ehc.tableReverse = tableRev
-	}()
-
-	ehc.notify()
-}
--- a/internal/aghnet/etchostscontainer_test.go
+++ b/internal/aghnet/etchostscontainer_test.go
@@ -1,130 +0,0 @@
-package aghnet
-
-import (
-	"net"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
-	"github.com/miekg/dns"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestMain(m *testing.M) {
-	aghtest.DiscardLogOutput(m)
-}
-
-func prepareTestFile(t *testing.T) (f *os.File) {
-	t.Helper()
-
-	dir := t.TempDir()
-
-	f, err := os.CreateTemp(dir, "")
-	require.NoError(t, err)
-	require.NotNil(t, f)
-
-	t.Cleanup(func() {
-		assert.NoError(t, f.Close())
-	})
-
-	return f
-}
-
-func assertWriting(t *testing.T, f *os.File, strs ...string) {
-	t.Helper()
-
-	for _, str := range strs {
-		n, err := f.WriteString(str)
-		require.NoError(t, err)
-		assert.Equal(t, n, len(str))
-	}
-}
-
-func TestEtcHostsContainerResolution(t *testing.T) {
-	ehc := &EtcHostsContainer{}
-
-	f := prepareTestFile(t)
-
-	assertWriting(t, f,
-		"  127.0.0.1   host  localhost # comment \n",
-		"  ::1   localhost#comment  \n",
-	)
-	ehc.Init(f.Name())
-
-	t.Run("existing_host", func(t *testing.T) {
-		ips := ehc.Process("localhost", dns.TypeA)
-		require.Len(t, ips, 1)
-		assert.Equal(t, net.IPv4(127, 0, 0, 1), ips[0])
-	})
-
-	t.Run("unknown_host", func(t *testing.T) {
-		ips := ehc.Process("newhost", dns.TypeA)
-		assert.Nil(t, ips)
-
-		// Comment.
-		ips = ehc.Process("comment", dns.TypeA)
-		assert.Nil(t, ips)
-	})
-
-	t.Run("hosts_file", func(t *testing.T) {
-		names, ok := ehc.List().Get(net.IP{127, 0, 0, 1})
-		require.True(t, ok)
-		assert.Equal(t, []string{"host", "localhost"}, names)
-	})
-
-	t.Run("ptr", func(t *testing.T) {
-		testCases := []struct {
-			wantIP   string
-			wantHost string
-			wantLen  int
-		}{
-			{wantIP: "127.0.0.1", wantHost: "host", wantLen: 2},
-			{wantIP: "::1", wantHost: "localhost", wantLen: 1},
-		}
-
-		for _, tc := range testCases {
-			a, err := dns.ReverseAddr(tc.wantIP)
-			require.NoError(t, err)
-
-			a = strings.TrimSuffix(a, ".")
-			hosts := ehc.ProcessReverse(a, dns.TypePTR)
-			require.Len(t, hosts, tc.wantLen)
-			assert.Equal(t, tc.wantHost, hosts[0])
-		}
-	})
-}
-
-func TestEtcHostsContainerFSNotify(t *testing.T) {
-	ehc := &EtcHostsContainer{}
-
-	f := prepareTestFile(t)
-
-	assertWriting(t, f, "  127.0.0.1   host  localhost  \n")
-	ehc.Init(f.Name())
-
-	t.Run("unknown_host", func(t *testing.T) {
-		ips := ehc.Process("newhost", dns.TypeA)
-		assert.Nil(t, ips)
-	})
-
-	// Start monitoring for changes.
-	ehc.Start()
-	t.Cleanup(ehc.Close)
-
-	assertWriting(t, f, "127.0.0.2   newhost\n")
-	require.NoError(t, f.Sync())
-
-	// Wait until fsnotify has triggerred and processed the
-	// file-modification event.
-	time.Sleep(50 * time.Millisecond)
-
-	t.Run("notified", func(t *testing.T) {
-		ips := ehc.Process("newhost", dns.TypeA)
-		assert.NotNil(t, ips)
-		require.Len(t, ips, 1)
-		assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
-	})
-}
--- a/internal/aghnet/hostgen.go
+++ b/internal/aghnet/hostgen.go
@@ -0,0 +1,62 @@
+package aghnet
+
+import (
+	"net"
+	"strconv"
+)
+
+// The maximum lengths of generated hostnames for different IP versions.
+const (
+	ipv4HostnameMaxLen = len("192-168-100-100")
+	ipv6HostnameMaxLen = len("ff80-f076-0000-0000-0000-0000-0000-0010")
+)
+
+// generateIPv4Hostname generates the hostname for specific IP version.
+func generateIPv4Hostname(ipv4 net.IP) (hostname string) {
+	hnData := make([]byte, 0, ipv4HostnameMaxLen)
+	for i, part := range ipv4 {
+		if i > 0 {
+			hnData = append(hnData, '-')
+		}
+		hnData = strconv.AppendUint(hnData, uint64(part), 10)
+	}
+
+	return string(hnData)
+}
+
+// generateIPv6Hostname generates the hostname for specific IP version.
+func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
+	hnData := make([]byte, 0, ipv6HostnameMaxLen)
+	for i, partsNum := 0, net.IPv6len/2; i < partsNum; i++ {
+		if i > 0 {
+			hnData = append(hnData, '-')
+		}
+		for _, val := range ipv6[i*2 : i*2+2] {
+			if val < 10 {
+				hnData = append(hnData, '0')
+			}
+			hnData = strconv.AppendUint(hnData, uint64(val), 16)
+		}
+	}
+
+	return string(hnData)
+}
+
+// GenerateHostname generates the hostname from ip.  In case of using IPv4 the
+// result should be like:
+//
+//   192-168-10-1
+//
+// In case of using IPv6, the result is like:
+//
+//   ff80-f076-0000-0000-0000-0000-0000-0010
+//
+func GenerateHostname(ip net.IP) (hostname string) {
+	if ipv4 := ip.To4(); ipv4 != nil {
+		return generateIPv4Hostname(ipv4)
+	} else if ipv6 := ip.To16(); ipv6 != nil {
+		return generateIPv6Hostname(ipv6)
+	}
+
+	return ""
+}
--- a/internal/aghnet/hostgen_test.go
+++ b/internal/aghnet/hostgen_test.go
@@ -0,0 +1,48 @@
+package aghnet
+
+import (
+	"net"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGenerateHostName(t *testing.T) {
+	testCases := []struct {
+		name string
+		want string
+		ip   net.IP
+	}{{
+		name: "good_ipv4",
+		want: "127-0-0-1",
+		ip:   net.IP{127, 0, 0, 1},
+	}, {
+		name: "bad_ipv4",
+		want: "",
+		ip:   net.IP{127, 0, 0, 1, 0},
+	}, {
+		name: "good_ipv6",
+		want: "fe00-0000-0000-0000-0000-0000-0000-0001",
+		ip:   net.ParseIP("fe00::1"),
+	}, {
+		name: "bad_ipv6",
+		want: "",
+		ip: net.IP{
+			0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff,
+		},
+	}, {
+		name: "nil",
+		want: "",
+		ip:   nil,
+	}}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			hostname := GenerateHostname(tc.ip)
+			assert.Equal(t, tc.want, hostname)
+		})
+	}
+}
--- a/internal/aghnet/hostscontainer.go
+++ b/internal/aghnet/hostscontainer.go
@@ -0,0 +1,559 @@
+package aghnet
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"io/fs"
+	"net"
+	"path"
+	"strings"
+	"sync"
+
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/netutil"
+	"github.com/AdguardTeam/golibs/stringutil"
+	"github.com/AdguardTeam/urlfilter"
+	"github.com/AdguardTeam/urlfilter/filterlist"
+	"github.com/AdguardTeam/urlfilter/rules"
+	"github.com/miekg/dns"
+)
+
+// DefaultHostsPaths returns the slice of paths default for the operating system
+// to files and directories which are containing the hosts database.  The result
+// is intended to be used within fs.FS so the initial slash is omitted.
+func DefaultHostsPaths() (paths []string) {
+	return defaultHostsPaths()
+}
+
+// requestMatcher combines the logic for matching requests and translating the
+// appropriate rules.
+type requestMatcher struct {
+	// stateLock protects all the fields of requestMatcher.
+	stateLock *sync.RWMutex
+
+	// rulesStrg stores the rules obtained from the hosts' file.
+	rulesStrg *filterlist.RuleStorage
+	// engine serves rulesStrg.
+	engine *urlfilter.DNSEngine
+
+	// translator maps generated $dnsrewrite rules into hosts-syntax rules.
+	//
+	// TODO(e.burkov):  Store the filename from which the rule was parsed.
+	translator map[string]string
+}
+
+// MatchRequest processes the request rewriting hostnames and addresses read
+// from the operating system's hosts files.
+//
+// res is nil for any request having not an A/AAAA or PTR type.  Results
+// containing CNAME information may be queried again with the same question type
+// and the returned CNAME for Host field of request.  Results are guaranteed to
+// be direct, i.e. any returned CNAME resolves into actual address like an alias
+// in hosts does, see man hosts (5).
+//
+// It's safe for concurrent use.
+func (rm *requestMatcher) MatchRequest(
+	req urlfilter.DNSRequest,
+) (res *urlfilter.DNSResult, ok bool) {
+	switch req.DNSType {
+	case dns.TypeA, dns.TypeAAAA, dns.TypePTR:
+		log.Debug("%s: handling the request", hostsContainerPref)
+	default:
+		return nil, false
+	}
+
+	rm.stateLock.RLock()
+	defer rm.stateLock.RUnlock()
+
+	return rm.engine.MatchRequest(req)
+}
+
+// Translate returns the source hosts-syntax rule for the generated dnsrewrite
+// rule or an empty string if the last doesn't exist.
+func (rm *requestMatcher) Translate(rule string) (hostRule string) {
+	rm.stateLock.RLock()
+	defer rm.stateLock.RUnlock()
+
+	return rm.translator[rule]
+}
+
+// resetEng updates container's engine and the translation map.
+func (rm *requestMatcher) resetEng(rulesStrg *filterlist.RuleStorage, tr map[string]string) {
+	rm.stateLock.Lock()
+	defer rm.stateLock.Unlock()
+
+	rm.rulesStrg = rulesStrg
+	rm.engine = urlfilter.NewDNSEngine(rm.rulesStrg)
+
+	rm.translator = tr
+}
+
+// hostsContainerPref is a prefix for logging and wrapping errors in
+// HostsContainer's methods.
+const hostsContainerPref = "hosts container"
+
+// HostsContainer stores the relevant hosts database provided by the OS and
+// processes both A/AAAA and PTR DNS requests for those.
+type HostsContainer struct {
+	// requestMatcher matches the requests and translates the rules.  It's
+	// embedded to implement MatchRequest and Translate for *HostsContainer.
+	//
+	// TODO(a.garipov, e.burkov): Consider fully merging into HostsContainer.
+	requestMatcher
+
+	// done is the channel to sign closing the container.
+	done chan struct{}
+
+	// updates is the channel for receiving updated hosts.
+	updates chan *netutil.IPMap
+
+	// last is the set of hosts that was cached within last detected change.
+	last *netutil.IPMap
+
+	// fsys is the working file system to read hosts files from.
+	fsys fs.FS
+
+	// w tracks the changes in specified files and directories.
+	w aghos.FSWatcher
+
+	// patterns stores specified paths in the fs.Glob-compatible form.
+	patterns []string
+
+	// listID is the identifier for the list of generated rules.
+	listID int
+}
+
+// ErrNoHostsPaths is returned when there are no valid paths to watch passed to
+// the HostsContainer.
+const ErrNoHostsPaths errors.Error = "no valid paths to hosts files provided"
+
+// NewHostsContainer creates a container of hosts, that watches the paths with
+// w.  listID is used as an identifier of the underlying rules list.  paths
+// shouldn't be empty and each of paths should locate either a file or a
+// directory in fsys.  fsys and w must be non-nil.
+func NewHostsContainer(
+	listID int,
+	fsys fs.FS,
+	w aghos.FSWatcher,
+	paths ...string,
+) (hc *HostsContainer, err error) {
+	defer func() { err = errors.Annotate(err, "%s: %w", hostsContainerPref) }()
+
+	if len(paths) == 0 {
+		return nil, ErrNoHostsPaths
+	}
+
+	var patterns []string
+	patterns, err = pathsToPatterns(fsys, paths)
+	if err != nil {
+		return nil, err
+	} else if len(patterns) == 0 {
+		return nil, ErrNoHostsPaths
+	}
+
+	hc = &HostsContainer{
+		requestMatcher: requestMatcher{
+			stateLock: &sync.RWMutex{},
+		},
+		listID:   listID,
+		done:     make(chan struct{}, 1),
+		updates:  make(chan *netutil.IPMap, 1),
+		fsys:     fsys,
+		w:        w,
+		patterns: patterns,
+	}
+
+	log.Debug("%s: starting", hostsContainerPref)
+
+	// Load initially.
+	if err = hc.refresh(); err != nil {
+		return nil, err
+	}
+
+	for _, p := range paths {
+		if err = w.Add(p); err != nil {
+			if !errors.Is(err, fs.ErrNotExist) {
+				return nil, fmt.Errorf("adding path: %w", err)
+			}
+
+			log.Debug("%s: file %q expected to exist but doesn't", hostsContainerPref, p)
+		}
+	}
+
+	go hc.handleEvents()
+
+	return hc, nil
+}
+
+// Close implements the io.Closer interface for *HostsContainer.  Close must
+// only be called once.  The returned err is always nil.
+func (hc *HostsContainer) Close() (err error) {
+	log.Debug("%s: closing", hostsContainerPref)
+
+	close(hc.done)
+
+	return nil
+}
+
+// Upd returns the channel into which the updates are sent.  The receivable
+// map's values are guaranteed to be of type of *stringutil.Set.
+func (hc *HostsContainer) Upd() (updates <-chan *netutil.IPMap) {
+	return hc.updates
+}
+
+// pathsToPatterns converts paths into patterns compatible with fs.Glob.
+func pathsToPatterns(fsys fs.FS, paths []string) (patterns []string, err error) {
+	for i, p := range paths {
+		var fi fs.FileInfo
+		fi, err = fs.Stat(fsys, p)
+		if err != nil {
+			if errors.Is(err, fs.ErrNotExist) {
+				continue
+			}
+
+			// Don't put a filename here since it's already added by fs.Stat.
+			return nil, fmt.Errorf("path at index %d: %w", i, err)
+		}
+
+		if fi.IsDir() {
+			p = path.Join(p, "*")
+		}
+
+		patterns = append(patterns, p)
+	}
+
+	return patterns, nil
+}
+
+// handleEvents concurrently handles the events.  It closes the update channel
+// of HostsContainer when finishes.  Used to be called within a goroutine.
+func (hc *HostsContainer) handleEvents() {
+	defer log.OnPanic(fmt.Sprintf("%s: handling events", hostsContainerPref))
+
+	defer close(hc.updates)
+
+	ok, eventsCh := true, hc.w.Events()
+	for ok {
+		select {
+		case _, ok = <-eventsCh:
+			if !ok {
+				log.Debug("%s: watcher closed the events channel", hostsContainerPref)
+
+				continue
+			}
+
+			if err := hc.refresh(); err != nil {
+				log.Error("%s: %s", hostsContainerPref, err)
+			}
+		case _, ok = <-hc.done:
+			// Go on.
+		}
+	}
+}
+
+// hostsParser is a helper type to parse rules from the operating system's hosts
+// file.  It exists for only a single refreshing session.
+type hostsParser struct {
+	// rulesBuilder builds the resulting rulesBuilder list content.
+	rulesBuilder *strings.Builder
+
+	// translations maps generated $dnsrewrite rules to the hosts-translations
+	// rules.
+	translations map[string]string
+
+	// cnameSet prevents duplicating cname rules.
+	cnameSet *stringutil.Set
+
+	// table stores only the unique IP-hostname pairs.  It's also sent to the
+	// updates channel afterwards.
+	table *netutil.IPMap
+}
+
+func (hc *HostsContainer) newHostsParser() (hp *hostsParser) {
+	return &hostsParser{
+		rulesBuilder: &strings.Builder{},
+		// For A/AAAA and PTRs.
+		translations: make(map[string]string, hc.last.Len()*2),
+		cnameSet:     stringutil.NewSet(),
+		table:        netutil.NewIPMap(hc.last.Len()),
+	}
+}
+
+// parseFile is a aghos.FileWalker for parsing the files with hosts syntax.  It
+// never signs to stop walking and never returns any additional patterns.
+//
+// See man hosts(5).
+func (hp *hostsParser) parseFile(
+	r io.Reader,
+) (patterns []string, cont bool, err error) {
+	s := bufio.NewScanner(r)
+	for s.Scan() {
+		ip, hosts := hp.parseLine(s.Text())
+		if ip == nil || len(hosts) == 0 {
+			continue
+		}
+
+		hp.addPairs(ip, hosts)
+	}
+
+	return nil, true, s.Err()
+}
+
+// parseLine parses the line having the hosts syntax ignoring invalid ones.
+func (hp *hostsParser) parseLine(line string) (ip net.IP, hosts []string) {
+	fields := strings.Fields(line)
+	if len(fields) < 2 {
+		return nil, nil
+	}
+
+	if ip = net.ParseIP(fields[0]); ip == nil {
+		return nil, nil
+	}
+
+	for _, f := range fields[1:] {
+		hashIdx := strings.IndexByte(f, '#')
+		if hashIdx == 0 {
+			// The rest of the fields are a part of the comment so return.
+			break
+		} else if hashIdx > 0 {
+			// Only a part of the field is a comment.
+			f = f[:hashIdx]
+		}
+
+		// Make sure that invalid hosts aren't turned into rules.
+		//
+		// See https://github.com/AdguardTeam/AdGuardHome/issues/3946.
+		err := netutil.ValidateDomainName(f)
+		if err != nil {
+			log.Error("%s: host %q is invalid, ignoring", hostsContainerPref, f)
+
+			continue
+		}
+
+		hosts = append(hosts, f)
+	}
+
+	return ip, hosts
+}
+
+// Simple types of hosts in hosts database.  Zero value isn't used to be able
+// quizzaciously emulate nil with 0.
+const (
+	_ = iota
+	hostAlias
+	hostMain
+)
+
+// add tries to add the ip-host pair.  It returns:
+//
+//   hostAlias if the host is not the first one added for the ip.
+//   hostMain  if the host is the first one added for the ip.
+//   0         if the ip-host pair has already been added.
+//
+func (hp *hostsParser) add(ip net.IP, host string) (hostType int) {
+	v, ok := hp.table.Get(ip)
+	switch hosts, _ := v.(*stringutil.Set); {
+	case ok && hosts.Has(host):
+		return 0
+	case hosts == nil:
+		hosts = stringutil.NewSet(host)
+		hp.table.Set(ip, hosts)
+
+		return hostMain
+	default:
+		hosts.Add(host)
+
+		return hostAlias
+	}
+}
+
+// addPair puts the pair of ip and host to the rules builder if needed.  For
+// each ip the first member of hosts will become the main one.
+func (hp *hostsParser) addPairs(ip net.IP, hosts []string) {
+	// Put the rule in a processed format like:
+	//
+	//   ip host1 host2 ...
+	//
+	hostsLine := strings.Join(append([]string{ip.String()}, hosts...), " ")
+	var mainHost string
+	for _, host := range hosts {
+		switch hp.add(ip, host) {
+		case 0:
+			continue
+		case hostMain:
+			mainHost = host
+			added, addedPtr := hp.writeMainHostRule(host, ip)
+			hp.translations[added], hp.translations[addedPtr] = hostsLine, hostsLine
+		case hostAlias:
+			pair := fmt.Sprint(host, " ", mainHost)
+			if hp.cnameSet.Has(pair) {
+				continue
+			}
+			// Since the hostAlias couldn't be returned from add before the
+			// hostMain the mainHost shouldn't appear empty.
+			hp.writeAliasHostRule(host, mainHost)
+			hp.cnameSet.Add(pair)
+		}
+
+		log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, host)
+	}
+}
+
+// writeAliasHostRule writes the CNAME rule for the alias-host pair into
+// internal builders.
+func (hp *hostsParser) writeAliasHostRule(alias, host string) {
+	const (
+		nl = "\n"
+		sc = ";"
+
+		rwSuccess = rules.MaskSeparator + "$dnsrewrite=NOERROR" + sc + "CNAME" + sc
+		constLen  = len(rules.MaskPipe) + len(rwSuccess) + len(nl)
+	)
+
+	hp.rulesBuilder.Grow(constLen + len(host) + len(alias))
+	stringutil.WriteToBuilder(hp.rulesBuilder, rules.MaskPipe, alias, rwSuccess, host, nl)
+}
+
+// writeMainHostRule writes the actual rule for the qtype and the PTR for the
+// host-ip pair into internal builders.
+func (hp *hostsParser) writeMainHostRule(host string, ip net.IP) (added, addedPtr string) {
+	arpa, err := netutil.IPToReversedAddr(ip)
+	if err != nil {
+		return
+	}
+
+	const (
+		nl = "\n"
+
+		rwSuccess    = "^$dnsrewrite=NOERROR;"
+		rwSuccessPTR = "^$dnsrewrite=NOERROR;PTR;"
+
+		modLen    = len(rules.MaskPipe) + len(rwSuccess) + len(";")
+		modLenPTR = len(rules.MaskPipe) + len(rwSuccessPTR)
+	)
+
+	var qtype string
+	// The validation of the IP address has been performed earlier so it is
+	// guaranteed to be either an IPv4 or an IPv6.
+	if ip.To4() != nil {
+		qtype = "A"
+	} else {
+		qtype = "AAAA"
+	}
+
+	ipStr := ip.String()
+	fqdn := dns.Fqdn(host)
+
+	ruleBuilder := &strings.Builder{}
+	ruleBuilder.Grow(modLen + len(host) + len(qtype) + len(ipStr))
+	stringutil.WriteToBuilder(
+		ruleBuilder,
+		rules.MaskPipe,
+		host,
+		rwSuccess,
+		qtype,
+		";",
+		ipStr,
+	)
+	added = ruleBuilder.String()
+
+	ruleBuilder.Reset()
+
+	ruleBuilder.Grow(modLenPTR + len(arpa) + len(fqdn))
+	stringutil.WriteToBuilder(ruleBuilder, rules.MaskPipe, arpa, rwSuccessPTR, fqdn)
+
+	addedPtr = ruleBuilder.String()
+
+	hp.rulesBuilder.Grow(len(added) + len(addedPtr) + 2*len(nl))
+	stringutil.WriteToBuilder(hp.rulesBuilder, added, nl, addedPtr, nl)
+
+	return added, addedPtr
+}
+
+// equalSet returns true if the internal hosts table just parsed equals target.
+func (hp *hostsParser) equalSet(target *netutil.IPMap) (ok bool) {
+	if target == nil {
+		// hp.table shouldn't appear nil since it's initialized on each refresh.
+		return target == hp.table
+	}
+
+	if hp.table.Len() != target.Len() {
+		return false
+	}
+
+	hp.table.Range(func(ip net.IP, val interface{}) (cont bool) {
+		v, hasIP := target.Get(ip)
+		// ok is set to true if the target doesn't contain ip or if the
+		// appropriate hosts set isn't equal to the checked one, i.e. the maps
+		// have at least one discrepancy.
+		ok = !hasIP || !v.(*stringutil.Set).Equal(val.(*stringutil.Set))
+
+		// Continue only if maps has no discrepancies.
+		return !ok
+	})
+
+	// Return true if every value from the IP map has no discrepancies with the
+	// appropriate one from the target.
+	return !ok
+}
+
+// sendUpd tries to send the parsed data to the ch.
+func (hp *hostsParser) sendUpd(ch chan *netutil.IPMap) {
+	log.Debug("%s: sending upd", hostsContainerPref)
+
+	upd := hp.table
+	select {
+	case ch <- upd:
+		// Updates are delivered.  Go on.
+	case <-ch:
+		ch <- upd
+		log.Debug("%s: replaced the last update", hostsContainerPref)
+	case ch <- upd:
+		// The previous update was just read and the next one pushed.  Go on.
+	default:
+		log.Error("%s: the updates channel is broken", hostsContainerPref)
+	}
+}
+
+// newStrg creates a new rules storage from parsed data.
+func (hp *hostsParser) newStrg(id int) (s *filterlist.RuleStorage, err error) {
+	return filterlist.NewRuleStorage([]filterlist.RuleList{&filterlist.StringRuleList{
+		ID:             id,
+		RulesText:      hp.rulesBuilder.String(),
+		IgnoreCosmetic: true,
+	}})
+}
+
+// refresh gets the data from specified files and propagates the updates if
+// needed.
+//
+// TODO(e.burkov):  Accept a parameter to specify the files to refresh.
+func (hc *HostsContainer) refresh() (err error) {
+	log.Debug("%s: refreshing", hostsContainerPref)
+
+	hp := hc.newHostsParser()
+	if _, err = aghos.FileWalker(hp.parseFile).Walk(hc.fsys, hc.patterns...); err != nil {
+		return fmt.Errorf("refreshing : %w", err)
+	}
+
+	if hp.equalSet(hc.last) {
+		log.Debug("%s: no updates detected", hostsContainerPref)
+
+		return nil
+	}
+	defer hp.sendUpd(hc.updates)
+
+	hc.last = hp.table.ShallowClone()
+
+	var rulesStrg *filterlist.RuleStorage
+	if rulesStrg, err = hp.newStrg(hc.listID); err != nil {
+		return fmt.Errorf("initializing rules storage: %w", err)
+	}
+
+	hc.resetEng(rulesStrg, hp.translations)
+
+	return nil
+}
--- a/internal/aghnet/hostscontainer_linux.go
+++ b/internal/aghnet/hostscontainer_linux.go
@@ -0,0 +1,18 @@
+//go:build linux
+// +build linux
+
+package aghnet
+
+import (
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+)
+
+func defaultHostsPaths() (paths []string) {
+	paths = []string{"etc/hosts"}
+
+	if aghos.IsOpenWrt() {
+		paths = append(paths, "tmp/hosts")
+	}
+
+	return paths
+}
--- a/Show More
+++ b/Show More