Pull request 2011: upd-chlog

Squashed commit of the following:

commit 7df4e845a5766a3ba221aa198cf937c7a9929899
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Sep 11 18:27:31 2023 +0300

    all: upd chlog, deps

.github/ISSUE_TEMPLATE/bug.yml

@@ -102,9 +102,6 @@
             the best way.  For crashes, please provide a full failure log.
         'label': 'Action'
         'value': |
-            Replace the following command with the one you're calling or a
-            description of the failing action:
-
             ```sh
             nslookup -debug -type=a 'www.example.com' '$YOUR_AGH_ADDRESS'
             ```

.github/PULL_REQUEST_TEMPLATE

@@ -1,8 +1,7 @@
 Before submitting a PR please make sure that:
 
 1.  You have discussed your solution in an issue and have got an
-    approval from a maintainer.  See our
-    [contribution guide](https://github.com/AdguardTeam/AdGuardHome/blob/master/CONTRIBUTING.md).
+    approval from a maintainer.
 
 2.  This isn't a localization fix; please send those to our
     [CrowdIn](https://crowdin.com/project/adguard-applications/en#/adguard-home)
@@ -14,8 +13,8 @@ Before submitting a PR please make sure that:
 Add a short description here.  The description should include:
 
 1.  Which issue this PR closes (`Closes #NNNN.`) or updates (`Updates
-    #NNNN.`).  Please do not open PRs without filing an issue first.
+    #NNNN.`).
 
 2.  A short description of how the change achieves that.
 
-Do not forget to remove these instructions!
+Do not forget to remove these instructions.

.github/workflows/build.yml

@@ -1,8 +1,8 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.22.2'
-  'NODE_VERSION': '16'
+  'GO_VERSION': '1.20.8'
+  'NODE_VERSION': '14'
 
 'on':
   'push':
@@ -53,9 +53,9 @@
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
         'restore-keys': '${{ runner.os }}-node-'
-    - 'name': 'Run tests'
+    - 'name': 'Run make ci'
       'shell': 'bash'
-      'run': 'make VERBOSE=1 deps test go-bench go-fuzz'
+      'run': 'make VERBOSE=1 ci'
     - 'name': 'Upload coverage'
       'uses': 'codecov/codecov-action@v1'
       'if': "success() && matrix.os == 'ubuntu-latest'"
@@ -101,10 +101,7 @@
     - 'name': 'Set up Docker Buildx'
       'uses': 'docker/setup-buildx-action@v1'
     - 'name': 'Run snapshot build'
-      # Set a custom version string, since the checkout@v2 action does not seem
-      # to know about the master branch, while the version script uses it to
-      # count the number of commits within the branch.
-      'run': 'make SIGN=0 VERBOSE=1 VERSION="v0.0.0-github" build-release build-docker'
+      'run': 'make SIGN=0 VERBOSE=1 build-release build-docker'
 
   'notify':
     'needs':

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.22.2'
+  'GO_VERSION': '1.20.8'
 
 'on':
   'push':

CHANGELOG.md

@@ -14,11 +14,11 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA
 
-## [v0.107.49] - 2024-04-24 (APPROX.)
+## [v0.107.39] - 2023-09-27 (APPROX.)
 
-See also the [v0.107.49 GitHub milestone][ms-v0.107.49].
+See also the [v0.107.39 GitHub milestone][ms-v0.107.39].
 
-[ms-v0.107.49]: https://github.com/AdguardTeam/AdGuardHome/milestone/84?closed=1
+[ms-v0.107.39]: https://github.com/AdguardTeam/AdGuardHome/milestone/74?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
@@ -29,429 +29,6 @@ NOTE: Add new changes ABOVE THIS COMMENT.
 
 
 
-## [v0.107.48] - 2024-04-05
-
-See also the [v0.107.48 GitHub milestone][ms-v0.107.48].
-
-### Fixed
-
-- Access settings not being applied to encrypted protocols ([#6890])
-
-[#6890]: https://github.com/AdguardTeam/AdGuardHome/issues/6890
-
-[ms-v0.107.48]: https://github.com/AdguardTeam/AdGuardHome/milestone/83?closed=1
-
-
-
-## [v0.107.47] - 2024-04-04
-
-See also the [v0.107.47 GitHub milestone][ms-v0.107.47].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the Go
-  vulnerabilities fixed in [Go 1.22.2][go-1.22.2].
-
-### Changed
-
-- Time Zone Database is now embedded in the binary ([#6758]).
-- Failed authentication attempts show the originating IP address in the logs, if
-  the request came from a trusted proxy ([#5829]).
-
-### Deprecated
-
-- Go 1.22 support.  Future versions will require at least Go 1.23 to build.
-- Currently, AdGuard Home uses a best-effort algorithm to fix invalid IDs of
-  filtering-rule lists on startup.  This feature is deprecated, and invalid IDs
-  will cause errors on startup in a future version.
-- Node.JS 16.  Future versions will require at least Node.JS 18 to build.
-
-### Fixed
-
-- Resetting DNS upstream mode when applying unrelated settings ([#6851]).
-- Symbolic links to the configuration file begin replaced by a copy of the real
-  file upon startup on FreeBSD ([#6717]).
-
-### Removed
-
-- Go 1.21 support.
-
-[#5829]: https://github.com/AdguardTeam/AdGuardHome/issues/5829
-[#6717]: https://github.com/AdguardTeam/AdGuardHome/issues/6717
-[#6758]: https://github.com/AdguardTeam/AdGuardHome/issues/6758
-[#6851]: https://github.com/AdguardTeam/AdGuardHome/issues/6851
-
-[go-1.22.2]:    https://groups.google.com/g/golang-announce/c/YgW0sx8mN3M/
-[ms-v0.107.47]: https://github.com/AdguardTeam/AdGuardHome/milestone/82?closed=1
-
-
-
-## [v0.107.46] - 2024-03-20
-
-See also the [v0.107.46 GitHub milestone][ms-v0.107.46].
-
-### Added
-
-- Ability to disable the use of system hosts file information for query
-  resolution ([#6610]).
-- Ability to define custom directories for storage of query log files and
-  statistics ([#5992]).
-
-### Changed
-
-- Private rDNS resolution (`dns.use_private_ptr_resolvers` in YAML
-  configuration) now requires a valid "Private reverse DNS servers", when
-  enabled ([#6820]).
-
-  **NOTE:** Disabling private rDNS resolution behaves effectively the same as if
-  no private reverse DNS servers provided by user and by the OS.
-
-### Fixed
-
-- Statistics for 7 days displayed by day on the dashboard graph ([#6712]).
-- Missing "served from cache" label on long DNS server strings ([#6740]).
-- Incorrect tracking of the system hosts file's changes ([#6711]).
-
-[#5992]: https://github.com/AdguardTeam/AdGuardHome/issues/5992
-[#6610]: https://github.com/AdguardTeam/AdGuardHome/issues/6610
-[#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711
-[#6712]: https://github.com/AdguardTeam/AdGuardHome/issues/6712
-[#6740]: https://github.com/AdguardTeam/AdGuardHome/issues/6740
-[#6820]: https://github.com/AdguardTeam/AdGuardHome/issues/6820
-
-[ms-v0.107.46]: https://github.com/AdguardTeam/AdGuardHome/milestone/81?closed=1
-
-
-
-## [v0.107.45] - 2024-03-06
-
-See also the [v0.107.45 GitHub milestone][ms-v0.107.45].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the Go
-  vulnerabilities fixed in [Go 1.21.8][go-1.21.8].
-
-### Added
-
-- Context menu item in the Query Log to add a Client to the Persistent client
-  list ([#6679]).
-
-### Changed
-
-- Starting with this release our scripts are using Go's [forward compatibility
-  mechanism][go-toolchain] for updating the Go version.
-
-  **Important note for porters:**  This change means that if your `go` version
-  is 1.21+ but is different from the one required by AdGuard Home, the `go` tool
-  will automatically download the required version.
-
-  If you want to use the version installed on your builder, run:
-
-  ```sh
-  go get go@$YOUR_VERSION
-  go mod tidy
-  ```
-
-  and call `make` with `GOTOOLCHAIN=local`.
-
-### Deprecated
-
-- Go 1.21 support.  Future versions will require at least Go 1.22 to build.
-
-### Fixed
-
-- Missing IP addresses in logs when querying for domain names from the ignore
-  lists.
-- Blank page after resetting access clients ([#6634]).
-- Wrong algorithm for caching bootstrapped upstream addresses ([#6723]).
-
-### Removed
-
-- Go 1.20 support, as it has reached end of life.
-
-[#6634]: https://github.com/AdguardTeam/AdGuardHome/issues/6634
-[#6679]: https://github.com/AdguardTeam/AdGuardHome/issues/6679
-[#6723]: https://github.com/AdguardTeam/AdGuardHome/issues/6723
-
-[go-1.21.8]:    https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg
-[go-toolchain]: https://go.dev/blog/toolchain
-[ms-v0.107.45]: https://github.com/AdguardTeam/AdGuardHome/milestone/80?closed=1
-
-
-
-## [v0.107.44] - 2024-02-06
-
-See also the [v0.107.44 GitHub milestone][ms-v0.107.44].
-
-### Added
-
-- Timezones in the Etc/ area to the timezone list ([#6568]).
-- The schema version of the configuration file to the output of running
-  `AdGuardHome` (or `AdGuardHome.exe`) with `-v --version` command-line options
-  ([#6545]).
-- Ability to disable plain-DNS serving via UI if an encrypted protocol is
-  already used ([#1660]).
-
-### Changed
-
-- The bootstrapped upstream addresses are now updated according to the TTL of
-  the bootstrap DNS response ([#6321]).
-- Logging level of timeout errors is now `error` instead of `debug` ([#6574]).
-- The field `"upstream_mode"` in `POST /control/dns_config` and
-  `GET /control/dns_info` HTTP APIs now accepts `load_balance` value.  Check
-  `openapi/CHANGELOG.md` for more details.
-
-#### Configuration changes
-
-In this release, the schema version has changed from 27 to 28.
-
-- The new property `clients.persistent.*.uid`, which is a unique identifier of
-  the persistent client.
-- The properties `dns.all_servers` and `dns.fastest_addr` were removed, their
-  values migrated to newly added field `dns.upstream_mode` that describes the
-  logic through which upstreams will be used.  See also a [Wiki
-  page][wiki-config].
-
-  ```yaml
-  # BEFORE:
-  'dns':
-      # …
-      'all_servers': true
-      'fastest_addr': true
-
-  # AFTER:
-  'dns':
-      # …
-      'upstream_mode': 'parallel'
-  ```
-
-  To rollback this change, remove the new field `upstream_mode`, set back
-  `dns.all_servers` and `dns.fastest_addr` properties in `dns` section, and
-  change the `schema_version` back to `27`.
-
-### Fixed
-
-- “Invalid AddrPort” in the *Private reverse DNS servers* section on the
-  *Settings → DNS settings* page.
-- Panic on using `--no-etc-hosts` flag ([#6644]).
-- Schedule display in the client settings after creating or updating.
-- Zero value in `querylog.size_memory` disables logging ([#6570]).
-- Non-anonymized IP addresses on the dashboard ([#6584]).
-- Maximum cache TTL requirement when editing minimum cache TTL in the Web UI
-  ([#6409]).
-- Load balancing algorithm stuck on a single server ([#6480]).
-- Statistics for 7 days displayed as 168 hours on the dashboard.
-- Pre-filling the Edit static lease window with data ([#6534]).
-- Names defined in the `/etc/hosts` for a single address family wrongly
-  considered undefined for another family ([#6541]).
-- Omitted CNAME records in safe search results, which can cause YouTube to not
-  work on iOS ([#6352]).
-
-[#6321]: https://github.com/AdguardTeam/AdGuardHome/issues/6321
-[#6352]: https://github.com/AdguardTeam/AdGuardHome/issues/6352
-[#6409]: https://github.com/AdguardTeam/AdGuardHome/issues/6409
-[#6480]: https://github.com/AdguardTeam/AdGuardHome/issues/6480
-[#6534]: https://github.com/AdguardTeam/AdGuardHome/issues/6534
-[#6541]: https://github.com/AdguardTeam/AdGuardHome/issues/6541
-[#6545]: https://github.com/AdguardTeam/AdGuardHome/issues/6545
-[#6568]: https://github.com/AdguardTeam/AdGuardHome/issues/6568
-[#6570]: https://github.com/AdguardTeam/AdGuardHome/issues/6570
-[#6574]: https://github.com/AdguardTeam/AdGuardHome/issues/6574
-[#6584]: https://github.com/AdguardTeam/AdGuardHome/issues/6584
-[#6644]: https://github.com/AdguardTeam/AdGuardHome/issues/6644
-
-[ms-v0.107.44]: https://github.com/AdguardTeam/AdGuardHome/milestone/79?closed=1
-[wiki-config]:  https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration
-
-
-
-## [v0.107.43] - 2023-12-11
-
-See also the [v0.107.43 GitHub milestone][ms-v0.107.43].
-
-### Fixed
-
-- Incorrect handling of IPv4-in-IPv6 addresses when binding to an unspecified
-  address on some machines ([#6510]).
-
-[#6510]: https://github.com/AdguardTeam/AdGuardHome/issues/6510
-
-[ms-v0.107.43]: https://github.com/AdguardTeam/AdGuardHome/milestone/78?closed=1
-
-
-
-## [v0.107.42] - 2023-12-07
-
-See also the [v0.107.42 GitHub milestone][ms-v0.107.42].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-39326, CVE-2023-45283, and CVE-2023-45285 Go vulnerabilities fixed in
-  [Go 1.20.12][go-1.20.12].
-
-### Added
-
-- Ability to set client's custom DNS cache ([#6263]).
-- Ability to disable plain-DNS serving through configuration file if an
-  encrypted protocol is already enabled ([#1660]).
-- Ability to specify rate limiting settings in the Web UI ([#6369]).
-
-### Changed
-
-#### Configuration changes
-
-- The new property `dns.serve_plain_dns` has been added to the configuration
-  file ([#1660]).
-- The property `dns.bogus_nxdomain` is now validated more strictly.
-- Added new properties `clients.persistent.*.upstreams_cache_enabled` and
-  `clients.persistent.*.upstreams_cache_size` that describe cache configuration
-  for each client's custom upstream configuration.
-
-### Fixed
-
-- `ipset` entries family validation ([#6420]).
-- Pre-filling the *New static lease* window with data ([#6402]).
-- Protection pause timer synchronization ([#5759]).
-
-[#1660]: https://github.com/AdguardTeam/AdGuardHome/issues/1660
-[#5759]: https://github.com/AdguardTeam/AdGuardHome/issues/5759
-[#6263]: https://github.com/AdguardTeam/AdGuardHome/issues/6263
-[#6369]: https://github.com/AdguardTeam/AdGuardHome/issues/6369
-[#6402]: https://github.com/AdguardTeam/AdGuardHome/issues/6402
-[#6420]: https://github.com/AdguardTeam/AdGuardHome/issues/6420
-
-[go-1.20.12]:   https://groups.google.com/g/golang-announce/c/iLGK3x6yuNo/m/z6MJ-eB0AQAJ
-[ms-v0.107.42]: https://github.com/AdguardTeam/AdGuardHome/milestone/77?closed=1
-
-
-
-## [v0.107.41] - 2023-11-13
-
-See also the [v0.107.41 GitHub milestone][ms-v0.107.41].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-45283 and CVE-2023-45284 Go vulnerabilities fixed in
-  [Go 1.20.11][go-1.20.11].
-
-### Added
-
-- Ability to specify subnet lengths for IPv4 and IPv6 addresses, used for rate
-  limiting requests, in the configuration file ([#6368]).
-- Ability to specify multiple domain specific upstreams per line, e.g.
-  `[/domain1/../domain2/]upstream1 upstream2 .. upstreamN` ([#4977]).
-
-### Changed
-
-- Increased the height of the ready-to-use filter lists dialog ([#6358]).
-- Improved logging of authentication failures ([#6357]).
-
-#### Configuration changes
-
-- New properties `dns.ratelimit_subnet_len_ipv4` and
-  `dns.ratelimit_subnet_len_ipv6` have been added to the configuration file
-  ([#6368]).
-
-### Fixed
-
-- Schedule timezone not being sent ([#6401]).
-- Average request processing time calculation ([#6220]).
-- Redundant truncation of long client names in the Top Clients table ([#6338]).
-- Scrolling column headers in the tables ([#6337]).
-- `$important,dnsrewrite` rules not overriding allowlist rules ([#6204]).
-- Dark mode DNS rewrite background ([#6329]).
-- Issues with QUIC and HTTP/3 upstreams on Linux ([#6335]).
-
-[#4977]: https://github.com/AdguardTeam/AdGuardHome/issues/4977
-[#6204]: https://github.com/AdguardTeam/AdGuardHome/issues/6204
-[#6220]: https://github.com/AdguardTeam/AdGuardHome/issues/6220
-[#6329]: https://github.com/AdguardTeam/AdGuardHome/issues/6329
-[#6335]: https://github.com/AdguardTeam/AdGuardHome/issues/6335
-[#6337]: https://github.com/AdguardTeam/AdGuardHome/issues/6337
-[#6338]: https://github.com/AdguardTeam/AdGuardHome/issues/6338
-[#6357]: https://github.com/AdguardTeam/AdGuardHome/issues/6357
-[#6358]: https://github.com/AdguardTeam/AdGuardHome/issues/6358
-[#6368]: https://github.com/AdguardTeam/AdGuardHome/issues/6368
-[#6401]: https://github.com/AdguardTeam/AdGuardHome/issues/6401
-
-[go-1.20.11]:   https://groups.google.com/g/golang-announce/c/4tU8LZfBFkY/m/d-jSKR_jBwAJ
-[ms-v0.107.41]: https://github.com/AdguardTeam/AdGuardHome/milestone/76?closed=1
-
-
-
-## [v0.107.40] - 2023-10-18
-
-See also the [v0.107.40 GitHub milestone][ms-v0.107.40].
-
-### Changed
-
-- *Block* and *Unblock* buttons of the query log moved to the tooltip menu
-  ([#684]).
-
-### Fixed
-
-- Dashboard tables scroll issue ([#6180]).
-- The time shown in the statistics is one hour less than the current time
-  ([#6296]).
-- Issues with QUIC and HTTP/3 upstreams on FreeBSD ([#6301]).
-- Panic on clearing the query log ([#6304]).
-
-[#684]:  https://github.com/AdguardTeam/AdGuardHome/issues/684
-[#6180]: https://github.com/AdguardTeam/AdGuardHome/issues/6180
-[#6296]: https://github.com/AdguardTeam/AdGuardHome/issues/6296
-[#6301]: https://github.com/AdguardTeam/AdGuardHome/issues/6301
-[#6304]: https://github.com/AdguardTeam/AdGuardHome/issues/6304
-
-[ms-v0.107.40]: https://github.com/AdguardTeam/AdGuardHome/milestone/75?closed=1
-
-
-
-## [v0.107.39] - 2023-10-11
-
-See also the [v0.107.39 GitHub milestone][ms-v0.107.39].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-39323 and CVE-2023-39325 Go vulnerabilities fixed in
-  [Go 1.20.9][go-1.20.9] and [Go 1.20.10][go-1.20.10].
-
-### Added
-
-- Ability to edit static leases on *DHCP settings* page ([#1700]).
-- Ability to specify for how long clients should cache a filtered response,
-  using the *Blocked response TTL* field on the *DNS settings* page ([#4569]).
-
-### Changed
-
-- `ipset` entries are updated more frequently ([#6233]).
-- Node.JS 16 is now required to build the frontend.
-
-### Fixed
-
-- Incorrect domain-specific upstream matching for `DS` queries ([#6156]).
-- Improper validation of password length ([#6280]).
-- Wrong algorithm for filtering self addresses from the list of private upstream
-  DNS servers ([#6231]).
-- An accidental change in DNS rewrite priority ([#6226]).
-
-[#1700]: https://github.com/AdguardTeam/AdGuardHome/issues/1700
-[#4569]: https://github.com/AdguardTeam/AdGuardHome/issues/4569
-[#6156]: https://github.com/AdguardTeam/AdGuardHome/issues/6156
-[#6226]: https://github.com/AdguardTeam/AdGuardHome/issues/6226
-[#6231]: https://github.com/AdguardTeam/AdGuardHome/issues/6231
-[#6233]: https://github.com/AdguardTeam/AdGuardHome/issues/6233
-[#6280]: https://github.com/AdguardTeam/AdGuardHome/issues/6280
-
-[go-1.20.10]:   https://groups.google.com/g/golang-announce/c/iNNxDTCjZvo/m/UDd7VKQuAAAJ
-[go-1.20.9]:    https://groups.google.com/g/golang-announce/c/XBa1oHDevAo/m/desYyx3qAgAJ
-[ms-v0.107.39]: https://github.com/AdguardTeam/AdGuardHome/milestone/74?closed=1
-
-
-
 ## [v0.107.38] - 2023-09-11
 
 See also the [v0.107.38 GitHub milestone][ms-v0.107.38].
@@ -509,7 +86,7 @@ See also the [v0.107.37 GitHub milestone][ms-v0.107.37].
   is returned if the blocking mode isn't set to `Null IP`.  In previous versions
   it returned NXDOMAIN response in such cases.
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 24 to 27.
 
@@ -719,7 +296,7 @@ See also the [v0.107.34 GitHub milestone][ms-v0.107.34].
 
 - Improved CPU and RAM consumption during updates of filtering-rule lists.
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 23 to 24.
 
@@ -799,7 +376,7 @@ See also the [v0.107.33 GitHub milestone][ms-v0.107.33].
 
 ### Changed
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 20 to 23.
 
@@ -1064,7 +641,7 @@ See also the [v0.107.28 GitHub milestone][ms-v0.107.28].
 - ARPA domain names containing a subnet within private networks now also
   considered private, behaving closer to [RFC 6761][rfc6761] ([#5567]).
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 17 to 20.
 
@@ -1204,7 +781,7 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
 
 ### Changed
 
-#### Configuration changes
+#### Configuration Changes
 
 - Property `edns_client_subnet`, which in schema versions 16 and earlier used
   to be a part of the `dns` object, is now part of the `dns.edns_client_subnet`
@@ -1293,7 +870,7 @@ See also the [v0.107.24 GitHub milestone][ms-v0.107.24].
 
 ### Changed
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 14 to 16.
 
@@ -2003,7 +1580,7 @@ See also the [v0.107.7 GitHub milestone][ms-v0.107.7].
 - The `dns.bogus_nxdomain` property in the configuration file now supports CIDR
   notation alongside IP addresses ([#1730]).
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 12 to 14.
 
@@ -2344,7 +1921,7 @@ See also the [v0.107.0 GitHub milestone][ms-v0.107.0].
   file, together with the new `group` and `user` properties ([#2763]).
 - Permissions on filter files are now `0o644` instead of `0o600` ([#3198]).
 
-#### Configuration changes
+#### Configuration Changes
 
 In this release, the schema version has changed from 10 to 12.
 
@@ -2910,21 +2487,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.49...HEAD
-[v0.107.49]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.48...v0.107.49
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.39...HEAD
+[v0.107.39]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.38...v0.107.39
 -->
 
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.48...HEAD
-[v0.107.48]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.47...v0.107.48
-[v0.107.47]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.46...v0.107.47
-[v0.107.46]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.45...v0.107.46
-[v0.107.45]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.44...v0.107.45
-[v0.107.44]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.43...v0.107.44
-[v0.107.43]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.42...v0.107.43
-[v0.107.42]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.41...v0.107.42
-[v0.107.41]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.40...v0.107.41
-[v0.107.40]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.39...v0.107.40
-[v0.107.39]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.38...v0.107.39
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.38...HEAD
 [v0.107.38]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.37...v0.107.38
 [v0.107.37]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.36...v0.107.37
 [v0.107.36]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.35...v0.107.36

CONTRIBUTING.md

@@ -1,57 +0,0 @@
-# Contributing to AdGuard Home
-
-If you want to contribute to AdGuard Home by filing or commenting on an issue or opening a pull request, please follow the instructions below.
-
-## General recommendations
-
-Please don’t:
-
-- post comments like “+1” or “this”.  Use the :+1: reaction on the issue instead, as this allows us to actually see the level of support for issues.
-
-- file issues about localization errors or send localization updates as PRs.  We’re using [CrowdIn] to manage our translations and we generally update them before each Beta and Release build.  You can learn more about translating AdGuard products [in our Knowledge Base][kb-trans].
-
-- file issues about a particular filtering-rule list misbehaving.  These are tracked through the [separate form for filtering issues][form].
-
-- send or request updates to filtering-rule lists, such as the ones for the Blocked Services feature or the list of approved filtering-rule lists.  We update them from the [separate repository][hostlist] once before each Beta and Release build.
-
-Please do:
-
-- follow the template instructions and provide data for reproducing issues.
-
-- write the title of your issue or pull request in English.  Any language is fine in the body, but it is important to keep the title in English to make it easier for people and bots to look up duplicated issues.
-
-[CrowdIn]:  https://crowdin.com/project/adguard-applications/en#/adguard-home
-[form]:     https://link.adtidy.org/forward.html?action=report&app=home&from=github
-[hostlist]: https://github.com/AdguardTeam/HostlistsRegistry
-[kb-trans]: https://kb.adguard.com/en/general/adguard-translations
-
-## Issues
-
-### Search first
-
-Please make sure that the issue is not a duplicate or a question.  If it’s a duplicate, please react to the original issue with a thumbs up.  If it’s a question, please look through our [Wiki] and, if you haven’t found the answer, post it to the GitHub [Discussions] page.
-
-[Discussions]: https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a
-[Wiki]:        https://github.com/AdguardTeam/AdGuardHome/wiki
-
-### Follow the issue template
-
-Developers need to be able to reproduce the faulty behavior in order to fix an issue, so please make sure that you follow the instructions in the issue template carefully.
-
-## Pull requests
-
-### Discuss your changes first
-
-Please discuss your changes by opening an issue.  The maintainers should evaluate your proposal, and it’s generally better if that’s done before any code is written.
-
-### Review your changes for style
-
-We have a set of [code guidelines][hacking] that we expect the code to follow.  Please make sure you follow it.
-
-[hacking]: https://github.com/AdguardTeam/CodeGuidelines/blob/master/Go/Go.md
-
-### Test your changes
-
-Make sure that it passes linters and tests by running the corresponding Make targets.  For backend changes, it’s `make go-check`.  For frontend, run `make js-lint`.
-
-Additionally, a manual test is often required.  While we’re constantly working on improving our test suites, they’re still not as good as we’d like them to be.

HACKING.md

@@ -1,56 +1,65 @@
-# AdGuard Home developer guidelines
+ #  AdGuard Home Developer Guidelines
 
-This document was moved to the [AdGuard Code Guidelines repository][repo].  All sections with IDs now only have links to the corresponding files and sections in that repository.
+This document was moved to the [AdGuard Code Guidelines repository][repo].  All
+sections with IDs now only have links to the corresponding files and sections in
+that repository.
 
-## <a href="#git" id="git" name="git">Git</a>
+##  <a href="#git" id="git" name="git">Git</a>
 
 This section was moved to [its own document][git].
 
-## <a href="#go" id="go" name="go">Go</a>
+##  <a href="#go" id="go" name="go">Go</a>
 
 This section was moved to [its own document][go].
 
-### <a href="#code" id="code" name="code">Code</a>
+   ###  <a href="#code" id="code" name="code">Code</a>
 
-This subsection was moved to the [corresponding section][code] of the Go guidelines document.
+This subsection was moved to the [corresponding section][code] of the Go
+guidelines document.
 
-### <a href="#commenting" id="commenting" name="commenting">Commenting</a>
+   ###  <a href="#commenting" id="commenting" name="commenting">Commenting</a>
 
-This subsection was moved to the [corresponding section][cmnt] of the Go guidelines document.
+This subsection was moved to the [corresponding section][cmnt] of the Go
+guidelines document.
 
-### <a href="#formatting" id="formatting" name="formatting">Formatting</a>
+   ###  <a href="#formatting" id="formatting" name="formatting">Formatting</a>
 
-This subsection was moved to the [corresponding section][fmt] of the Go guidelines document.
+This subsection was moved to the [corresponding section][fmt] of the Go
+guidelines document.
 
-### <a href="#naming" id="naming" name="naming">Naming</a>
+   ###  <a href="#naming" id="naming" name="naming">Naming</a>
 
-This subsection was moved to the [corresponding section][name] of the Go guidelines document.
+This subsection was moved to the [corresponding section][name] of the Go
+guidelines document.
 
-### <a href="#testing" id="testing" name="testing">Testing</a>
+   ###  <a href="#testing" id="testing" name="testing">Testing</a>
 
-This subsection was moved to the [corresponding section][test] of the Go guidelines document.
+This subsection was moved to the [corresponding section][test] of the Go
+guidelines document.
 
-### <a href="#recommended-reading" id="recommended-reading" name="recommended-reading">Recommended Reading</a>
+   ###  <a href="#recommended-reading" id="recommended-reading" name="recommended-reading">Recommended Reading</a>
 
-This subsection was moved to the [corresponding section][read] of the Go guidelines document.
+This subsection was moved to the [corresponding section][read] of the Go
+guidelines document.
 
-## <a href="#markdown" id="markdown" name="markdown">Markdown</a>
+##  <a href="#markdown" id="markdown" name="markdown">Markdown</a>
 
 This section was moved to [its own document][md].
 
-## <a href="#shell-scripting" id="shell-scripting" name="shell-scripting">Shell Scripting</a>
+##  <a href="#shell-scripting" id="shell-scripting" name="shell-scripting">Shell Scripting</a>
 
 This section was moved to [its own document][sh].
 
-### <a href="#shell-conditionals" id="shell-conditionals" name="shell-conditionals">Shell Conditionals</a>
+   ###  <a href="#shell-conditionals" id="shell-conditionals" name="shell-conditionals">Shell Conditionals</a>
 
-This subsection was moved to the [corresponding section][cond] of the Shell guidelines document.
+This subsection was moved to the [corresponding section][cond] of the Shell
+guidelines document.
 
-## <a href="#text-including-comments" id="text-including-comments" name="text-including-comments">Text, Including Comments</a>
+##  <a href="#text-including-comments" id="text-including-comments" name="text-including-comments">Text, Including Comments</a>
 
 This section was moved to [its own document][txt].
 
-## <a href="#yaml" id="yaml" name="yaml">YAML</a>
+##  <a href="#yaml" id="yaml" name="yaml">YAML</a>
 
 This section was moved to [its own document][yaml].
 

Makefile

@@ -8,7 +8,7 @@
 # Makefile.  Bump this number every time a significant change is made to
 # this Makefile.
 #
-# AdGuard-Project-Version: 4
+# AdGuard-Project-Version: 2
 
 # Don't name these macros "GO" etc., because GNU Make apparently makes
 # them exported environment variables with the literal value of
@@ -24,10 +24,8 @@ CHANNEL = development
 CLIENT_DIR = client
 COMMIT = $$( git rev-parse --short HEAD )
 DIST_DIR = dist
-GOAMD64 = v1
 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
 GOSUMDB = sum.golang.google.cn
-GOTOOLCHAIN = go1.22.2
 GPG_KEY = devteam@adguard.com
 GPG_KEY_PASSPHRASE = not-a-real-password
 NPM = npm
@@ -57,16 +55,14 @@ BUILD_RELEASE_DEPS_0 = deps js-build
 BUILD_RELEASE_DEPS_1 = go-deps
 
 ENV = env\
-	CHANNEL='$(CHANNEL)'\
 	COMMIT='$(COMMIT)'\
-	DIST_DIR='$(DIST_DIR)'\
-	GO="$(GO.MACRO)"\
-	GOAMD64="$(GOAMD64)"\
-	GOPROXY='$(GOPROXY)'\
-	GOSUMDB='$(GOSUMDB)'\
-	GOTOOLCHAIN='$(GOTOOLCHAIN)'\
+	CHANNEL='$(CHANNEL)'\
 	GPG_KEY='$(GPG_KEY)'\
 	GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
+	DIST_DIR='$(DIST_DIR)'\
+	GO="$(GO.MACRO)"\
+	GOPROXY='$(GOPROXY)'\
+	GOSUMDB='$(GOSUMDB)'\
 	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
 	RACE='$(RACE)'\
 	SIGN='$(SIGN)'\
@@ -82,6 +78,8 @@ build: deps quick-build
 
 quick-build: js-build go-build
 
+ci: deps test go-bench go-fuzz
+
 deps: js-deps go-deps
 lint: js-lint go-lint
 test: js-test go-test
@@ -96,10 +94,15 @@ build-release: $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT))
 clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
 init:  ; git config core.hooksPath ./scripts/hooks
 
-js-build: ; $(NPM) $(NPM_FLAGS) run build-prod
-js-deps:  ; $(NPM) $(NPM_INSTALL_FLAGS) ci
-js-lint:  ; $(NPM) $(NPM_FLAGS) run lint
-js-test:  ; $(NPM) $(NPM_FLAGS) run test
+js-build:
+	$(NPM) $(NPM_FLAGS) run build-prod
+js-deps:
+	$(NPM) $(NPM_INSTALL_FLAGS) ci
+
+# TODO(a.garipov): Remove the legacy client tasks support once the new
+# client is done and the old one is removed.
+js-lint: ; $(NPM) $(NPM_FLAGS) run lint
+js-test: ; $(NPM) $(NPM_FLAGS) run test
 
 go-bench: ; $(ENV) "$(SHELL)" ./scripts/make/go-bench.sh
 go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
@@ -112,8 +115,6 @@ go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
 # targets.
 go-test:  ; $(ENV) RACE='1' "$(SHELL)" ./scripts/make/go-test.sh
 
-go-upd-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-upd-tools.sh
-
 go-check: go-tools go-lint go-test
 
 # A quick check to make sure that all supported operating systems can be
@@ -129,3 +130,10 @@ openapi-lint: ; cd ./openapi/ && $(YARN) test
 openapi-show: ; cd ./openapi/ && $(YARN) start
 
 txt-lint: ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh
+
+# TODO(a.garipov): Consider adding to scripts/ and the common project
+# structure.
+go-upd-tools:
+	cd ./internal/tools/ &&\
+		"$(GO.MACRO)" get -u &&\
+		"$(GO.MACRO)" mod tidy

README.md

@@ -1,75 +1,85 @@
  
 <p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="doc/adguard_home_darkmode.svg">
-    <img alt="AdGuard Home" src="doc/adguard_home_lightmode.svg" width="300px">
-  </picture>
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="doc/adguard_home_darkmode.svg">
+        <img alt="AdGuard Home" src="doc/adguard_home_lightmode.svg" width="300px">
+    </picture>
 </p>
 <h3 align="center">Privacy protection center for you and your devices</h3>
 <p align="center">
-  Free and open source, powerful network-wide ads & trackers blocking DNS server.
+    Free and open source, powerful network-wide ads & trackers blocking DNS
+    server.
 </p>
 <p align="center">
-  <a href="https://adguard.com/">AdGuard.com</a> |
-  <a href="https://github.com/AdguardTeam/AdGuardHome/wiki">Wiki</a> |
-  <a href="https://reddit.com/r/Adguard">Reddit</a> |
-  <a href="https://twitter.com/AdGuard">Twitter</a> |
-  <a href="https://t.me/adguard_en">Telegram</a>
-  <br/><br/>
-  <a href="https://codecov.io/github/AdguardTeam/AdGuardHome?branch=master">
-    <img src="https://img.shields.io/codecov/c/github/AdguardTeam/AdGuardHome/master.svg" alt="Code Coverage"/>
-  </a>
-  <a href="https://goreportcard.com/report/AdguardTeam/AdGuardHome">
-    <img src="https://goreportcard.com/badge/github.com/AdguardTeam/AdGuardHome" alt="Go Report Card"/>
-  </a>
-  <a href="https://hub.docker.com/r/adguard/adguardhome">
-    <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/adguard/adguardhome.svg?maxAge=604800"/>
-  </a>
-  <br/>
-  <a href="https://github.com/AdguardTeam/AdGuardHome/releases">
-    <img src="https://img.shields.io/github/release/AdguardTeam/AdGuardHome/all.svg" alt="Latest release"/>
-  </a>
-  <a href="https://snapcraft.io/adguard-home">
-    <img alt="adguard-home" src="https://snapcraft.io/adguard-home/badge.svg"/>
-  </a>
+    <a href="https://adguard.com/">AdGuard.com</a> |
+    <a href="https://github.com/AdguardTeam/AdGuardHome/wiki">Wiki</a> |
+    <a href="https://reddit.com/r/Adguard">Reddit</a> |
+    <a href="https://twitter.com/AdGuard">Twitter</a> |
+    <a href="https://t.me/adguard_en">Telegram</a>
+    <br/><br/>
+    <a href="https://codecov.io/github/AdguardTeam/AdGuardHome?branch=master">
+      <img src="https://img.shields.io/codecov/c/github/AdguardTeam/AdGuardHome/master.svg" alt="Code Coverage"/>
+    </a>
+    <a href="https://goreportcard.com/report/AdguardTeam/AdGuardHome">
+      <img src="https://goreportcard.com/badge/github.com/AdguardTeam/AdGuardHome" alt="Go Report Card"/>
+    </a>
+    <a href="https://hub.docker.com/r/adguard/adguardhome">
+        <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/adguard/adguardhome.svg?maxAge=604800"/>
+    </a>
+    <br/>
+    <a href="https://github.com/AdguardTeam/AdGuardHome/releases">
+        <img src="https://img.shields.io/github/release/AdguardTeam/AdGuardHome/all.svg" alt="Latest release"/>
+    </a>
+    <a href="https://snapcraft.io/adguard-home">
+        <img alt="adguard-home" src="https://snapcraft.io/adguard-home/badge.svg"/>
+    </a>
 </p>
 <br/>
 <p align="center">
-  <img src="https://cdn.adtidy.org/public/Adguard/Common/adguard_home.gif" width="800"/>
+    <img src="https://cdn.adtidy.org/public/Adguard/Common/adguard_home.gif" width="800"/>
 </p>
 <hr/>
 
-AdGuard Home is a network-wide software for blocking ads and tracking. After you set it up, it'll cover ALL your home devices, and you don't need any client-side software for that.
+AdGuard Home is a network-wide software for blocking ads and tracking. After you
+set it up, it'll cover ALL your home devices, and you don't need any client-side
+software for that.
 
-It operates as a DNS server that re-routes tracking domains to a “black hole”, thus preventing your devices from connecting to those servers. It's based on software we use for our public [AdGuard DNS] servers, and both share a lot of code.
+It operates as a DNS server that re-routes tracking domains to a “black hole”,
+thus preventing your devices from connecting to those servers.  It's based on
+software we use for our public [AdGuard DNS] servers, and both share a lot of
+code.
 
 [AdGuard DNS]: https://adguard-dns.io/
 
-- [Getting Started](#getting-started)
-    - [Automated install (Linux/Unix/MacOS/FreeBSD/OpenBSD)](#automated-install-linux-and-mac)
-    - [Alternative methods](#alternative-methods)
-    - [Guides](#guides)
-    - [API](#api)
-- [Comparing AdGuard Home to other solutions](#comparison)
-    - [How is this different from public AdGuard DNS servers?](#comparison-adguard-dns)
-    - [How does AdGuard Home compare to Pi-Hole](#comparison-pi-hole)
-    - [How does AdGuard Home compare to traditional ad blockers](#comparison-adblock)
-    - [Known limitations](#comparison-limitations)
-- [How to build from source](#how-to-build)
-    - [Prerequisites](#prerequisites)
-    - [Building](#building)
-- [Contributing](#contributing)
-    - [Test unstable versions](#test-unstable-versions)
-    - [Reporting issues](#reporting-issues)
-    - [Help with translations](#translate)
-    - [Other](#help-other)
-- [Projects that use AdGuard Home](#uses)
-- [Acknowledgments](#acknowledgments)
-- [Privacy](#privacy)
 
-## <a href="#getting-started" id="getting-started" name="getting-started">Getting Started</a>
 
-### <a href="#automated-install-linux-and-mac" id="automated-install-linux-and-mac" name="automated-install-linux-and-mac">Automated install (Linux/Unix/MacOS/FreeBSD/OpenBSD)</a>
+ *  [Getting Started](#getting-started)
+     *  [Automated install (Linux/Unix/MacOS/FreeBSD/OpenBSD)](#automated-install-linux-and-mac)
+     *  [Alternative methods](#alternative-methods)
+     *  [Guides](#guides)
+     *  [API](#api)
+ *  [Comparing AdGuard Home to other solutions](#comparison)
+     *  [How is this different from public AdGuard DNS servers?](#comparison-adguard-dns)
+     *  [How does AdGuard Home compare to Pi-Hole](#comparison-pi-hole)
+     *  [How does AdGuard Home compare to traditional ad blockers](#comparison-adblock)
+     *  [Known limitations](#comparison-limitations)
+ *  [How to build from source](#how-to-build)
+     *  [Prerequisites](#prerequisites)
+     *  [Building](#building)
+ *  [Contributing](#contributing)
+     *  [Test unstable versions](#test-unstable-versions)
+     *  [Reporting issues](#reporting-issues)
+     *  [Help with translations](#translate)
+     *  [Other](#help-other)
+ *  [Projects that use AdGuard Home](#uses)
+ *  [Acknowledgments](#acknowledgments)
+ *  [Privacy](#privacy)
+
+
+
+##  <a href="#getting-started" id="getting-started" name="getting-started">Getting Started</a>
+
+   ###  <a href="#automated-install-linux-and-mac" id="automated-install-linux-and-mac" name="automated-install-linux-and-mac">Automated install (Linux/Unix/MacOS/FreeBSD/OpenBSD)</a>
 
 To install with `curl` run the following command:
 
@@ -91,70 +101,95 @@ fetch -o - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scri
 
 The script also accepts some options:
 
-- `-c <channel>` to use specified channel;
-- `-r` to reinstall AdGuard Home;
-- `-u` to uninstall AdGuard Home;
-- `-v` for verbose output.
+ *  `-c <channel>` to use specified channel;
+ *  `-r` to reinstall AdGuard Home;
+ *  `-u` to uninstall AdGuard Home;
+ *  `-v` for verbose output.
 
 Note that options `-r` and `-u` are mutually exclusive.
 
-### <a href="#alternative-methods" id="alternative-methods" name="alternative-methods">Alternative methods</a>
 
-#### <a href="#manual-installation" id="manual-installation" name="manual-installation">Manual installation</a>
 
-Please read the **[Getting Started][wiki-start]** article on our Wiki to learn how to install AdGuard Home manually, and how to configure your devices to use it.
+   ###  <a href="#alternative-methods" id="alternative-methods" name="alternative-methods">Alternative methods</a>
 
-#### <a href="#docker" id="docker" name="docker">Docker</a>
+  ####  <a href="#manual-installation" id="manual-installation" name="manual-installation">Manual installation</a>
+
+Please read the **[Getting Started][wiki-start]** article on our Wiki to learn
+how to install AdGuard Home manually, and how to configure your devices to use
+it.
+
+  ####  <a href="#docker" id="docker" name="docker">Docker</a>
 
 You can use our official Docker image on [Docker Hub].
 
-#### <a href="#snap-store" id="snap-store" name="snap-store">Snap Store</a>
+  ####  <a href="#snap-store" id="snap-store" name="snap-store">Snap Store</a>
 
-If you're running **Linux,** there's a secure and easy way to install AdGuard Home: get it from the [Snap Store].
+If you're running **Linux,** there's a secure and easy way to install AdGuard
+Home: get it from the [Snap Store].
 
 [Docker Hub]: https://hub.docker.com/r/adguard/adguardhome
 [Snap Store]: https://snapcraft.io/adguard-home
 [wiki-start]: https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started
 
-### <a href="#guides" id="guides" name="guides">Guides</a>
+
+
+   ###  <a href="#guides" id="guides" name="guides">Guides</a>
 
 See our [Wiki][wiki].
 
 [wiki]: https://github.com/AdguardTeam/AdGuardHome/wiki
 
-### <a href="#api" id="api" name="api">API</a>
 
-If you want to integrate with AdGuard Home, you can use our [REST API][openapi]. Alternatively, you can use this [python client][pyclient], which is used to build the [AdGuard Home Hass.io Add-on][hassio].
+
+   ###  <a href="#api" id="api" name="api">API</a>
+
+If you want to integrate with AdGuard Home, you can use our [REST API][openapi].
+Alternatively, you can use this [python client][pyclient], which is used to
+build the [AdGuard Home Hass.io Add-on][hassio].
 
 [hassio]:   https://www.home-assistant.io/integrations/adguard/
 [openapi]:  https://github.com/AdguardTeam/AdGuardHome/tree/master/openapi
 [pyclient]: https://pypi.org/project/adguardhome/
 
-## <a href="#comparison" id="comparison" name="comparison">Comparing AdGuard Home to other solutions</a>
 
-### <a href="#comparison-adguard-dns" id="comparison-adguard-dns" name="comparison-adguard-dns">How is this different from public AdGuard DNS servers?</a>
 
-Running your own AdGuard Home server allows you to do much more than using a public DNS server. It's a completely different level. See for yourself:
+##  <a href="#comparison" id="comparison" name="comparison">Comparing AdGuard Home to other solutions</a>
 
-- Choose what exactly the server blocks and permits.
+   ###  <a href="#comparison-adguard-dns" id="comparison-adguard-dns" name="comparison-adguard-dns">How is this different from public AdGuard DNS servers?</a>
 
-- Monitor your network activity.
+Running your own AdGuard Home server allows you to do much more than using a
+public DNS server.  It's a completely different level.  See for yourself:
 
-- Add your own custom filtering rules.
+ *  Choose what exactly the server blocks and permits.
 
-- **Most importantly, it's your own server, and you are the only one who's in control.**
+ *  Monitor your network activity.
 
-### <a href="#comparison-pi-hole" id="comparison-pi-hole" name="comparison-pi-hole">How does AdGuard Home compare to Pi-Hole</a>
+ *  Add your own custom filtering rules.
 
-At this point, AdGuard Home has a lot in common with Pi-Hole. Both block ads and trackers using the so-called “DNS sinkholing” method and both allow customizing what's blocked.
+ *  **Most importantly, it's your own server, and you are the only one who's in
+    control.**
 
-> [!NOTE]
-> We're not going to stop here. DNS sinkholing is not a bad starting point, but this is just the beginning.
 
-AdGuard Home provides a lot of features out-of-the-box with no need to install and configure additional software. We want it to be simple to the point when even casual users can set it up with minimal effort.
 
-> [!NOTE]
-> Some of the listed features can be added to Pi-Hole by installing additional software or by manually using SSH terminal and reconfiguring one of the utilities Pi-Hole consists of. However, in our opinion, this cannot be legitimately counted as a Pi-Hole's feature.
+   ###  <a href="#comparison-pi-hole" id="comparison-pi-hole" name="comparison-pi-hole">How does AdGuard Home compare to Pi-Hole</a>
+
+At this point, AdGuard Home has a lot in common with Pi-Hole.  Both block ads
+and trackers using the so-called “DNS sinkholing” method and both allow
+customizing what's blocked.
+
+<aside>
+We're not going to stop here.  DNS sinkholing is not a bad starting point, but
+this is just the beginning.
+</aside>
+
+AdGuard Home provides a lot of features out-of-the-box with no need to install
+and configure additional software.  We want it to be simple to the point when
+even casual users can set it up with minimal effort.
+
+**Disclaimer:** some of the listed features can be added to Pi-Hole by
+installing additional software or by manually using SSH terminal and
+reconfiguring one of the utilities Pi-Hole consists of.  However, in our
+opinion, this cannot be legitimately counted as a Pi-Hole's feature.
 
 | Feature                                                                 | AdGuard&nbsp;Home | Pi-Hole                                                   |
 |-------------------------------------------------------------------------|-------------------|-----------------------------------------------------------|
@@ -166,51 +201,74 @@ AdGuard Home provides a lot of features out-of-the-box with no need to install a
 | Cross-platform                                                          | ✅                | ❌ (not natively, only via Docker)                        |
 | Running as a DNS-over-HTTPS or DNS-over-TLS server                      | ✅                | ❌ (requires additional software)                         |
 | Blocking phishing and malware domains                                   | ✅                | ❌ (requires non-default blocklists)                      |
-| Parental control (blocking adult domains)                               | ✅                | ❌ (requires non-default blocklists)                      |
+| Parental control (blocking adult domains)                               | ✅                | ❌                                                        |
 | Force Safe search on search engines                                     | ✅                | ❌                                                        |
 | Per-client (device) configuration                                       | ✅                | ✅                                                        |
 | Access settings (choose who can use AGH DNS)                            | ✅                | ❌                                                        |
 | Running [without root privileges][wiki-noroot]                          | ✅                | ❌                                                        |
 
-[wiki-noroot]: https://adguard-dns.io/kb/adguard-home/getting-started/#running-without-superuser
+[wiki-noroot]: https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser
 
-### <a href="#comparison-adblock" id="comparison-adblock" name="comparison-adblock">How does AdGuard Home compare to traditional ad blockers</a>
+
+
+   ###  <a href="#comparison-adblock" id="comparison-adblock" name="comparison-adblock">How does AdGuard Home compare to traditional ad blockers</a>
 
 It depends.
 
-DNS sinkholing is capable of blocking a big percentage of ads, but it lacks the flexibility and the power of traditional ad blockers. You can get a good impression about the difference between these methods by reading [this article][blog-adaway], which compares AdGuard for Android (a traditional ad blocker) to hosts-level ad blockers (which are almost identical to DNS-based blockers in their capabilities). This level of protection is enough for some users.
+DNS sinkholing is capable of blocking a big percentage of ads, but it lacks
+the flexibility and the power of traditional ad blockers.  You can get a good
+impression about the difference between these methods by reading [this
+article][blog-adaway], which compares AdGuard for Android (a traditional ad
+blocker) to hosts-level ad blockers (which are almost identical to DNS-based
+blockers in their capabilities).  This level of protection is enough for some
+users.
 
-Additionally, using a DNS-based blocker can help to block ads, tracking and analytics requests on other types of devices, such as SmartTVs, smart speakers or other kinds of IoT devices (on which you can't install traditional ad blockers).
+Additionally, using a DNS-based blocker can help to block ads, tracking and
+analytics requests on other types of devices, such as SmartTVs, smart speakers
+or other kinds of IoT devices (on which you can't install traditional ad
+blockers).
 
-### <a href="#comparison-limitations" id="comparison-limitations" name="comparison-limitations">Known limitations</a>
+
+
+   ###  <a href="#comparison-limitations" id="comparison-limitations" name="comparison-limitations">Known limitations</a>
 
 Here are some examples of what cannot be blocked by a DNS-level blocker:
 
-- YouTube, Twitch ads;
+ *  YouTube, Twitch ads;
 
-- Facebook, Twitter, Instagram sponsored posts.
+ *  Facebook, Twitter, Instagram sponsored posts.
 
-Essentially, any advertising that shares a domain with content cannot be blocked by a DNS-level blocker.
+Essentially, any advertising that shares a domain with content cannot be blocked
+by a DNS-level blocker.
 
-Is there a chance to handle this in the future?  DNS will never be enough to do this. Our only option is to use a content blocking proxy like what we do in the standalone AdGuard applications. We're [going to bring][issue-1228] this feature support to AdGuard Home in the future. Unfortunately, even in this case, there still will be cases when this won't be enough or would require quite a complicated configuration.
+Is there a chance to handle this in the future?  DNS will never be enough to do
+this.  Our only option is to use a content blocking proxy like what we do in the
+standalone AdGuard applications.  We're [going to bring][issue-1228] this
+feature support to AdGuard Home in the future.  Unfortunately, even in this
+case, there still will be cases when this won't be enough or would require quite
+a complicated configuration.
 
 [blog-adaway]: https://adguard.com/blog/adguard-vs-adaway-dns66.html
 [issue-1228]:  https://github.com/AdguardTeam/AdGuardHome/issues/1228
 
-## <a href="#how-to-build" id="how-to-build" name="how-to-build">How to build from source</a>
 
-### <a href="#prerequisites" id="prerequisites" name="prerequisites">Prerequisites</a>
+
+##  <a href="#how-to-build" id="how-to-build" name="how-to-build">How to build from source</a>
+
+   ###  <a href="#prerequisites" id="prerequisites" name="prerequisites">Prerequisites</a>
 
 Run `make init` to prepare the development environment.
 
 You will need this to build AdGuard Home:
 
-- [Go](https://golang.org/dl/) v1.22 or later;
-- [Node.js](https://nodejs.org/en/download/) v16 or later;
-- [npm](https://www.npmjs.com/) v8 or later;
-- [yarn](https://yarnpkg.com/) v1.22.5 or later.
+ *  [Go](https://golang.org/dl/) v1.20 or later;
+ *  [Node.js](https://nodejs.org/en/download/) v10.16.2 or later;
+ *  [npm](https://www.npmjs.com/) v6.14 or later;
+ *  [yarn](https://yarnpkg.com/) v1.22.5 or later.
 
-### <a href="#building" id="building" name="building">Building</a>
+
+
+   ###  <a href="#building" id="building" name="building">Building</a>
 
 Open your terminal and execute these commands:
 
@@ -220,22 +278,18 @@ cd AdGuardHome
 make
 ```
 
-#### <a href="#building-node" id="building-node" name="building-node">Building with Node.js 17 and later</a>
-
-In order to build AdGuard Home with Node.js 17 and later, specify `--openssl-legacy-provider` option.
-
-```sh
-export NODE_OPTIONS=--openssl-legacy-provider
-```
-
-> [!WARNING]
-> The non-standard `-j` flag is currently not supported, so building with `make -j 4` or setting your `MAKEFLAGS` to include, for example, `-j 4` is likely to break the build. If you do have your `MAKEFLAGS` set to that, and you don't want to change it, you can override it by running `make -j 1`.
+**NOTE:**  The non-standard `-j` flag is currently not supported, so building
+with `make -j 4` or setting your `MAKEFLAGS` to include, for example, `-j 4` is
+likely to break the build.  If you do have your `MAKEFLAGS` set to that, and you
+don't want to change it, you can override it by running `make -j 1`.
 
 Check the [`Makefile`][src-makefile] to learn about other commands.
 
-#### <a href="#building-cross" id="building-cross" name="building-cross">Building for a different platform</a>
+  #### <a href="#building-cross" id="building-cross" name="building-cross">Building for a different platform</a>
 
-You can build AdGuard Home for any OS/ARCH that Go supports. In order to do this, specify `GOOS` and `GOARCH` environment variables as macros when running `make`.
+You can build AdGuard Home for any OS/ARCH that Go supports.  In order to do
+this, specify `GOOS` and `GOARCH` environment variables as macros when running
+`make`.
 
 For example:
 
@@ -249,9 +303,10 @@ or:
 make GOOS='linux' GOARCH='arm64'
 ```
 
-#### <a href="#preparing-releases" id="preparing-releases" name="preparing-releases">Preparing releases</a>
+  ####  <a href="#preparing-releases" id="preparing-releases" name="preparing-releases">Preparing releases</a>
 
-You'll need [`snapcraft`] to prepare a release build. Once installed, run the following command:
+You'll need [`snapcraft`] to prepare a release build.  Once installed, run the
+following command:
 
 ```sh
 make build-release CHANNEL='...' VERSION='...'
@@ -259,39 +314,47 @@ make build-release CHANNEL='...' VERSION='...'
 
 See the [`build-release` target documentation][targ-release].
 
-#### <a href="#docker-image" id="docker-image" name="docker-image">Docker image</a>
+  ####  <a href="#docker-image" id="docker-image" name="docker-image">Docker image</a>
 
-Run `make build-docker` to build the Docker image locally (the one that we publish to DockerHub). Please note, that we're using [Docker Buildx][buildx] to build our official image.
+Run `make build-docker` to build the Docker image locally (the one that we
+publish to DockerHub).  Please note, that we're using [Docker Buildx][buildx] to
+build our official image.
 
 You may need to prepare before using these builds:
 
-- (Linux-only) Install Qemu:
+ *  (Linux-only) Install Qemu:
 
-  ```sh
-  docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
-  ```
+    ```sh
+    docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
+    ```
 
-- Prepare the builder:
+ *  Prepare the builder:
 
-  ```sh
-  docker buildx create --name buildx-builder --driver docker-container --use
-  ```
+    ```sh
+    docker buildx create --name buildx-builder --driver docker-container --use
+    ```
 
 See the [`build-docker` target documentation][targ-docker].
 
-#### <a href="#debugging-the-frontend" id="debugging-the-frontend" name="debugging-the-frontend">Debugging the frontend</a>
+  ####  <a href="#debugging-the-frontend" id="debugging-the-frontend" name="debugging-the-frontend">Debugging the frontend</a>
 
-When you need to debug the frontend without recompiling the production version every time, for example to check how your labels would look on a form, you can run the frontend build a development environment.
+When you need to debug the frontend without recompiling the production version
+every time, for example to check how your labels would look on a form, you can
+run the frontend build a development environment.
 
-1. In a separate terminal, run:
+1.  In a separate terminal, run:
 
-   ```sh
-   ( cd ./client/ && env NODE_ENV='development' npm run watch )
-   ```
+    ```sh
+    ( cd ./client/ && env NODE_ENV='development' npm run watch )
+    ```
 
-2. Run your `AdGuardHome` binary with the `--local-frontend` flag, which instructs AdGuard Home to ignore the built-in frontend files and use those from the `./build/` directory.
+2.  Run your `AdGuardHome` binary with the `--local-frontend` flag, which
+    instructs AdGuard Home to ignore the built-in frontend files and use those
+    from the `./build/` directory.
 
-3. Now any changes you make in the `./client/` directory should be recompiled and become available on the web UI. Make sure that you disable the browser cache to make sure that you actually get the recompiled version.
+3.  Now any changes you make in the `./client/` directory should be recompiled
+    and become available on the web UI.  Make sure that you disable the browser
+    cache to make sure that you actually get the recompiled version.
 
 [`snapcraft`]:  https://snapcraft.io/
 [buildx]:       https://docs.docker.com/buildx/working-with-buildx/
@@ -299,120 +362,169 @@ When you need to debug the frontend without recompiling the production version e
 [targ-docker]:  https://github.com/AdguardTeam/AdGuardHome/tree/master/scripts#build-dockersh-build-a-multi-architecture-docker-image
 [targ-release]: https://github.com/AdguardTeam/AdGuardHome/tree/master/scripts#build-releasesh-build-a-release-for-all-platforms
 
+
+
 ## <a href="#contributing" id="contributing" name="contributing">Contributing</a>
 
-You are welcome to fork this repository, make your changes and [submit a pull request][pr]. Please make sure you follow our [code guidelines][guide] though.
+You are welcome to fork this repository, make your changes and [submit a pull
+request][pr].  Please make sure you follow our [code guidelines][guide] though.
 
-Please note that we don't expect people to contribute to both UI and backend parts of the program simultaneously. Ideally, the backend part is implemented first, i.e. configuration, API, and the functionality itself. The UI part can be implemented later in a different pull request by a different person.
+Please note that we don't expect people to contribute to both UI and backend
+parts of the program simultaneously.  Ideally, the backend part is implemented
+first, i.e. configuration, API, and the functionality itself.  The UI part can
+be implemented later in a different pull request by a different person.
 
 [guide]: https://github.com/AdguardTeam/CodeGuidelines/
 [pr]:    https://github.com/AdguardTeam/AdGuardHome/pulls
 
-### <a href="#test-unstable-versions" id="test-unstable-versions" name="test-unstable-versions">Test unstable versions</a>
+
+
+   ###  <a href="#test-unstable-versions" id="test-unstable-versions" name="test-unstable-versions">Test unstable versions</a>
 
 There are two update channels that you can use:
 
-- `beta`: beta versions of AdGuard Home. More or less stable versions, usually released every two weeks or more often.
+ *  `beta`: beta versions of AdGuard Home.  More or less stable versions,
+    usually released every two weeks or more often.
 
-- `edge`: the newest version of AdGuard Home from the development branch. New updates are pushed to this channel daily.
+ *  `edge`: the newest version of AdGuard Home from the development branch.  New
+    updates are pushed to this channel daily.
 
 There are three options how you can install an unstable version:
 
-1. [Snap Store]: look for the `beta` and `edge` channels.
+1.  [Snap Store]: look for the `beta` and `edge` channels.
 
-2. [Docker Hub]: look for the `beta` and `edge` tags.
+2.  [Docker Hub]: look for the `beta` and `edge` tags.
 
-3. Standalone builds. Use the automated installation script or look for the available builds [on the Wiki][wiki-platf].
+3.  Standalone builds.  Use the automated installation script or look for the
+    available builds [on the Wiki][wiki-platf].
 
-   Script to install a beta version:
+    Script to install a beta version:
 
-   ```sh
-   curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c beta
-   ```
+    ```sh
+    curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c beta
+    ```
 
-   Script to install an edge version:
-
-   ```sh
-   curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c edge
-   ```
+    Script to install an edge version:
 
+    ```sh
+    curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c edge
+    ```
 [wiki-platf]: https://github.com/AdguardTeam/AdGuardHome/wiki/Platforms
 
-### <a href="#reporting-issues" id="reporting-issues" name="reporting-issues">Report issues</a>
 
-If you run into any problem or have a suggestion, head to [this page][iss] and click on the “New issue” button. Please follow the instructions in the issue form carefully and don't forget to start by searching for duplicates.
+
+   ###  <a href="#reporting-issues" id="reporting-issues" name="reporting-issues">Report issues</a>
+
+If you run into any problem or have a suggestion, head to [this page][iss] and
+click on the “New issue” button.  Please follow the instructions in the issue
+form carefully and don't forget to start by searching for duplicates.
 
 [iss]: https://github.com/AdguardTeam/AdGuardHome/issues
 
-### <a href="#translate" id="translate" name="translate">Help with translations</a>
 
-If you want to help with AdGuard Home translations, please learn more about translating AdGuard products [in our Knowledge Base][kb-trans]. You can contribute to the [AdGuardHome project on CrowdIn][crowdin].
+
+   ###  <a href="#translate" id="translate" name="translate">Help with translations</a>
+
+If you want to help with AdGuard Home translations, please learn more about
+translating AdGuard products [in our Knowledge Base][kb-trans].  You can
+contribute to the [AdGuardHome project on CrowdIn][crowdin].
 
 [crowdin]:  https://crowdin.com/project/adguard-applications/en#/adguard-home
 [kb-trans]: https://kb.adguard.com/en/general/adguard-translations
 
-### <a href="#help-other" id="help-other" name="help-other">Other</a>
 
-Another way you can contribute is by [looking for issues][iss-help] marked as `help wanted`, asking if the issue is up for grabs, and sending a PR fixing the bug or implementing the feature.
+
+   ###  <a href="#help-other" id="help-other" name="help-other">Other</a>
+
+Another way you can contribute is by [looking for issues][iss-help] marked as
+`help wanted`, asking if the issue is up for grabs, and sending a PR fixing the
+bug or implementing the feature.
 
 [iss-help]: https://github.com/AdguardTeam/AdGuardHome/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
 
+
+
 ## <a href="#uses" id="uses" name="uses">Projects that use AdGuard Home</a>
 
-Please note that these projects are not affiliated with AdGuard, but are made by third-party developers and fans.
+<!--
+    TODO(a.garipov): Use reference links.
+-->
 
-- [AdGuard Home Remote](https://apps.apple.com/app/apple-store/id1543143740): iOS app by [Joost](https://rocketscience-it.nl/).
+ *  [AdGuard Home Remote](https://apps.apple.com/app/apple-store/id1543143740):
+    iOS app by [Joost](https://rocketscience-it.nl/).
 
-- [Python library](https://github.com/frenck/python-adguardhome) by [@frenck](https://github.com/frenck).
+ *  [Python library](https://github.com/frenck/python-adguardhome) by
+    [@frenck](https://github.com/frenck).
 
-- [Home Assistant add-on](https://github.com/hassio-addons/addon-adguard-home) by [@frenck](https://github.com/frenck).
+ *  [Home Assistant add-on](https://github.com/hassio-addons/addon-adguard-home)
+    by [@frenck](https://github.com/frenck).
 
-- [OpenWrt LUCI app](https://github.com/kongfl888/luci-app-adguardhome) by [@kongfl888](https://github.com/kongfl888) (originally by [@rufengsuixing](https://github.com/rufengsuixing)).
+ *  [OpenWrt LUCI app](https://github.com/kongfl888/luci-app-adguardhome) by
+    [@kongfl888](https://github.com/kongfl888) (originally by
+    [@rufengsuixing](https://github.com/rufengsuixing)).
 
-- [AdGuardHome sync](https://github.com/bakito/adguardhome-sync) by [@bakito](https://github.com/bakito).
+ *  [Prometheus exporter for AdGuard
+    Home](https://github.com/ebrianne/adguard-exporter) by
+    [@ebrianne](https://github.com/ebrianne).
 
-- [Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance](https://github.com/Lissy93/AdGuardian-Term) by [@Lissy93](https://github.com/Lissy93)
+ *  [Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home
+    instance](https://github.com/Lissy93/AdGuardian-Term) by
+    [@Lissy93](https://github.com/Lissy93)
 
-- [AdGuard Home on GLInet routers](https://forum.gl-inet.com/t/adguardhome-on-gl-routers/10664) by [Gl-Inet](https://gl-inet.com/).
+ *  [AdGuard Home on GLInet
+    routers](https://forum.gl-inet.com/t/adguardhome-on-gl-routers/10664) by
+    [Gl-Inet](https://gl-inet.com/).
 
-- [Cloudron app](https://git.cloudron.io/cloudron/adguard-home-app) by [@gramakri](https://github.com/gramakri).
+ *  [Cloudron app](https://git.cloudron.io/cloudron/adguard-home-app) by
+    [@gramakri](https://github.com/gramakri).
 
-- [Asuswrt-Merlin-AdGuardHome-Installer](https://github.com/jumpsmm7/Asuswrt-Merlin-AdGuardHome-Installer) by [@jumpsmm7](https://github.com/jumpsmm7) aka [@SomeWhereOverTheRainBow](https://www.snbforums.com/members/somewhereovertherainbow.64179/).
+ *  [Asuswrt-Merlin-AdGuardHome-Installer](https://github.com/jumpsmm7/Asuswrt-Merlin-AdGuardHome-Installer)
+    by [@jumpsmm7](https://github.com/jumpsmm7) aka
+    [@SomeWhereOverTheRainBow](https://www.snbforums.com/members/somewhereovertherainbow.64179/).
 
-- [Node.js library](https://github.com/Andrea055/AdguardHomeAPI) by [@Andrea055](https://github.com/Andrea055/).
+ *  [Node.js library](https://github.com/Andrea055/AdguardHomeAPI) by
+    [@Andrea055](https://github.com/Andrea055/).
 
-- [Browser Extension](https://github.com/satheshshiva/Adguard-Home-Browser-Ext) by [@satheshshiva](https://github.com/satheshshiva/).
 
-- [Zabbix Template for AdGuard Home](https://github.com/diasdmhub/AdGuard_Home_Zabbix_Template) by [@diasdmhub](https://github.com/diasdmhub).
-
-- [Chocolatey package](https://community.chocolatey.org/packages/adguardhome/) by [niks255](https://community.chocolatey.org/profiles/niks255).
 
 ## <a href="#acknowledgments" id="acknowledgments" name="acknowledgments">Acknowledgments</a>
 
+<!--
+    TODO(a.garipov): Use reference links.
+-->
+
 This software wouldn't have been possible without:
 
-- [Go](https://golang.org/dl/) and its libraries:
-    - [gcache](https://github.com/bluele/gcache)
-    - [miekg's dns](https://github.com/miekg/dns)
-    - [go-yaml](https://github.com/go-yaml/yaml)
-    - [service](https://godoc.org/github.com/kardianos/service)
-    - [dnsproxy](https://github.com/AdguardTeam/dnsproxy)
-    - [urlfilter](https://github.com/AdguardTeam/urlfilter)
-- [Node.js](https://nodejs.org/) and its libraries:
-    - [React.js](https://reactjs.org)
-    - [Tabler](https://github.com/tabler/tabler)
-    - And many more Node.js packages.
-- [whotracks.me data](https://github.com/cliqz-oss/whotracks.me)
+ *  [Go](https://golang.org/dl/) and its libraries:
+     *  [gcache](https://github.com/bluele/gcache)
+     *  [miekg's dns](https://github.com/miekg/dns)
+     *  [go-yaml](https://github.com/go-yaml/yaml)
+     *  [service](https://godoc.org/github.com/kardianos/service)
+     *  [dnsproxy](https://github.com/AdguardTeam/dnsproxy)
+     *  [urlfilter](https://github.com/AdguardTeam/urlfilter)
+ *  [Node.js](https://nodejs.org/) and its libraries:
+     *  And many more Node.js packages.
+     *  [React.js](https://reactjs.org)
+     *  [Tabler](https://github.com/tabler/tabler)
+ *  [whotracks.me data](https://github.com/cliqz-oss/whotracks.me)
 
-You might have seen that [CoreDNS] was mentioned here before, but we've stopped using it in AdGuard Home.
+You might have seen that [CoreDNS] was mentioned here before, but we've stopped
+using it in AdGuard Home.
 
-For the full list of all Node.js packages in use, please take a look at [`client/package.json`][src-packagejson] file.
+For the full list of all Node.js packages in use, please take a look at
+[`client/package.json`][src-packagejson] file.
 
 [CoreDNS]:         https://coredns.io
 [src-packagejson]: https://github.com/AdguardTeam/AdGuardHome/blob/master/client/package.json
 
-## <a href="#privacy" id="privacy" name="privacy">Privacy</a>
 
-Our main idea is that you are the one, who should be in control of your data. So it is only natural, that AdGuard Home does not collect any usage statistics, and does not use any web services unless you configure it to do so. See also the [full privacy policy][privacy] with every bit that *could in theory be sent* by AdGuard Home is available.
+
+##  <a href="#privacy" id="privacy" name="privacy">Privacy</a>
+
+Our main idea is that you are the one, who should be in control of your data.
+So it is only natural, that AdGuard Home does not collect any usage statistics,
+and does not use any web services unless you configure it to do so.  See also
+the [full privacy policy][privacy] with every bit that *could in theory be sent*
+by AdGuard Home is available.
 
 [privacy]: https://adguard.com/en/privacy/home.html

SECURITY.md

@@ -1,13 +1,18 @@
-# Security Policy
+ #  Security Policy
 
-## Reporting vulnerabilities
+## Reporting a Vulnerability
 
-Please send your vulnerability reports to <security@adguard.com>.  To make sure that your report reaches us, please:
+Please send your vulnerability reports to <security@adguard.com>.  To make sure
+that your report reaches us, please:
 
-1. Include the words “AdGuard Home” and “vulnerability” to the subject line as well as a short description of the vulnerability.  For example:
+1.  Include the words “AdGuard Home” and “vulnerability” to the subject line as
+    well as a short description of the vulnerability.  For example:
 
-   > AdGuard Home API vulnerability: possible XSS attack
+     >  AdGuard Home API vulnerability: possible XSS attack
 
-1. Make sure that the message body contains a clear description of the vulnerability.
+2.  Make sure that the message body contains a clear description of the
+    vulnerability.
 
-If you have not received a reply to your email within 7 days, please make sure to follow up with us again at <security@adguard.com>.  Once again, make sure that the word “vulnerability” is in the subject line.
+If you have not received a reply to your email within 7 days, please make sure
+to follow up with us again at <security@adguard.com>.  Once again, make sure
+that the word “vulnerability” is in the subject line.

bamboo-specs/release.yaml

@@ -7,8 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
-    'dockerFrontend': 'adguard/home-js-builder:1.1'
-    'dockerGo': 'adguard/go-builder:1.22.2--1'
+    'dockerGo': 'adguard/golang-ubuntu:7.1'
 
 'stages':
   - 'Build frontend':
@@ -42,13 +41,8 @@
           - 'Publish to GitHub Releases'
 
 'Build frontend':
-    'artifacts':
-      - 'name': 'AdGuardHome frontend'
-        'pattern': 'build/**'
-        'shared': true
-        'required': true
     'docker':
-        'image': '${bamboo.dockerFrontend}'
+        'image': '${bamboo.dockerGo}'
         'volumes':
             '${system.YARN_DIR}': '${bamboo.cacheYarn}'
     'key': 'BF'
@@ -65,21 +59,19 @@
 
                 set -e -f -u -x
 
-                make\
-                        VERBOSE=1\
-                        js-deps js-build
+                # Explicitly checkout the revision that we need.
+                git checkout "${bamboo.repository.revision.number}"
+
+                make js-deps js-build
+    'artifacts':
+      - 'name': 'AdGuardHome frontend'
+        'pattern': 'build/**'
+        'shared': true
+        'required': true
     'requirements':
       - 'adg-docker': 'true'
 
 'Make release':
-    'artifact-subscriptions':
-      - 'artifact': 'AdGuardHome frontend'
-    # TODO(a.garipov): Use more fine-grained artifact rules.
-    'artifacts':
-      - 'name': 'AdGuardHome dists'
-        'pattern': 'dist/**'
-        'shared': true
-        'required': true
     'docker':
         'image': '${bamboo.dockerGo}'
         'volumes':
@@ -99,6 +91,9 @@
 
                 set -e -f -u -x
 
+                # Explicitly checkout the revision that we need.
+                git checkout "${bamboo.repository.revision.number}"
+
                 # Run the build with the specified channel.
                 echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
                         | awk '{ gsub(/\\n/, "\n"); print; }'\
@@ -111,6 +106,12 @@
                         PARALLELISM=1\
                         VERBOSE=2\
                         build-release
+    # TODO(a.garipov): Use more fine-grained artifact rules.
+    'artifacts':
+      - 'name': 'AdGuardHome dists'
+        'pattern': 'dist/**'
+        'shared': true
+        'required': true
     'requirements':
       - 'adg-docker': 'true'
 
@@ -129,6 +130,13 @@
 
                 set -e -f -u -x
 
+                COMMIT="${bamboo.repository.revision.number}"
+                export COMMIT
+                readonly COMMIT
+
+                # Explicitly checkout the revision that we need.
+                git checkout "$COMMIT"
+
                 # Install Qemu, create builder.
                 docker version -f '{{ .Server.Experimental }}'
                 docker buildx rm buildx-builder || :
@@ -149,7 +157,6 @@
                 # Prepare and push the build.
                 env\
                         CHANNEL="${bamboo.channel}"\
-                        COMMIT="${bamboo.repository.revision.number}"\
                         DIST_DIR='dist'\
                         DOCKER_IMAGE_NAME='adguard/adguardhome'\
                         DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
@@ -265,8 +272,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerFrontend': 'adguard/home-js-builder:1.1'
-            'dockerGo': 'adguard/go-builder:1.22.2--1'
+            'dockerGo': 'adguard/golang-ubuntu:7.1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -281,5 +287,4 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerFrontend': 'adguard/home-js-builder:1.1'
-            'dockerGo': 'adguard/go-builder:1.22.2--1'
+            'dockerGo': 'adguard/golang-ubuntu:7.1'

bamboo-specs/snapcraft.yaml

@@ -10,7 +10,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
-    'dockerSnap': 'adguard/snap-builder:1.1'
+    'dockerGo': 'adguard/golang-ubuntu:7.1'
     'snapcraftChannel': 'edge'
 
 'stages':
@@ -53,7 +53,7 @@
         'shared': true
         'required': true
     'docker':
-        'image': '${bamboo.dockerSnap}'
+        'image': '${bamboo.dockerGo}'
     'key': 'DR'
     'other':
         'clean-working-dir': true
@@ -99,7 +99,7 @@
         'shared': true
         'required': true
     'docker':
-        'image': '${bamboo.dockerSnap}'
+        'image': '${bamboo.dockerGo}'
     'key': 'BP'
     'other':
         'clean-working-dir': true
@@ -127,7 +127,7 @@
       - 'artifact': 'armhf_snap'
       - 'artifact': 'arm64_snap'
     'docker':
-        'image': '${bamboo.dockerSnap}'
+        'image': '${bamboo.dockerGo}'
     'key': 'PTS'
     'other':
         'clean-working-dir': true
@@ -191,7 +191,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
-            'dockerSnap': 'adguard/snap-builder:1.1'
+            'dockerGo': 'adguard/golang-ubuntu:7.1'
             'snapcraftChannel': 'beta'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
@@ -207,5 +207,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
-            'dockerSnap': 'adguard/snap-builder:1.1'
+            'dockerGo': 'adguard/golang-ubuntu:7.1'
             'snapcraftChannel': 'candidate'

bamboo-specs/test.yaml

@@ -5,23 +5,14 @@
     'key': 'AHBRTSPECS'
     'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerFrontend': 'adguard/home-js-builder:1.1'
-    'dockerGo': 'adguard/go-builder:1.22.2--1'
-    'channel': 'development'
+    'dockerGo': 'adguard/golang-ubuntu:7.1'
 
 'stages':
   - 'Tests':
         'manual': false
         'final': false
         'jobs':
-          - 'Test frontend'
-          - 'Test backend'
-
-  - 'Frontend':
-        manual: false
-        final: false
-        jobs:
-          - 'Build frontend'
+          - 'Test'
 
   - 'Artifact':
         manual: false
@@ -29,38 +20,14 @@
         jobs:
           - 'Artifact'
 
-'Test frontend':
-    'docker':
-        'image': '${bamboo.dockerFrontend}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-    'key': 'JSTEST'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
-
-                set -e -f -u -x
-
-                make VERBOSE=1 js-deps js-lint js-test
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
-
-'Test backend':
+'Test':
     'docker':
         'image': '${bamboo.dockerGo}'
         'volumes':
+            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
             '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
             '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
-    'key': 'GOTEST'
+    'key': 'TEST'
     'other':
         'clean-working-dir': true
     'tasks':
@@ -74,65 +41,13 @@
 
                 set -e -f -u -x
 
-                make\
-                    GOMAXPROCS=1\
-                    VERBOSE=1\
-                    go-deps go-tools go-lint
-
-                make\
-                    VERBOSE=1\
-                    go-test
+                make VERBOSE=1 ci go-tools lint
     'final-tasks':
       - 'clean'
     'requirements':
       - 'adg-docker': 'true'
 
-'Build frontend':
-    'artifacts':
-      - 'name': 'AdGuardHome frontend'
-        'pattern': 'build/**'
-        'shared': true
-        'required': true
-    'docker':
-        'image': '${bamboo.dockerFrontend}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-    'key': 'BF'
-    'other':
-         'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |-
-                #!/bin/sh
-
-                set -e -f -u -x
-
-                make\
-                        VERBOSE=1\
-                        js-deps js-build
-    'requirements':
-      - 'adg-docker': 'true'
-
 'Artifact':
-    'artifact-subscriptions':
-      - 'artifact': 'AdGuardHome frontend'
-    'artifacts':
-      - 'name': 'AdGuardHome_windows_amd64'
-        'pattern': 'dist/AdGuardHome_windows_amd64.zip'
-        'shared': true
-        'required': true
-      - 'name': 'AdGuardHome_darwin_amd64'
-        'pattern': 'dist/AdGuardHome_darwin_amd64.zip'
-        'shared': true
-        'required': true
-      - 'name': 'AdGuardHome_linux_amd64'
-        'pattern': 'dist/AdGuardHome_linux_amd64.tar.gz'
-        'shared': true
-        'required': true
     'docker':
         'image': '${bamboo.dockerGo}'
         'volumes':
@@ -152,15 +67,30 @@
 
                 set -e -f -u -x
 
+                # Explicitly checkout the revision that we need.
+                git checkout "${bamboo.repository.revision.number}"
+
                 make\
                         ARCH="amd64"\
-                        CHANNEL=${bamboo.channel}\
-                        FRONTEND_PREBUILT=1\
                         OS="windows darwin linux"\
-                        PARALLELISM=1\
+                        CHANNEL="development"\
                         SIGN=0\
+                        PARALLELISM=1\
                         VERBOSE=2\
                         build-release
+    'artifacts':
+      - 'name': 'AdGuardHome_windows_amd64'
+        'pattern': 'dist/AdGuardHome_windows_amd64.zip'
+        'shared': true
+        'required': true
+      - 'name': 'AdGuardHome_darwin_amd64'
+        'pattern': 'dist/AdGuardHome_darwin_amd64.zip'
+        'shared': true
+        'required': true
+      - 'name': 'AdGuardHome_linux_amd64'
+        'pattern': 'dist/AdGuardHome_linux_amd64.tar.gz'
+        'shared': true
+        'required': true
     'requirements':
       - 'adg-docker': 'true'
 
@@ -185,15 +115,3 @@
 'labels': []
 'other':
     'concurrent-build-plugin': 'system-default'
-
-'branch-overrides':
-    # rc-vX.Y.Z branches are the release candidate branches. They are created
-    # from the release branch and are used to build the release candidate
-    # images.
-  - '^rc-v[0-9]+\.[0-9]+\.[0-9]+':
-        # Set the default release channel on the release branch to beta, as we
-        # may need to build a few of these.
-        'variables':
-            'dockerFrontend': 'adguard/home-js-builder:1.1'
-            'dockerGo': 'adguard/go-builder:1.22.2--1'
-            'channel': 'candidate'

client/package.json

@@ -16,7 +16,6 @@
         "@nivo/line": "^0.64.0",
         "axios": "^0.19.2",
         "classnames": "^2.2.6",
-        "countries-and-timezones": "^3.6.0",
         "date-fns": "^1.29.0",
         "i18next": "^19.6.2",
         "i18next-browser-languagedetector": "^4.2.0",
@@ -43,6 +42,8 @@
         "redux-actions": "^2.6.5",
         "redux-form": "^8.3.5",
         "redux-thunk": "^2.3.0",
+        "string-length": "^5.0.1",
+        "timezones-list": "^3.0.2",
         "url-polyfill": "^1.1.9"
     },
     "devDependencies": {

client/src/__locales/ar.json

@@ -278,7 +278,6 @@
     "custom_ip": "عنوان IP مخصص",
     "blocking_ipv4": "حجب عنوان IPv4",
     "blocking_ipv6": "حجب عنوان IPv6",
-    "blocked_response_ttl": "زمن حظر الاستجابة",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -599,7 +598,7 @@
     "all_queries": "كافة الاستفسارات",
     "show_blocked_responses": "حظر",
     "show_whitelisted_responses": "القائمة البيضاء",
-    "show_processed_responses": "معالجة",
+    "show_processed_responses": "المعالجة",
     "blocked_safebrowsing": "محظور بواسطة التصفح الآمن",
     "blocked_adult_websites": "محظور بواسطة الرقابة الأبوية",
     "blocked_threats": "التهديدات المحظورة",

client/src/__locales/be.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Налады кліентаў",
     "example_upstream_reserved": "upstream <0>для канкрэтных даменаў</0>;",
-    "example_multiple_upstreams_reserved": "некалькі DNS-сервераў <0>для канкрэтных даменаў</0>;",
     "example_upstream_comment": "каментар.",
     "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту",
     "parallel_requests": "Паралельныя запыты",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Ваша сістэма выкарыстоўвае дынамічны IP-адрас для інтэрфейсу <0>{{interfaceName}}</0>. Каб выкарыстоўваць DHCP-сервер трэба ўсталяваць статычны IP-адрас. Ваш бягучы IP-адрас – <0>{{ipAddress}}</0>. Мы аўтаматычна ўсталюем яго як статычны, калі вы націснеце кнопку «Ўключыць DHCP».",
     "dhcp_lease_added": "Статычная арэнда «{{key}}» паспяхова дададзена",
     "dhcp_lease_deleted": "Статычная арэнда «{{key}}» паспяхова выдалена",
-    "dhcp_lease_updated": "Статычная арэнда \"{{key}}\" паспяхова абноўлена",
     "dhcp_new_static_lease": "Новая статычная арэнда",
-    "dhcp_edit_static_lease": "Рэдагаваць статычную арэнду",
     "dhcp_static_leases_not_found": "Не знойдзена статычных арэнд DHCP",
     "dhcp_add_static_lease": "Дадаць статычную арэнду",
     "dhcp_reset_leases": "Скінуць усё арэнды",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Заблакаваныя шкодныя і фішынгавыя сайты",
     "stats_adult": "Заблакаваныя «дарослыя» сайты",
     "stats_query_domain": "Часта запытаныя дамены",
-    "for_last_hours": "за апошнюю {{count}} гадзіну",
-    "for_last_hours_plural": "за апошнія {{count}} гадзін",
+    "for_last_24_hours": "за 24 гадзіны",
     "for_last_days": "за апошні {{count}} дзень",
     "for_last_days_plural": "за апошнія {{count}} дзён",
     "stats_disabled": "Статыстыка была адключаная. Вы можаце ўключыць яго <0>на старонцы налад </0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Няма дадзеных аб upstream серверах",
     "number_of_dns_query_days": "Колькасць DNS-запытаў за апошні {{count}} дзень",
     "number_of_dns_query_days_plural": "Колькасць DNS запытаў, апрацаваных за апошнія {{count}} дзён",
-    "number_of_dns_query_hours": "Колькасць DNS-запытаў, апрацаваных за апошнюю {{count}} гадзіну",
-    "number_of_dns_query_hours_plural": "Колькасць DNS-запытаў, апрацаваных за апошнія {{count}} гадзін",
+    "number_of_dns_query_24_hours": "Колькасць DNS-запытаў за 24 гадзіны",
     "number_of_dns_query_blocked_24_hours": "Колькасць DNS-запытаў, заблакаваных фільтрамі і блок-спісамі",
     "number_of_dns_query_blocked_24_hours_by_sec": "Колькасць DNS-запытаў, заблакаваных модулем Антыфішынгу AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Колькасць заблакаваных «сайтаў для дарослых»",
     "enforced_save_search": "Ужыты бяспечны пошук",
     "number_of_dns_query_to_safe_search": "Колькасць запытаў DNS для пошукавых сістэм, для якіх быў ужыты Бяспечны пошук",
     "average_processing_time": "Сярэдні час апрацоўкі запыту",
-    "average_upstream_response_time": "Сярэдні час водгуку upstream-сервера",
-    "response_time": "Час водгуку",
+    "processing_time": "Час апрацоўкі",
     "average_processing_time_hint": "Сярэдні час для апрацоўкі запыту DNS  у мілісекундах",
     "block_domain_use_filters_and_hosts": "Блакаваць дамены з выкарыстаннем фільтраў і файлаў хастоў",
     "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў «<a>Фільтрах</a>».",
@@ -180,7 +174,6 @@
     "enabled_parental_toast": "Уключаны бацькоўскі кантроль",
     "disabled_safe_search_toast": "Адключаны бяспечны пошук",
     "enabled_save_search_toast": "Уключаны бяспечны пошук",
-    "updated_save_search_toast": "Налады бяспечнага пошуку абноўлены",
     "enabled_table_header": "УКЛ.",
     "name_table_header": "Імя",
     "list_url_table_header": "URL-адрас спіса",
@@ -236,7 +229,6 @@
     "updated_upstream_dns_toast": "Upstream DNS-серверы абноўлены",
     "dns_test_ok_toast": "Паказаныя серверы DNS працуюць карэктна",
     "dns_test_not_ok_toast": "Сервер «{{key}}»: немагчыма выкарыстоўваць, праверце слушнасць напісання",
-    "dns_test_parsing_error_toast": "Раздзел {{section}}: радок {{line}}: немагчыма выкарыстоўваць, праверце слушнасць напісання",
     "dns_test_warning_toast": "Upstream «{{key}}» не адказвае на тэставыя запыты і можа не працаваць належным чынам",
     "unblock": "Адблакаваць",
     "block": "Заблакаваць",
@@ -244,7 +236,6 @@
     "allow_this_client": "Дазволіць доступ гэтаму кліенту",
     "block_for_this_client_only": "Заблакаваць толькі для гэтага кліента",
     "unblock_for_this_client_only": "Адблакаваць толькі для гэтага кліента",
-    "add_persistent_client": "Дадаць у захаваныя кліенты",
     "time_table_header": "Час",
     "date": "Дата",
     "domain_name_table_header": "Дамен",
@@ -291,9 +282,6 @@
     "custom_ip": "Свой IP",
     "blocking_ipv4": "Блакаванне IPv4",
     "blocking_ipv6": "Блакаванне IPv6",
-    "blocked_response_ttl": "TTL заблакаванага адказу",
-    "blocked_response_ttl_desc": "Паказвае, на працягу колькіх секунд кліенты павінны кэшаваць адфільтраваць адказ",
-    "form_enter_blocked_response_ttl": "Увядзіце TTL заблакіраванага адказу (у секундах)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -309,19 +297,7 @@
     "rate_limit": "Ограничение скорости",
     "edns_enable": "Уключыць адпраўленне EDNS Client Subnet",
     "edns_cs_desc": "Дадайце опцыю кліенцкай падсеткі EDNS (ECS) да запытаў вышэй па плыні і запісвайце значэнні, адпраўленыя кліентамі, у журнал запытаў.",
-    "edns_use_custom_ip": "Выкарыстоўваць указаны IP для DNS",
-    "edns_use_custom_ip_desc": "Дазволіць выкарыстоўваць уласны IP для DNS",
     "rate_limit_desc": "Абмежаванне на колькасць запытаў у секунду для кожнага кліента (0 — неабмежавана)",
-    "rate_limit_subnet_len_ipv4": "Даўжыня прэфікса падсеткі для адрасоў IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Даўжыня прэфікса падсеткі для адрасоў IPv4, якія выкарыстоўваюцца для абмежавання хуткасці. Значэнне па змаўчанні 24",
-    "rate_limit_subnet_len_ipv4_error": "Даўжыня прэфікса падсеткі IPv4 павінна быць ад 0 да 32",
-    "rate_limit_subnet_len_ipv6": "Даўжыня прэфікса падсеткі для адрасоў IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Даўжыня прэфікса падсеткі для адрасоў IPv6, якія выкарыстоўваюцца для абмежавання хуткасці. Значэнне па змаўчанні 56",
-    "rate_limit_subnet_len_ipv6_error": "Даўжыня прэфікса падсеткі IPv6 павінна быць ад 0 да 128",
-    "form_enter_rate_limit_subnet_len": "Увядзіце даўжыню прэфікса падсеткі для абмежавання хуткасці",
-    "rate_limit_whitelist": "Белы спіс з абмежаваннем хуткасці",
-    "rate_limit_whitelist_desc": "IP-адрасы выключаны з абмежавання хуткасці",
-    "rate_limit_whitelist_placeholder": "Увядзіце па адным адрасе на радок",
     "blocking_ipv4_desc": "IP-адрас, што вяртаецца пры блакаванню A-запыту",
     "blocking_ipv6_desc": "IP-адрас, што вяртаецца пры блакаванню AAAA-запыту",
     "blocking_mode_default": "Стандартны: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA), калі заблакавана правілам у стылі Adblock; адказвае з IP-адрасам, паказаным у правіле, калі заблакавана правілам у стылі /etc/hosts-style",
@@ -464,7 +440,6 @@
     "form_add_id": "Дадаць ідэнтыфікатар",
     "form_client_name": "Увядзіце імя кліента",
     "name": "Назва",
-    "client_name": "Кліент {{id}}",
     "client_global_settings": "Выкарыстаць глабальныя налады",
     "client_deleted": "Кліент «{{key}}» паспяхова выдалены",
     "client_added": "Кліент «{{key}}» паспяхова дададзены",
@@ -557,8 +532,6 @@
     "statistics_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання статыстыкі? Пры памяншэнні інтэрвалу, некаторыя даныя могуць быць страчаны",
     "statistics_cleared": "Статыстыка паспяхова вычышчана",
     "statistics_enable": "Уключыць статыстыку",
-    "ignore_domains": "Ігнаруемыя дамены (парадкова)",
-    "ignore_domains_title": "Ігнаруемыя дамены",
     "ignore_domains_desc_stats": "Запыты, якія адпавядаюць гэтым правілам, не запісваюцца ў статыстыку",
     "ignore_domains_desc_query": "Запыты, якія адпавядаюць гэтым правілам, не запісваюцца ў часопіс запытаў",
     "interval_hours": "{{count}} гадзіна",
@@ -676,32 +649,13 @@
     "parental_control": "Бацькоўскі кантроль",
     "safe_browsing": "Бяспечны інтэрнэт",
     "served_from_cache": "{{value}} <i>(атрымана з кэша)</i>",
-    "form_error_password_length": "Пароль павінен утрымліваць ад {{min}} да {{max}} сімвалаў",
+    "form_error_password_length": "Пароль павінен быць не менш за {{value}} сімвалаў",
     "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
     "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
     "cache_cleared": "Кэш DNS паспяхова ачышчаны",
     "clear_cache": "Ачысціць кэш",
-    "make_static": "Зрабіць статычнай",
-    "theme_auto_desc": "Аўто (на аснове каляровай схемы вашага прылады)",
     "theme_dark_desc": "Цёмная тэма",
     "theme_light_desc": "Светлая тэма",
-    "disable_for_seconds": "На {{count}} секунд",
-    "disable_for_seconds_plural": "На {{count}} секунд",
-    "disable_for_minutes": "На {{count}} хвіліну",
-    "disable_for_minutes_plural": "На {{count}} хвілін",
-    "disable_for_hours": "На {{count}} гадзін",
-    "disable_for_hours_plural": "На {{count}} гадзін",
-    "disable_until_tomorrow": "Да заўтра",
-    "disable_notify_for_seconds": "Адключыць абарону на {{count}} секунд",
-    "disable_notify_for_seconds_plural": "Адключыць абарону на {{count}} секунд",
-    "disable_notify_for_minutes": "Адключыць абарону на {{count}} хвіліну",
-    "disable_notify_for_minutes_plural": "Адключыць абарону на {{count}} хвілін",
-    "disable_notify_for_hours": "Адключыць абарону на {{count}} гадзін",
-    "disable_notify_for_hours_plural": "Адключыць абарону на {{count}} гадзін",
-    "disable_notify_until_tomorrow": "Адключыць абарону да заўтра",
-    "enable_protection_timer": "Абарона будзе ўключана ў {{time}}",
-    "custom_retention_input": "Увядзіце тэрмін захоўвання ў гадзінах",
-    "custom_rotation_input": "Увядзіце частату ратацыі ў гадзінах",
     "protection_section_label": "Ахова",
     "log_and_stats_section_label": "Журнал запытаў і статыстыка",
     "ignore_query_log": "Ігнараваць гэтага кліента ў журнале запытаў",
@@ -737,8 +691,5 @@
     "wednesday_short": "Ср.",
     "thursday_short": "Чц.",
     "friday_short": "Пт.",
-    "saturday_short": "Сб.",
-    "upstream_dns_cache_configuration": "Канфігурацыя кэша upstream DNS-сервераў",
-    "enable_upstream_dns_cache": "Ўключыць кэшаванне для карыстацкай канфігурацыі upstream-сервераў гэтага кліента",
-    "dns_cache_size": "Памер кэша DNS, у байтах"
+    "saturday_short": "Сб."
 }

client/src/__locales/cs.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Nastavení klienta",
     "example_upstream_reserved": "odchozí DNS připojení <0>pro konkrétní doménu(y)</0>;",
-    "example_multiple_upstreams_reserved": "více odchozích připojení <0>pro konkrétní domény</0>;",
     "example_upstream_comment": "komentář.",
     "upstream_parallel": "Použijte paralelní požadavky na urychlení řešení simultánním dotazováním na všechny navazující servery.",
     "parallel_requests": "Paralelní požadavky",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Váš systém používá konfiguraci dynamické IP adresy pro rozhraní <0>{{interfaceName}}</0>. Pro použití serveru DHCP musí být nastavena statická IP adresa. Vaše aktuální IP adresa je <0>{{ipAddress}}</0>. AdGuard Home automaticky nastaví tuto IP adresu jako statickou, pokud stisknete tlačítko \"Zapnout DHCP server\".",
     "dhcp_lease_added": "Statický pronájem \"{{key}}\" byl úspěšně přidán",
     "dhcp_lease_deleted": "Statický pronájem \"{{key}}\" byl úspěšně odstraněn",
-    "dhcp_lease_updated": "Statický pronájem \"{{key}}\" byl úspěšně aktualizován",
     "dhcp_new_static_lease": "Nový statický pronájem",
-    "dhcp_edit_static_lease": "Upravit statický pronájem",
     "dhcp_static_leases_not_found": "Nebyly nalezeny žádné statické pronájmy DHCP",
     "dhcp_add_static_lease": "Přidat statický pronájem",
     "dhcp_reset_leases": "Resetovat všechny pronájmy",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blokovaný malware/podvody",
     "stats_adult": "Blokované stránky pro dospělé",
     "stats_query_domain": "Nejčastěji dotazované domény",
-    "for_last_hours": "za poslední {{count}} hodinu",
-    "for_last_hours_plural": "za posledních {{count}} hodin",
+    "for_last_24_hours": "za posledních 24 hodin",
     "for_last_days": "za posledních {{count}} dní",
     "for_last_days_plural": "za posledních {{count}} dní",
     "stats_disabled": "Statistiky byly vypnuty. Můžete je zapnout ze <0>stránky nastavení</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nebyla nalezena žádná data odchozích připojení",
     "number_of_dns_query_days": "Počet DNS dotazů zpracovaných za posledních {{count}} den",
     "number_of_dns_query_days_plural": "Počet DNS dotazů zpracovaných za posledních {{count}} dní",
-    "number_of_dns_query_hours": "Počet DNS dotazů zpracovaných za poslední {{count}} hodinu",
-    "number_of_dns_query_hours_plural": "Počet DNS dotazů zpracovaných za posledních {{count}} hodin",
+    "number_of_dns_query_24_hours": "Počet DNS dotazů zpracovaných za posledních 24 hodin",
     "number_of_dns_query_blocked_24_hours": "Počet požadavků DNS zablokovaných filtrem reklam a seznamy blokování hostitelů",
     "number_of_dns_query_blocked_24_hours_by_sec": "Počet požadavků DNS zablokovaných AdGuard modulem Bezpečné prohlížení",
     "number_of_dns_query_blocked_24_hours_adult": "Počet zablokovaných stránek pro dospělé",
     "enforced_save_search": "Vynucené bezpečné vyhledávání",
     "number_of_dns_query_to_safe_search": "Počet požadavků DNS na vyhledávače, při kterých bylo vynucené bezpečné vyhledávání",
     "average_processing_time": "Průměrný čas zpracování",
-    "average_upstream_response_time": "Průměrná doba odezvy odchozích připojení",
-    "response_time": "Čas odezvy",
+    "processing_time": "Doba zpracování",
     "average_processing_time_hint": "Průměrný čas zpracování požadavků DNS v milisekundách",
     "block_domain_use_filters_and_hosts": "Blokovat domény pomocí filtrů a seznamů adres",
     "filters_block_toggle_hint": "Pravidla blokování můžete nastavit v nastavení <a>Filtry</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Sekce {{section}}: řádek {{line}}: nelze použít, zkontrolujte prosím, zda jste ho správně napsali",
     "dns_test_warning_toast": "Upstream \"{{key}}\" neodpovídá na testovací požadavky a nemusí fungovat správně",
     "unblock": "Odblokovat",
     "block": "Blokovat",
@@ -244,7 +237,6 @@
     "allow_this_client": "Povolit tohoto klienta",
     "block_for_this_client_only": "Blokovat pouze pro tohoto klienta",
     "unblock_for_this_client_only": "Odblokovat pouze pro tohoto klienta",
-    "add_persistent_client": "Přidat jako trvalého klienta",
     "time_table_header": "Čas",
     "date": "Datum",
     "domain_name_table_header": "Název domény",
@@ -291,9 +283,6 @@
     "custom_ip": "Vlastní IP",
     "blocking_ipv4": "Blokování IPv4",
     "blocking_ipv6": "Blokování IPv6",
-    "blocked_response_ttl": "TTL blokované odezvy",
-    "blocked_response_ttl_desc": "Určuje, na kolik sekund by měli klienti ukládat filtrovanou odezvu do mezipaměti",
-    "form_enter_blocked_response_ttl": "Zadejte TTL blokované odezvy (v sekundách)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS skrze HTTPS",
     "dns_over_tls": "DNS skrze TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Použít vlastní IP pro EDNS",
     "edns_use_custom_ip_desc": "Povolit použití vlastní IP pro EDNS",
     "rate_limit_desc": "Počet požadavků za sekundu, které smí jeden klient provádět (0: neomezeno)",
-    "rate_limit_subnet_len_ipv4": "Délka předpony podsítě pro adresy IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Délka předpony podsítě pro adresy IPv4 používané pro omezení rychlosti. Výchozí hodnota je 24",
-    "rate_limit_subnet_len_ipv4_error": "Délka předpony podsítě IPv4 by měla být mezi 0 a 32",
-    "rate_limit_subnet_len_ipv6": "Délka předpony podsítě pro adresy IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Délka předpony podsítě pro adresy IPv6 používané pro omezení rychlosti. Výchozí hodnota je 56",
-    "rate_limit_subnet_len_ipv6_error": "Délka předpony podsítě IPv6 by měla být mezi 0 a 128",
-    "form_enter_rate_limit_subnet_len": "Zadejte délku předpony podsítě pro omezení rychlosti",
-    "rate_limit_whitelist": "Seznam výjimek pro omezení rychlosti",
-    "rate_limit_whitelist_desc": "IP adresy vyloučené z omezení rychlosti",
-    "rate_limit_whitelist_placeholder": "Zadejte jednu IP adresu na řádek",
     "blocking_ipv4_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku typu A",
     "blocking_ipv6_desc": "IP adresa, která se má vrátit v případě blokovaného požadavku typu AAAA",
     "blocking_mode_default": "Výchozí: Odezva s nulovou IP adresou (0.0.0.0 pro A; :: pro AAAA), pokud je blokováno pravidlem ve stylu Adblock; odezva pomocí IP adresy uvedené v pravidle, pokud je blokováno pravidlem /etc/hosts-style",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Názvy hostitelů",
     "encryption_reset": "Opravdu chcete obnovit nastavení šifrování?",
     "encryption_warning": "Varování",
-    "encryption_plain_dns_enable": "Povolit běžný DNS",
-    "encryption_plain_dns_desc": "Ve výchozím nastavení je povolen běžný DNS. Můžete ho zakázat, aby všechna zařízení používala šifrovaný DNS. Chcete-li to provést, musíte povolit alespoň jeden šifrovaný protokol DNS",
-    "encryption_plain_dns_error": "Chcete-li zakázat běžný DNS, povolte alespoň jeden šifrovaný protokol DNS",
     "topline_expiring_certificate": "Váš SSL certifikát brzy vyprší. Aktualizujte <0>Nastavení šifrování</0>.",
     "topline_expired_certificate": "Váš SSL certifikát vypršel. Aktualizujte <0>Nastavení šifrování</0>.",
     "form_error_port_range": "Zadejte číslo portu v rozmezí 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Přidat identifikátor",
     "form_client_name": "Zadejte název klienta",
     "name": "Název",
-    "client_name": "Klient {{id}}",
     "client_global_settings": "Použít globální nastavení",
     "client_deleted": "Klient \"{{key}}\" byl úspěšně odstraněn",
     "client_added": "Klient \"{{key}}\" byl úspěšně přidán",
@@ -563,7 +538,7 @@
     "ignore_domains": "Ignorované domény (oddělené novým řádkem)",
     "ignore_domains_title": "Ignorované domény",
     "ignore_domains_desc_stats": "Dotazy odpovídající těmto pravidlům se do statistik nezapisují",
-    "ignore_domains_desc_query": "Dotazy odpovídající těmto pravidlům se do záznamu dotazů nezapisují",
+    "ignore_domains_desc_query": "Dotazy odpovídající těmto pravidlům se do protokolu dotazů nezapisují",
     "interval_hours": "Hodiny: {{count}}",
     "interval_hours_plural": "Hodiny: {{count}}",
     "filters_configuration": "Konfigurace filtrů",
@@ -678,8 +653,8 @@
     "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_label": "Převzato z mezipaměti",
-    "form_error_password_length": "Heslo musí obsahovat od {{min}} do {{max}} znaků",
+    "served_from_cache": "{{value}} <i>(převzato z mezipaměti)</i>",
+    "form_error_password_length": "Heslo musí být alespoň {{value}} znaků dlouhé",
     "anonymizer_notification": "<0>Poznámka:</0> Anonymizace IP je zapnuta. Můžete ji vypnout v <1>Obecných nastaveních</1>.",
     "confirm_dns_cache_clear": "Opravdu chcete vymazat mezipaměť DNS?",
     "cache_cleared": "Mezipaměť DNS úspěšně vymazána",
@@ -740,8 +715,5 @@
     "wednesday_short": "Středa",
     "thursday_short": "Čtvrtek",
     "friday_short": "Pátek",
-    "saturday_short": "Sobota",
-    "upstream_dns_cache_configuration": "Konfigurace mezipaměti odchozího DNS",
-    "enable_upstream_dns_cache": "Povolit ukládání do mezipaměti DNS pro vlastní konfiguraci odchozího připojení tohoto klienta",
-    "dns_cache_size": "Velikost mezipaměti DNS v bajtech"
+    "saturday_short": "Sobota"
 }

client/src/__locales/da.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Klientindstillinger",
     "example_upstream_reserved": "en upstream <0>for bestemte domæner</0>;",
-    "example_multiple_upstreams_reserved": "flere upstreams <0>til bestemte domæner</0>;",
     "example_upstream_comment": "en kommentaren.",
     "upstream_parallel": "Brug parallelforespørgsler til at accelerere fortolkningen ved at forespørge alle upstream-servere samtidigt.",
     "parallel_requests": "Parallelle forespørgsler",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Dit system bruger en dynamisk IP-adresseopsætning til interface <0>{{interfaceName}}</0>. For at kunne bruge DHCP-serveren skal en statisk IP-adresse indstilles. Din aktuelle IP-adresse er <0>{{ipAddress}}</0>. AdGuard Home vil automatisk indstille denne IP-adresse som din statiske hvis du trykker på knappen \"Aktivér DHCP-server\".",
     "dhcp_lease_added": "Statisk lease \"{{key}}\" tilføjet",
     "dhcp_lease_deleted": "Statisk lease \"{{key}}\" slettet",
-    "dhcp_lease_updated": "Statisk tildeling \"{{key}}\" hermed opdateret",
     "dhcp_new_static_lease": "Ny statisk lease",
-    "dhcp_edit_static_lease": "Redigér statisk tildeling",
     "dhcp_static_leases_not_found": "Intet DHCP statisk leases fundet",
     "dhcp_add_static_lease": "Tilføj statisk lease",
     "dhcp_reset_leases": "Nulstil alle gyldighedsperioder",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blokeret malware/phishing",
     "stats_adult": "Blokerede voksne websteder",
     "stats_query_domain": "Mest forespurgte domæner",
-    "for_last_hours": "den seneste {{count}} time",
-    "for_last_hours_plural": "de seneste {{count}} timer",
+    "for_last_24_hours": "de seneste 24 timer",
     "for_last_days": "den seneste {{count}} dag",
     "for_last_days_plural": "de seneste {{count}} dage",
     "stats_disabled": "Statistikker er deaktiveret. De kan aktiveres via <0>indstillingssiden</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Ingen upstreams-data fundet",
     "number_of_dns_query_days": "Antallet af DNS-forespørgsler behandlet den seneste {{count}} dag",
     "number_of_dns_query_days_plural": "Antallet af DNS-forespørgsler behandlet de seneste {{count}} dage",
-    "number_of_dns_query_hours": "Antallet af DNS-forespørgsler behandlet den seneste {{count}} time",
-    "number_of_dns_query_hours_plural": "Antallet af DNS-forespørgsler behandlet de seneste {{count}} timer",
+    "number_of_dns_query_24_hours": "Antallet af DNS-forespørgsler behandlet de seneste 24 timer",
     "number_of_dns_query_blocked_24_hours": "Antallet af DNS-forespørgsler blokeret af adblockfiltre og værtssortlister",
     "number_of_dns_query_blocked_24_hours_by_sec": "Antallet af DNS-forespørgsler blokeret af AdGuards browsingsikkerhedsmodul",
     "number_of_dns_query_blocked_24_hours_adult": "Antallet af blokerede voksenwebsteder",
     "enforced_save_search": "Håndhævet sikker søgning",
     "number_of_dns_query_to_safe_search": "Antallet af DNS-forespørgsler til søgemaskiner, hvor Sikker Søgning blev håndhævet",
     "average_processing_time": "Gennemsnitlig behandlingstid",
-    "average_upstream_response_time": "Gennemsnitlig upstream-responstid",
-    "response_time": "Responstid",
+    "processing_time": "Behandlingstid",
     "average_processing_time_hint": "Gennemsnitlig behandlingstid i millisekunder af DNS-forespørgsel",
     "block_domain_use_filters_and_hosts": "Blokér domæner vha. filtre og værtsfiler",
     "filters_block_toggle_hint": "Du kan opsætte blokeringsregler i <a>Filterindstillingerne</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Sektion {{section}}: linje {{line}}: kunne ikke anvendes. Tjek at den er angivet korrekt",
     "dns_test_warning_toast": "Upstream \"{{key}}\" svarer ikke på testforespørgsler og fungerer muligvis ikke korrekt",
     "unblock": "Afblokering",
     "block": "Blokering",
@@ -244,7 +237,6 @@
     "allow_this_client": "Tillad denne klient",
     "block_for_this_client_only": "Blokér kun for denne klient",
     "unblock_for_this_client_only": "Afblokér kun for denne klient",
-    "add_persistent_client": "Tilføj som vedvarende klient",
     "time_table_header": "Tid",
     "date": "Dato",
     "domain_name_table_header": "Domænenavn",
@@ -291,9 +283,6 @@
     "custom_ip": "Tilpasset IP",
     "blocking_ipv4": "IPv4-blokering",
     "blocking_ipv6": "IPv6-blokering",
-    "blocked_response_ttl": "Blokeret svar TTL",
-    "blocked_response_ttl_desc": "Angiver, i hvor mange sekunder klienterne skal cache-lagre et filtreret svar",
-    "form_enter_blocked_response_ttl": "Angiv blokeringssvar TTL (sekunder)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Brug tilpasset IP til EDNS",
     "edns_use_custom_ip_desc": "Tillad brug af tilpasset IP til EDNS",
     "rate_limit_desc": "Antallet af forespørgsler pr. sekund tilladt pr. klient (værdien 0 = ubegrænset)",
-    "rate_limit_subnet_len_ipv4": "Længde på undernetpræfiks for IPv4-adresser",
-    "rate_limit_subnet_len_ipv4_desc": "Længde på undernetpræfiks for IPv4-adresser til hastighedsbegrænsning. Standard er 24",
-    "rate_limit_subnet_len_ipv4_error": "Længden på IPv4-undernetpræfiks skal være mellem 0 og 32",
-    "rate_limit_subnet_len_ipv6": "Længde på undernetpræfiks for IPv6-adresser",
-    "rate_limit_subnet_len_ipv6_desc": "Længde på undernetpræfiks for IPv6-adresser til hastighedsbegrænsning. Standard er 56",
-    "rate_limit_subnet_len_ipv6_error": "Længden på IPv6-undernetpræfiks skal være mellem 0 og 128",
-    "form_enter_rate_limit_subnet_len": "Angiv længden på undernetpræfiks til hastighedsbegrænsning",
-    "rate_limit_whitelist": "Hvidliste til hastighedsbegrænsning",
-    "rate_limit_whitelist_desc": "IP-adresser undtaget fra hastighedsbegrænsning",
-    "rate_limit_whitelist_placeholder": "Angiv én IP-adresse pr. linje",
     "blocking_ipv4_desc": "Returneret IP-adresse for en blokeret A-forespørgsel",
     "blocking_ipv6_desc": "Returneret IP-adresse for en blokeret AAAA-forespørgsel",
     "blocking_mode_default": "Standard: Svar med nul IP-adresse (0.0.0.0 for A; :: for AAAA), når blokeret af Adblock-lignende regel. Svar med IP-adressen angivet i reglen, når blokeret af /etc/hosts-lignende regel",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Værtsnavne",
     "encryption_reset": "Sikker på, at du vil nulstille krypteringsindstillingerne?",
     "encryption_warning": "Advarsel",
-    "encryption_plain_dns_enable": "Aktivér almindelig DNS",
-    "encryption_plain_dns_desc": "Almindelig DNS er aktiveret som standard. Den kan deaktiveres for at tvinge alle enheder til at bruge krypteret DNS. For at gøre dette, aktivér mindst én krypteret DNS-protokol",
-    "encryption_plain_dns_error": "Aktivér mindst én krypteret DNS-protokol for at deaktivere almindelig DNS",
     "topline_expiring_certificate": "Dit SSL-certifikat er ved at udløbe. Opdatér <0>Krypteringsindstillinger</0>.",
     "topline_expired_certificate": "Dit SSL-certifikat er udløbet. Opdatér <0>Krypteringsindstillinger</0>.",
     "form_error_port_range": "Angiv portnummer i intervallet 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Tilføj identifikator",
     "form_client_name": "Angiv klientnavn",
     "name": "Navn",
-    "client_name": "Klient {{id}}",
     "client_global_settings": "Brug globale indstillinger",
     "client_deleted": "Klient \"{{key}}\" slettet",
     "client_added": "Klient \"{{key}}\" tilføjet",
@@ -678,8 +653,8 @@
     "use_saved_key": "Brug den tidligere gemte nøgle",
     "parental_control": "Forældrekontrol",
     "safe_browsing": "Sikker Browsing",
-    "served_from_cache_label": "Leveret fra cache",
-    "form_error_password_length": "Adgangskode skal udgøre fra {{min}} til {{max}} tegn",
+    "served_from_cache": "{{value}} <i>(leveret fra cache)</i>",
+    "form_error_password_length": "Adgangskoden skal udgøre mindst {{value}} tegn.",
     "anonymizer_notification": "<0>Bemærk:</0> IP-anonymisering er aktiveret. Det kan deaktiveres via <1>Generelle indstillinger</1>.",
     "confirm_dns_cache_clear": "Sikker på, at DNS-cache skal ryddes?",
     "cache_cleared": "DNS-cache hermed ryddet",
@@ -740,8 +715,5 @@
     "wednesday_short": "Ons",
     "thursday_short": "Tors",
     "friday_short": "Fre",
-    "saturday_short": "Lør",
-    "upstream_dns_cache_configuration": "Upstream DNS-cacheopsætning",
-    "enable_upstream_dns_cache": "Aktivér DNS-cachelagring for denne klients tilpassede upstream-opsætning",
-    "dns_cache_size": "DNS-cachestørrelse i bytes"
+    "saturday_short": "Lør"
 }

client/src/__locales/de.json

@@ -1,20 +1,19 @@
 {
     "client_settings": "Client-Einstellungen",
     "example_upstream_reserved": "ein Upstream <0>für bestimmte Domains</0>;",
-    "example_multiple_upstreams_reserved": "mehrere Upstreams <0>für bestimmte Domains</0>;",
     "example_upstream_comment": "ein Kommentar.",
     "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",
+    "bootstrap_dns": "Bootstrap DNS-Server",
     "bootstrap_dns_desc": "IP-Adressen der DNS-Server, die zum Auflösen der IP-Adressen von DoH/DoT Upstream-Servern verwendet werden, die Sie angegeben haben. Kommentare sind nicht erlaubt.",
     "fallback_dns_title": "Fallback-DNS-Server",
     "fallback_dns_desc": "Liste der Fallback-DNS-Server, die verwendet werden, wenn die Upstream-DNS-Server nicht antworten. Die Syntax ist die gleiche wie im Hauptfeld für Upstream-Server oben.",
     "fallback_dns_placeholder": "Geben Sie einen Fallback-DNS-Server pro Zeile ein",
     "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 inversen DNS-Resolver: {{ip}}.",
+    "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": "Geben Sie eine IP-Adresse pro Zeile ein",
     "resolve_clients_title": "Hostnamenauflösung der Clients aktivieren",
@@ -74,9 +73,7 @@
     "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": "Statische Zuweisung „{{key}}“ erfolgreich hinzugefügt",
     "dhcp_lease_deleted": "Statische Zuweisung „{{key}}“ erfolgreich entfernt",
-    "dhcp_lease_updated": "Statische Zuweisung „{{key}}“ erfolgreich aktualisiert",
     "dhcp_new_static_lease": "Neue statische Zuweisung",
-    "dhcp_edit_static_lease": "Statische Zuweisung bearbeiten",
     "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",
@@ -89,7 +86,7 @@
     "form_enter_hostname": "Gerätenamen eingeben",
     "error_details": "Fehlerdetails",
     "response_details": "Einzelheiten der Antwort",
-    "request_details": "Informationen zur Anfrage",
+    "request_details": "Einzelheiten der Anfrage",
     "client_details": "Einzelheiten des Clients",
     "details": "Details",
     "back": "Zurück",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Websites",
     "stats_adult": "Gesperrte jugendgefährdende Websites",
     "stats_query_domain": "Am häufigsten angefragte Domains",
-    "for_last_hours": "in die letzte {{count}} Stunde",
-    "for_last_hours_plural": "in den letzten {{count}} Stunden",
+    "for_last_24_hours": "für die letzten 24 Stunden",
     "for_last_days": "am letzten {{count}} Tag",
     "for_last_days_plural": "in den letzten {{count}} Tage",
     "stats_disabled": "Die Statistik wurde deaktiviert. Sie können diese in den <0>Einstellungen</0> erneut aktivieren.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Keine Upstream-Daten gefunden",
     "number_of_dns_query_days": "Anzahl der in den letzten {{count}} Tagen verarbeiteten DNS-Anfragen",
     "number_of_dns_query_days_plural": "Anzahl der DNS-Abfragen, die in den letzten {{count}} Tagen verarbeitet wurden",
-    "number_of_dns_query_hours": "Die Anzahl der DNS-Anfragen, die in der letzten {{count}} Stunde verarbeitet wurden",
-    "number_of_dns_query_hours_plural": "Die Anzahl der DNS-Anfragen, die in den letzten {{count}} Stunden 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 Websites mit jugendgefährdenden Inhalten",
     "enforced_save_search": "Sichere Suche erzwungen",
     "number_of_dns_query_to_safe_search": "Anzahl der DNS-Anfragen bei denen Sichere Suche für Suchanfragen erzwungen wurde",
     "average_processing_time": "Durchschnittliche Bearbeitungsdauer",
-    "average_upstream_response_time": "Durchschnittliche Upstream-Antwortzeit",
-    "response_time": "Antwortzeit",
+    "processing_time": "Verarbeitungszeit",
     "average_processing_time_hint": "Durchschnittliche Zeit in Millisekunden zur Bearbeitung von DNS-Anfragen",
     "block_domain_use_filters_and_hosts": "Domains durch Filter und Host-Dateien sperren",
     "filters_block_toggle_hint": "Sie können Blockierregeln in den <a>Filter</a>einstellungen erstellen.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Abschnitt {{section}}: Zeile {{line}}: konnte nicht verwendet werden, bitte überprüfen Sie, ob alles richtig geschrieben ist",
     "dns_test_warning_toast": "Upstream „{{key}}“ reagiert nicht auf Testanfragen und funktioniert möglicherweise nicht fehlerfrei",
     "unblock": "Entsperren",
     "block": "Sperren",
@@ -244,7 +237,6 @@
     "allow_this_client": "Diesen Client zulassen",
     "block_for_this_client_only": "Nur für diesen Client sperren",
     "unblock_for_this_client_only": "Nur für diesen Client freigeben",
-    "add_persistent_client": "Als dauerhaften Client hinzufügen",
     "time_table_header": "Zeit",
     "date": "Datum",
     "domain_name_table_header": "Domainname",
@@ -262,7 +254,7 @@
     "next_btn": "Nächste",
     "loading_table_status": "Wird geladen …",
     "page_table_footer_text": "Seite",
-    "rows_table_footer_text": "Zeilen",
+    "rows_table_footer_text": "Reihen",
     "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}}",
@@ -291,9 +283,6 @@
     "custom_ip": "Benutzerdefinierte IP",
     "blocking_ipv4": "IPv4-Sperren",
     "blocking_ipv6": "IPv6-Sperren",
-    "blocked_response_ttl": "Gültigkeitsdauer der blockierten Antwort",
-    "blocked_response_ttl_desc": "Gibt an, wie viele Sekunden lang die Clients eine gefilterte Antwort zwischenspeichern sollen",
-    "form_enter_blocked_response_ttl": "Geben Sie die Gültigkeitsdauer für blockierte Antworten ein (in Sekunden)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -307,21 +296,11 @@
     "plain_dns": "Einfaches DNS",
     "form_enter_rate_limit": "Begrenzungswert eingeben",
     "rate_limit": "Begrenzungswert",
-    "edns_enable": "EDNS-Client-Subnetz aktivieren",
+    "edns_enable": "EDNS Client Subnetz aktivieren",
     "edns_cs_desc": "Die Option EDNS Client Subnetz (ECS) zu Upstream-Anfragen hinzufügen und die von Clients gesendeten Werte protokollieren.",
     "edns_use_custom_ip": "Benutzerdefinierte IP für EDNS verwenden",
     "edns_use_custom_ip_desc": "Benutzerdefinierte IP für EDNS zulassen",
     "rate_limit_desc": "Die Anzahl der Anfragen pro Sekunde, die ein einzelner Client stellen darf. Das Setzen auf 0 bedeutet keine Begrenzung.",
-    "rate_limit_subnet_len_ipv4": "Länge des Subnetzpräfixes für IPv4-Adressen",
-    "rate_limit_subnet_len_ipv4_desc": "Subnetpräfixlänge für IPv4-Adressen, die für die Ratebegrenzung verwendet werden. Der Standardwert ist 24",
-    "rate_limit_subnet_len_ipv4_error": "Die Subnetzpräfixlänge für IPv4-Adressen sollte zwischen 0 und 32 liegen",
-    "rate_limit_subnet_len_ipv6": "Subnetzpräfixlänge für IPv6-Adressen",
-    "rate_limit_subnet_len_ipv6_desc": "Subnetpräfixlänge für IPv6-Adressen, die für die Ratebegrenzung verwendet werden. Der Standardwert ist 56",
-    "rate_limit_subnet_len_ipv6_error": "Die Subnetzpräfixlänge für IPv6-Adressen sollte zwischen 0 und 128 liegen",
-    "form_enter_rate_limit_subnet_len": "Geben Sie die Subnetzpräfixlänge für die Ratebegrenzung ein",
-    "rate_limit_whitelist": "Zulassungsliste für die Ratebegrenzung",
-    "rate_limit_whitelist_desc": "IP-Adressen, die von der Ratebegrenzung ausgeschlossen sind",
-    "rate_limit_whitelist_placeholder": "Geben Sie eine IP-Adresse pro Zeile ein",
     "blocking_ipv4_desc": "IP-Adresse, die für eine gesperrte A-Anfrage zurückgegeben werden soll",
     "blocking_ipv6_desc": "IP-Adresse, die für eine gesperrte AAAA-Anfrage zurückgegeben werden soll",
     "blocking_mode_default": "Standard: Mit Null IP Adress (0.0.0.0 for A; :: for AAAA) antworten, wenn sie durch eine Regel im Adblock-Stil gesperrt sind; mit der in der Regel angegebenen IP-Adresse antworten, wenn sie durch eine Regel im /etc/hosts-Stil gesperrt wurde",
@@ -343,16 +322,16 @@
     "known_tracker": "Bekannte Tracker",
     "install_welcome_title": "Willkommen bei AdGuard Home!",
     "install_welcome_desc": "AdGuard Home ist ein netzwerkweiter Werbung- und Tracking sperrender DNS-Server. Sein Zweck ist es, Ihnen die Kontrolle über Ihr gesamtes Netzwerk und alle Ihre Geräte zu ermöglichen, und es ist nicht erforderlich, eine clientseitige Anwendung zu verwenden.",
-    "install_settings_title": "Admin-Weboberfläche",
+    "install_settings_title": "Admin Weboberfläche",
     "install_settings_listen": "Netzwerk-Schnittstelle\n",
     "install_settings_port": "Port",
-    "install_settings_interface_link": "Ihre AdGuard-Home-Admin-Weboberfläche ist unter den folgenden Adressen verfügbar:",
+    "install_settings_interface_link": "Ihre AdGuard Home Admin-Weboberfläche ist unter den folgenden Adressen verfügbar:",
     "form_error_port": "Geben Sie eine gültige Portnummer ein",
     "install_settings_dns": "DNS-Server",
     "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": "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, so ist es dennoch wichtig, es vor unberechtigtem 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",
@@ -365,7 +344,7 @@
     "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.",
-    "install_devices_address": "Der AdGuard-Home-DNS-Server lauscht unter folgenden Adressen",
+    "install_devices_address": "Der AdGuard Home DNS-Server belauscht die folgenden Adressen",
     "install_devices_router_list_1": "Öffnen Sie die Einstellungen für Ihren Router. In der Regel können Sie über eine URL (z. B. http://192.168.0.1/ oder http://192.168.1.1) von Ihrem Browser aus darauf zugreifen. Möglicherweise werden Sie aufgefordert, ein Passwort einzugeben. Wenn Sie sich nicht mehr daran erinnern, können Sie das Passwort oft durch Drücken einer Taste am Router selbst zurücksetzen, aber seien Sie sich bewusst, dass Sie bei dieser Vorgehensweise wahrscheinlich die gesamte Routerkonfiguration verlieren. Wenn für die Einrichtung Ihres Routers eine App erforderlich ist, installieren Sie bitte die App auf Ihrem mobilen Endgerät oder PC und verwenden Sie sie für den Zugriff auf die Einstellungen des Routers.",
     "install_devices_router_list_2": "Wechseln Sie zu den DHCP/DNS-Einstellungen. Suchen sie dort nach einem Eintrag „DNS“ und einem Bereich, welches zwei oder drei Zahlengruppen zulässt, die jeweils in vier Blöcke von ein bis drei Ziffern unterteilt sind.",
     "install_devices_router_list_3": "Geben Sie dort Ihre AdGuard Home Server-Adressen ein.",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Hostnamen",
     "encryption_reset": "Möchten Sie die Verschlüsselungseinstellungen wirklich zurücksetzen?",
     "encryption_warning": "Warnhinweis",
-    "encryption_plain_dns_enable": "Einfaches DNS aktivieren",
-    "encryption_plain_dns_desc": "Einfaches DNS ist standardmäßig aktiviert. Sie können es deaktivieren, um alle Geräte zu zwingen, verschlüsseltes DNS zu verwenden. Dazu müssen Sie mindestens ein verschlüsseltes DNS-Protokoll aktivieren",
-    "encryption_plain_dns_error": "Um einfaches DNS zu deaktivieren, aktivieren Sie mindestens ein verschlüsseltes DNS-Protokoll",
     "topline_expiring_certificate": "Ihr SSL-Zertifikat läuft demnächst ab. Aktualisieren Sie Ihre <0>Verschlüsselungseinstellungen</0>.",
     "topline_expired_certificate": "Ihr SSL-Zertifikat ist abgelaufen. Aktualisieren Sie Ihre <0>Verschlüsselungseinstellungen</0>.",
     "form_error_port_range": "Geben Sie die Portnummer zwischen 80 und 65535 ein",
@@ -467,7 +443,6 @@
     "form_add_id": "Kennung hinzufügen",
     "form_client_name": "Clientnamen eingeben",
     "name": "Name",
-    "client_name": "Client {{id}}",
     "client_global_settings": "Allgemeine Einstellungen nutzen",
     "client_deleted": "Client „{{key}}“ erfolgreich entfernt",
     "client_added": "Client „{{key}}“ erfolgreich hinzugefügt",
@@ -562,8 +537,8 @@
     "statistics_enable": "Statistiken aktivieren",
     "ignore_domains": "Ignorierte Domains (durch Zeilenumbruch getrennt)",
     "ignore_domains_title": "Ignorierte Domains",
-    "ignore_domains_desc_stats": "Abfragen, die diesen Regeln entsprechen, werden nicht in die Statistik aufgenommen",
-    "ignore_domains_desc_query": "Abfragen, die diesen Regeln entsprechen, werden nicht in das Anfragenprotokoll aufgenommen",
+    "ignore_domains_desc_stats": "Anfragen, die diesen Regeln entsprechen, werden nicht in die Statistik aufgenommen",
+    "ignore_domains_desc_query": "Anfragen, die diesen Regeln entsprechen, werden nicht in das Anfragenprotokoll aufgenommen",
     "interval_hours": "{{count}} Stunde",
     "interval_hours_plural": "{{count}} Stunden",
     "filters_configuration": "Filterkonfiguration",
@@ -665,7 +640,7 @@
     "filter_category_regional": "Regional",
     "filter_category_other": "Weitere",
     "filter_category_general_desc": "Listen, die Tracking und Werbung auf den meisten Geräten sperren",
-    "filter_category_security_desc": "Listen, die auf das Sperren von Malware-, Phishing- oder Scam-Domains spezialisiert sind",
+    "filter_category_security_desc": "Listen, die auf das Sperren von Malware, Phishing- oder Scam-Domains spezialisiert sind",
     "filter_category_regional_desc": "Listen, die sich auf regionale Werbeanzeigen und Tracking-Server konzentrieren",
     "filter_category_other_desc": "Weitere Sperrlisten",
     "setup_config_to_enable_dhcp_server": "Einrichten der Konfiguration zur Aktivierung des DHCP-Servers",
@@ -678,16 +653,16 @@
     "use_saved_key": "Zuvor gespeicherten Schlüssel verwenden",
     "parental_control": "Kindersicherung",
     "safe_browsing": "Internetsicherheit",
-    "served_from_cache_label": "Aus dem Cache abgerufen",
-    "form_error_password_length": "Das Passwort muss zwischen {{min}} und {{max}} Zeichen enthalten",
+    "served_from_cache": "{{value}} <i>(aus dem Cache abgerufen)</i>",
+    "form_error_password_length": "Das Passwort muss mindestens {{value}} Zeichen enthalten",
     "anonymizer_notification": "<0>Hinweis:</0> Die IP-Anonymisierung ist aktiviert. Sie können sie in den <1>Allgemeinen Einstellungen</1> deaktivieren.",
     "confirm_dns_cache_clear": "Möchten Sie den DNS-Cache wirklich leeren?",
     "cache_cleared": "DNS-Cache erfolgreich geleert",
     "clear_cache": "Cache leeren",
     "make_static": "Statisch machen",
     "theme_auto_desc": "Automatisch (basierend auf dem Farbschema Ihres Geräts)",
-    "theme_dark_desc": "Dunkles Design",
-    "theme_light_desc": "Helles Design",
+    "theme_dark_desc": "Dunkles Farbschema",
+    "theme_light_desc": "Helles Farbschema",
     "disable_for_seconds": "Für {{count}} Sekunde",
     "disable_for_seconds_plural": "Für {{count}} Sekunden",
     "disable_for_minutes": "Für {{count}} Minute",
@@ -740,8 +715,5 @@
     "wednesday_short": "Mi",
     "thursday_short": "Do",
     "friday_short": "Fr",
-    "saturday_short": "Sa",
-    "upstream_dns_cache_configuration": "Konfiguration des Upstream-DNS-Cache",
-    "enable_upstream_dns_cache": "Caching für die benutzerdefinierte Upstream-Server-Konfiguration dieses Clients aktivieren",
-    "dns_cache_size": "Größe des DNS-Cache, in Bytes"
+    "saturday_short": "Sa"
 }

client/src/__locales/en.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Client settings",
     "example_upstream_reserved": "an upstream <0>for specific domains</0>;",
-    "example_multiple_upstreams_reserved": "multiple upstreams <0>for specific domains</0>;",
     "example_upstream_comment": "a comment.",
     "upstream_parallel": "Use parallel queries to speed up resolving by querying all upstream servers simultaneously.",
     "parallel_requests": "Parallel requests",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Your system uses dynamic IP address configuration for interface <0>{{interfaceName}}</0>. In order to use DHCP server, a static IP address must be set. Your current IP address is <0>{{ipAddress}}</0>. AdGuard Home will automatically set this IP address as static if you press the \"Enable DHCP server\" button.",
     "dhcp_lease_added": "Static lease \"{{key}}\" successfully added",
     "dhcp_lease_deleted": "Static lease \"{{key}}\" successfully deleted",
-    "dhcp_lease_updated": "Static lease \"{{key}}\" successfully updated",
     "dhcp_new_static_lease": "New static lease",
-    "dhcp_edit_static_lease": "Edit static lease",
     "dhcp_static_leases_not_found": "No DHCP static leases found",
     "dhcp_add_static_lease": "Add static lease",
     "dhcp_reset_leases": "Reset all leases",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blocked malware/phishing",
     "stats_adult": "Blocked adult websites",
     "stats_query_domain": "Top queried domains",
-    "for_last_hours": "for the last {{count}} hour",
-    "for_last_hours_plural": "for the last {{count}} hours",
+    "for_last_24_hours": "for the last 24 hours",
     "for_last_days": "for the last {{count}} day",
     "for_last_days_plural": "for the last {{count}} days",
     "stats_disabled": "The statistics have been disabled. You can turn it on from the <0>settings page</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "No upstreams data found",
     "number_of_dns_query_days": "The number of DNS queries processed for the last {{count}} day",
     "number_of_dns_query_days_plural": "The number of DNS queries processed for the last {{count}} days",
-    "number_of_dns_query_hours": "The number of DNS queries processed for the last {{count}} hour",
-    "number_of_dns_query_hours_plural": "The number of DNS queries processed for the last {{count}} hours",
+    "number_of_dns_query_24_hours": "The number of DNS queries processed for the last 24 hours",
     "number_of_dns_query_blocked_24_hours": "The number of DNS requests blocked by adblock filters and hosts blocklists",
     "number_of_dns_query_blocked_24_hours_by_sec": "The number of DNS requests blocked by the AdGuard browsing security module",
     "number_of_dns_query_blocked_24_hours_adult": "The number of adult websites blocked",
     "enforced_save_search": "Enforced safe search",
     "number_of_dns_query_to_safe_search": "The number of DNS requests to search engines for which Safe Search was enforced",
     "average_processing_time": "Average processing time",
-    "average_upstream_response_time": "Average upstream response time",
-    "response_time": "Response time",
+    "processing_time": "Processing time",
     "average_processing_time_hint": "Average time in milliseconds on processing a DNS request",
     "block_domain_use_filters_and_hosts": "Block domains using filters and hosts files",
     "filters_block_toggle_hint": "You can setup blocking rules in the <a>Filters</a> settings.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Section {{section}}: line {{line}}: could not be used, please check that you've written it correctly",
     "dns_test_warning_toast": "Upstream \"{{key}}\" does not respond to test requests and may not work properly",
     "unblock": "Unblock",
     "block": "Block",
@@ -244,7 +237,6 @@
     "allow_this_client": "Allow this client",
     "block_for_this_client_only": "Block for this client only",
     "unblock_for_this_client_only": "Unblock for this client only",
-    "add_persistent_client": "Add as persistent client",
     "time_table_header": "Time",
     "date": "Date",
     "domain_name_table_header": "Domain name",
@@ -291,9 +283,6 @@
     "custom_ip": "Custom IP",
     "blocking_ipv4": "Blocking IPv4",
     "blocking_ipv6": "Blocking IPv6",
-    "blocked_response_ttl": "Blocked response TTL",
-    "blocked_response_ttl_desc": "Specifies for how many seconds the clients should cache a filtered response",
-    "form_enter_blocked_response_ttl": "Enter blocked response TTL (seconds)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Use custom IP for EDNS",
     "edns_use_custom_ip_desc": "Allow to use custom IP for EDNS",
     "rate_limit_desc": "The number of requests per second allowed per client. Setting it to 0 means no limit.",
-    "rate_limit_subnet_len_ipv4": "Subnet prefix length for IPv4 addresses",
-    "rate_limit_subnet_len_ipv4_desc": "Subnet prefix length for IPv4 addresses used for rate limiting. The default is 24",
-    "rate_limit_subnet_len_ipv4_error": "The IPv4 subnet prefix length should be between 0 and 32",
-    "rate_limit_subnet_len_ipv6": "Subnet prefix length for IPv6 addresses",
-    "rate_limit_subnet_len_ipv6_desc": "Subnet prefix length for IPv6 addresses used for rate limiting. The default is 56",
-    "rate_limit_subnet_len_ipv6_error": "The IPv6 subnet prefix length should be between 0 and 128",
-    "form_enter_rate_limit_subnet_len": "Enter subnet prefix length for rate limiting",
-    "rate_limit_whitelist": "Rate limiting allowlist",
-    "rate_limit_whitelist_desc": "IP addresses excluded from rate limiting",
-    "rate_limit_whitelist_placeholder": "Enter one IP address per line",
     "blocking_ipv4_desc": "IP address to be returned for a blocked A request",
     "blocking_ipv6_desc": "IP address to be returned for a blocked AAAA request",
     "blocking_mode_default": "Default: Respond with zero IP address (0.0.0.0 for A; :: for AAAA) when blocked by Adblock-style rule; respond with the IP address specified in the rule when blocked by /etc/hosts-style rule",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Hostnames",
     "encryption_reset": "Are you sure you want to reset encryption settings?",
     "encryption_warning": "Warning",
-    "encryption_plain_dns_enable": "Enable plain DNS",
-    "encryption_plain_dns_desc": "Plain DNS is enabled by default. You can disable it to force all devices to use encrypted DNS. To do this, you must enable at least one encrypted DNS protocol",
-    "encryption_plain_dns_error": "To disable plain DNS, enable at least one encrypted DNS protocol",
     "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.",
     "topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings</0>.",
     "form_error_port_range": "Enter port number in the range of 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Add identifier",
     "form_client_name": "Enter client name",
     "name": "Name",
-    "client_name": "Client {{id}}",
     "client_global_settings": "Use global settings",
     "client_deleted": "Client \"{{key}}\" successfully deleted",
     "client_added": "Client \"{{key}}\" successfully added",
@@ -678,8 +653,8 @@
     "use_saved_key": "Use the previously saved key",
     "parental_control": "Parental Control",
     "safe_browsing": "Safe Browsing",
-    "served_from_cache_label": "Served from cache",
-    "form_error_password_length": "Password must be {{min}} to {{max}} characters long",
+    "served_from_cache": "{{value}} <i>(served from cache)</i>",
+    "form_error_password_length": "Password must be at least {{value}} characters long",
     "anonymizer_notification": "<0>Note:</0> IP anonymization is enabled. You can disable it in <1>General settings</1>.",
     "confirm_dns_cache_clear": "Are you sure you want to clear DNS cache?",
     "cache_cleared": "DNS cache successfully cleared",
@@ -740,8 +715,5 @@
     "wednesday_short": "Wed",
     "thursday_short": "Thu",
     "friday_short": "Fri",
-    "saturday_short": "Sat",
-    "upstream_dns_cache_configuration": "Upstream DNS cache configuration",
-    "enable_upstream_dns_cache": "Enable DNS caching for this client's custom upstream configuration",
-    "dns_cache_size": "DNS cache size, in bytes"
+    "saturday_short": "Sat"
 }

client/src/__locales/es.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Configuración de clientes",
     "example_upstream_reserved": "un DNS de subida <0>para un dominio específico</0>.",
-    "example_multiple_upstreams_reserved": "múltiples upstreams <0>para dominios específicos</0>;",
     "example_upstream_comment": "un comentario.",
     "upstream_parallel": "Usar consultas paralelas para acelerar la resolución al consultar simultáneamente a todos los servidores DNS de subida.",
     "parallel_requests": "Consultas paralelas",
@@ -9,9 +8,9 @@
     "load_balancing_desc": "Consulta un servidor DNS de subida a la vez. AdGuard Home utiliza su algoritmo aleatorio ponderado para elegir el servidor más rápido y sea utilizado con más frecuencia.",
     "bootstrap_dns": "Servidores DNS de arranque",
     "bootstrap_dns_desc": "Direcciones IP de servidores DNS utilizadas para resolver direcciones IP de los solucionadores DoH/DoT que especifiques como ascendentes. No se permiten comentarios.",
-    "fallback_dns_title": "Servidores DNS alternativos",
-    "fallback_dns_desc": "Lista de servidores DNS alternativos utilizados cuando los servidores DNS de subida no responden. La sintaxis es la misma que en el campo de los principales DNS de subida anterior.",
-    "fallback_dns_placeholder": "Ingresa un servidor DNS alternativo por línea",
+    "fallback_dns_title": "Servidores DNS de fallback",
+    "fallback_dns_desc": "La lista de DNS de fallback serán usadas cuando los servidores de upstream de DNS no respondan. La sintaxis es la misma que en los principales del campo anterior.",
+    "fallback_dns_placeholder": "Ingresa un servidor de DNS alternativo por línea",
     "local_ptr_title": "Servidores DNS inversos y privados",
     "local_ptr_desc": "Los servidores DNS que AdGuard Home utiliza para las consultas PTR locales. Estos servidores se utilizan para resolver las peticiones PTR de direcciones en rangos de IP privadas, por ejemplo \"192.168.12.34\", utilizando DNS inverso. Si no está establecido, AdGuard Home utilizará los resolutores DNS predeterminados de tu sistema operativo, excepto las direcciones del propio AdGuard Home.",
     "local_ptr_default_resolver": "Por defecto, AdGuard Home utiliza los siguientes resolutores DNS inversos: {{ip}}.",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Tu sistema utiliza la configuración de dirección IP dinámica para la interfaz <0>{{interfaceName}}</0>. Para poder utilizar el servidor DHCP se debe establecer una dirección IP estática. Tu dirección IP actual es <0>{{ipAddress}}</0>. AdGuard Home establecerá automáticamente esta dirección IP como estática si presionas el botón \"Habilitar servidor DHCP\".",
     "dhcp_lease_added": "Asignación estática \"{{key}}\" añadido correctamente",
     "dhcp_lease_deleted": "Asignación estática \"{{key}}\" eliminado correctamente",
-    "dhcp_lease_updated": "Asignación estática \"{{key}}\" actualizado correctamente",
     "dhcp_new_static_lease": "Nueva asignación estática",
-    "dhcp_edit_static_lease": "Editar asignación estática",
     "dhcp_static_leases_not_found": "No se han encontrado asignaciones DHCP estáticas",
     "dhcp_add_static_lease": "Añadir asignación estática",
     "dhcp_reset_leases": "Restablecer todas las asignaciones",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Malware/phishing bloqueado",
     "stats_adult": "Sitios web para adultos bloqueado",
     "stats_query_domain": "Dominios más consultados",
-    "for_last_hours": "de la última {{count}} hora",
-    "for_last_hours_plural": "de las últimas {{count}} horas",
+    "for_last_24_hours": "en las últimas 24 horas",
     "for_last_days": "durante los últimos {{count}} días",
     "for_last_days_plural": "durante los últimos {{count}} días",
     "stats_disabled": "Las estadísticas se han deshabilitado. Puedes habilitarlas desde la <0>página de configuración</0>.",
@@ -132,20 +128,18 @@
     "top_clients": "Clientes más frecuentes",
     "no_clients_found": "No se han encontrado clientes",
     "general_statistics": "Estadísticas generales",
-    "top_upstreams": "DNS de subida más frecuentes",
-    "no_upstreams_data_found": "No se han encontrado datos de DNS de subida",
+    "top_upstreams": "Mejores upstreams",
+    "no_upstreams_data_found": "No se han encontrado datos de upstreams",
     "number_of_dns_query_days": "Número de consultas DNS procesadas durante el último {{count}} día",
     "number_of_dns_query_days_plural": "Número de consultas DNS procesadas durante los últimos {{count}} días",
-    "number_of_dns_query_hours": "Número de consultas DNS procesadas durante la última {{count}} hora",
-    "number_of_dns_query_hours_plural": "Número de consultas DNS procesadas durante las últimas {{count}} horas",
+    "number_of_dns_query_24_hours": "Número de consultas DNS procesadas durante las últimas 24 horas",
     "number_of_dns_query_blocked_24_hours": "Número de peticiones DNS bloqueadas por los filtros y listas de bloqueo de hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Número de peticiones DNS bloqueadas por el módulo de seguridad de navegación de AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Número de sitios web para adultos bloqueado",
     "enforced_save_search": "Búsquedas seguras forzadas",
     "number_of_dns_query_to_safe_search": "Número de peticiones DNS a los motores de búsqueda para los que se aplicó la búsqueda segura forzada",
     "average_processing_time": "Tiempo promedio de procesamiento",
-    "average_upstream_response_time": "Tiempo promedio de respuesta upstream",
-    "response_time": "Tiempo de respuesta",
+    "processing_time": "Tiempo de procesamiento",
     "average_processing_time_hint": "Tiempo promedio en milisegundos al procesar una petición DNS",
     "block_domain_use_filters_and_hosts": "Bloquear dominios usando filtros y archivos hosts",
     "filters_block_toggle_hint": "Puedes configurar las reglas de bloqueo en la configuración de <a>filtros</a>.",
@@ -170,7 +164,7 @@
     "upstream_dns_configured_in_file": "Configurado en {{path}}",
     "test_upstream_btn": "Probar DNS de subida",
     "upstreams": "DNS de subida",
-    "upstream": "DNS de subida",
+    "upstream": "Upstream",
     "apply_btn": "Aplicar",
     "disabled_filtering_toast": "Filtrado deshabilitado",
     "enabled_filtering_toast": "Filtrado habilitado",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "No se pudo utilizar la sección {{section}}: línea {{line}}:, verifica si la escribiste correctamente",
     "dns_test_warning_toast": "DNS de subida \"{{key}}\" no responde a las peticiones de prueba y es posible que no funcione correctamente",
     "unblock": "Desbloquear",
     "block": "Bloquear",
@@ -244,7 +237,6 @@
     "allow_this_client": "Permitir a este cliente",
     "block_for_this_client_only": "Bloquear solo para este cliente",
     "unblock_for_this_client_only": "Desbloquear solo para este cliente",
-    "add_persistent_client": "Añadir como cliente persistente",
     "time_table_header": "Hora",
     "date": "Fecha",
     "domain_name_table_header": "Nombre del dominio",
@@ -291,9 +283,6 @@
     "custom_ip": "IP personalizada",
     "blocking_ipv4": "Bloqueo de IPv4",
     "blocking_ipv6": "Bloqueo de IPv6",
-    "blocked_response_ttl": "Respuesta TTL bloqueada",
-    "blocked_response_ttl_desc": "Especifica durante cuántos segundos los clientes deben almacenar en cache una respuesta filtrada",
-    "form_enter_blocked_response_ttl": "Ingresa el TTL de respuesta bloqueada (segundos)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS mediante HTTPS",
     "dns_over_tls": "DNS mediante TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Usar IP personalizada para EDNS",
     "edns_use_custom_ip_desc": "Permitir el uso de IP personalizadas para EDNS",
     "rate_limit_desc": "Número de peticiones por segundo permitidas por cliente. Establecerlo en 0 significa que no hay límite.",
-    "rate_limit_subnet_len_ipv4": "Longitud del prefijo de subred para direcciones IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Longitud del prefijo de subred para direcciones IPv4 utilizadas para limitar la velocidad. El valor predeterminado es 24",
-    "rate_limit_subnet_len_ipv4_error": "La longitud del prefijo de subred IPv4 debe estar entre 0 y 32",
-    "rate_limit_subnet_len_ipv6": "Longitud del prefijo de subred para direcciones IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Longitud del prefijo de subred para direcciones IPv6 utilizadas para limitar la velocidad. El valor predeterminado es 56",
-    "rate_limit_subnet_len_ipv6_error": "La longitud del prefijo de subred IPv6 debe estar entre 0 y 128",
-    "form_enter_rate_limit_subnet_len": "Ingresa la longitud del prefijo de subred para limitar la velocidad",
-    "rate_limit_whitelist": "Lista de permitidos de limitación de velocidad",
-    "rate_limit_whitelist_desc": "Direcciones IP excluidas de la limitación de velocidad",
-    "rate_limit_whitelist_placeholder": "Ingresa una dirección IP por línea",
     "blocking_ipv4_desc": "Dirección IP devolverá una petición A bloqueada",
     "blocking_ipv6_desc": "Dirección IP devolverá una petición AAAA bloqueada",
     "blocking_mode_default": "Predeterminado: Responde con dirección IP cero (0.0.0.0 para A; :: para AAAA) cuando está bloqueado por la regla de estilo Adblock; responde con la dirección IP especificada en la regla cuando está bloqueado por una regla de estilo /etc/hosts",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Nombres de hosts",
     "encryption_reset": "¿Estás seguro de que deseas restablecer la configuración de cifrado?",
     "encryption_warning": "Advertencia",
-    "encryption_plain_dns_enable": "Activar DNS simple (sin cifrado)",
-    "encryption_plain_dns_desc": "El DNS simple (sin cifrado) está activado de forma predeterminada. Puedes desactivarlo para obligar a todos los dispositivos a utilizar DNS cifrado. Para ello, debes habilitar al menos un protocolo DNS cifrado",
-    "encryption_plain_dns_error": "Para desactivar el DNS simple, activa al menos un protocolo DNS cifrado",
     "topline_expiring_certificate": "Tu certificado SSL está a punto de expirar. Actualiza la <0>configuración de cifrado</0>.",
     "topline_expired_certificate": "Tu certificado SSL ha expirado. Actualiza la <0>configuración de cifrado</0>.",
     "form_error_port_range": "Ingresa el número del puerto en el rango de 80 a 65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Añadir identificador",
     "form_client_name": "Ingresa el nombre del cliente",
     "name": "Nombre",
-    "client_name": "Cliente {{id}}",
     "client_global_settings": "Usar configuración global",
     "client_deleted": "Cliente \"{{key}}\" eliminado correctamente",
     "client_added": "Cliente \"{{key}}\" añadido correctamente",
@@ -678,8 +653,8 @@
     "use_saved_key": "Usar la clave guardada previamente",
     "parental_control": "Control parental",
     "safe_browsing": "Navegación segura",
-    "served_from_cache_label": "Servido desde la caché",
-    "form_error_password_length": "La contraseña debe tener entre {{min}} y {{max}} caracteres",
+    "served_from_cache": "{{value}} <i>(servido desde la caché)</i>",
+    "form_error_password_length": "La contraseña debe tener al menos {{value}} caracteres",
     "anonymizer_notification": "<0>Nota:</0> La anonimización de IP está habilitada. Puedes deshabilitarla en <1>Configuración general</1>.",
     "confirm_dns_cache_clear": "¿Estás seguro de que deseas borrar la caché DNS?",
     "cache_cleared": "Caché DNS borrado correctamente",
@@ -695,21 +670,21 @@
     "disable_for_hours": "Por {{count}} hora",
     "disable_for_hours_plural": "Por {{count}} horas",
     "disable_until_tomorrow": "Hasta mañana",
-    "disable_notify_for_seconds": "Deshabilitar protección por {{count}} segundo",
-    "disable_notify_for_seconds_plural": "Deshabilitar protección por {{count}} segundos",
-    "disable_notify_for_minutes": "Deshabilitar protección por {{count}} minuto",
-    "disable_notify_for_minutes_plural": "Deshabilitar protección por {{count}} minutos",
-    "disable_notify_for_hours": "Deshabilitar protección por {{count}} hora",
-    "disable_notify_for_hours_plural": "Deshabilitar protección por {{count}} horas",
-    "disable_notify_until_tomorrow": "Deshabilitar protección hasta mañana",
-    "enable_protection_timer": "La protección se habilitará a las {{time}}",
+    "disable_notify_for_seconds": "Desactivar la protección por {{count}} segundo",
+    "disable_notify_for_seconds_plural": "Desactivar la protección por {{count}} segundos",
+    "disable_notify_for_minutes": "Desactivar la protección por {{count}} minuto",
+    "disable_notify_for_minutes_plural": "Desactivar la protección por {{count}} minutos",
+    "disable_notify_for_hours": "Desactivar la protección por {{count}} hora",
+    "disable_notify_for_hours_plural": "Desactivar la protección por {{count}} horas",
+    "disable_notify_until_tomorrow": "Desactivar la protección hasta mañana",
+    "enable_protection_timer": "La protección se activará en {{time}}",
     "custom_retention_input": "Ingresa la retención en horas",
     "custom_rotation_input": "Ingresa la rotación en horas",
     "protection_section_label": "Protección",
     "log_and_stats_section_label": "Registro de consultas y estadísticas",
     "ignore_query_log": "Ignorar este cliente en el registro de consultas",
     "ignore_statistics": "Ignorar este cliente en las estadísticas",
-    "schedule_services": "Pausar servicio de bloqueo",
+    "schedule_services": "Pausar el servicio de bloqueo",
     "schedule_services_desc": "Configura el horario programado de pausa del servicio de bloqueo",
     "schedule_services_desc_client": "Configurar el horario programado de pausa del bloqueo de servicio filtrado para este cliente",
     "schedule_desc": "Establecer periodos de inactividad para servicios bloqueados",
@@ -719,7 +694,7 @@
     "schedule_current_timezone": "Zona horaria actual: {{value}}",
     "schedule_time_all_day": "Todo el dia",
     "schedule_modal_description": "Este horario sustituirá cualquier horario existente para el mismo día de la semana. Cada día de la semana solo puede tener un periodo de inactividad.",
-    "schedule_modal_time_off": "Detener servicio de bloqueo:",
+    "schedule_modal_time_off": "Detener el servicio de bloqueo:",
     "schedule_new": "Nuevo horario",
     "schedule_edit": "Editar horario",
     "schedule_save": "Guardar horario",
@@ -740,8 +715,5 @@
     "wednesday_short": "Mié.",
     "thursday_short": "Jue.",
     "friday_short": "Vie.",
-    "saturday_short": "Sáb.",
-    "upstream_dns_cache_configuration": "Configuración de la caché DNS upstream",
-    "enable_upstream_dns_cache": "Habilitar el almacenamiento en caché de DNS para la configuración personalizada de este cliente",
-    "dns_cache_size": "Tamaño de la caché DNS, en bytes"
+    "saturday_short": "Sáb."
 }

client/src/__locales/fa.json

@@ -139,6 +139,7 @@
     "enforced_save_search": "جستجوی اَمن اجبار شده",
     "number_of_dns_query_to_safe_search": "تعداد درخواست های DNS برای موتور جستجو که جستجوی اَمن اجبار شده",
     "average_processing_time": "میانگین زمان پردازش",
+    "processing_time": "زمان پردازش",
     "average_processing_time_hint": "زمان میانگین بر هزارم ثانیه در پردازش درخواست DNS",
     "block_domain_use_filters_and_hosts": "مسدودسازی دامنه ها توسط فیلترها و فایل های میزبان",
     "filters_block_toggle_hint": "میتوانید دستورات مسدودسازی را در تنظیمات <a>فیلترها</a> راه اندازی کنید.",
@@ -220,7 +221,6 @@
     "updated_upstream_dns_toast": "سرورهای DNS جریان ارسالی بروز رسانی شده است",
     "dns_test_ok_toast": "سرورهای DNS تعیین شده بدرستی کار می کنند",
     "dns_test_not_ok_toast": "سرور \"{{key}}\": نمیتواند مورد استفاده قرار گیرد،لطفا بررسی کنید آن را بدرستی نوشته اید",
-    "dns_test_parsing_error_toast": "بخش {{section}}: خط {{line}}: نمی‌تواند مورد استفاده قرار گیرد،لطفا بررسی کنید آن را به‌درستی نوشته‌اید",
     "unblock": "رفع انسداد",
     "block": "مسدود کردن",
     "disallow_this_client": "این مشتری را رد کنید",
@@ -271,9 +271,6 @@
     "custom_ip": "آی پی دستی",
     "blocking_ipv4": "مسدودسازی IPv4",
     "blocking_ipv6": "مسدودسازی IPv6",
-    "blocked_response_ttl": "TTL پاسخ مسدود شده",
-    "blocked_response_ttl_desc": "مشخص می کند که کلاینت ها برای چند ثانیه یک پاسخ فیلتر شده را در حافظه پنهان نگه دارند",
-    "form_enter_blocked_response_ttl": "پاسخ مسدود شده TTL (ثانیه) را وارد کنید",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -421,7 +418,6 @@
     "form_add_id": "افزودن احرازکننده",
     "form_client_name": "نام کلاینت را وارد کنید",
     "name": "نام",
-    "client_name": "مشتری {{id}}",
     "client_global_settings": "استفاده از تنظیمات سراسری",
     "client_deleted": "کلاینت \"{{key}}\" را با موفقیت حذف کرد",
     "client_added": "کلاینت \"{{key}}\" را با موفقیت اضافه کرد",

client/src/__locales/fi.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Päätelaiteasetukset",
     "example_upstream_reserved": "ylävirta <0>tietyille verkkotunnuksille</0>;",
-    "example_multiple_upstreams_reserved": "useita ylävirtoja <0>tietyille verkkotunnuksille</0>;",
     "example_upstream_comment": "kommentti.",
     "upstream_parallel": "Käytä rinnakkaisia pyyntöjä ja nopeuta selvitystä käyttämällä kaikkia ylävirtapalvelimia samanaikaisesti.",
     "parallel_requests": "Rinnakkaiset pyynnöt",
@@ -74,9 +73,7 @@
     "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}}\" lisättiin",
     "dhcp_lease_deleted": "Kiinteä laina \"{{key}}\" poistettiin",
-    "dhcp_lease_updated": "Kiinteä laina \"{{key}}\" päivitettiin",
     "dhcp_new_static_lease": "Uusi kiinteä laina",
-    "dhcp_edit_static_lease": "Muokkaa 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",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Estetyt haittaohjelmat/tietojenkalastelut",
     "stats_adult": "Estetyt aikuisille tarkoitetut sivustot",
     "stats_query_domain": "Kysytyimmät verkkotunnukset",
-    "for_last_hours": "viimeisen {{count}} tunnin ajalta",
-    "for_last_hours_plural": "viimeisen {{count}} tunnin ajalta",
+    "for_last_24_hours": "viimeisten 24 tunnin ajalta",
     "for_last_days": "viimeisten {{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>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Ylävirtatietoja ei löytynyt",
     "number_of_dns_query_days": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten {{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_hours": "Viimeisen {{count}} tunnin aikana käsiteltyjen DNS-kyselyiden määrä",
-    "number_of_dns_query_hours_plural": "Viimeisen {{count}} tunnin aikana käsiteltyjen DNS-kyselyiden määrä",
+    "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_upstream_response_time": "Ylävirran keskimääräinen vasteaika",
-    "response_time": "Vasteaika",
+    "processing_time": "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>.",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "Ylävirtapalvelimet tallennettiin",
     "dns_test_ok_toast": "Määritetyt DNS-palvelimet toimivat oikein",
     "dns_test_not_ok_toast": "Palvelin \"{{key}}\": Ei voitu käyttää, tarkista oikeinkirjoitus",
-    "dns_test_parsing_error_toast": "Osio {{section}}: rivi {{line}}: Ei voitu käyttää, tarkista oikeinkirjoitus",
     "dns_test_warning_toast": "Datavuon \"{{key}}\" ei vastaa testipyyntöihin eikä välttämättä toimi kunnolla",
     "unblock": "Salli",
     "block": "Estä",
@@ -244,7 +237,6 @@
     "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",
-    "add_persistent_client": "Lisää pysyvänä päätelaitteena",
     "time_table_header": "Aika",
     "date": "Päiväys",
     "domain_name_table_header": "Verkkotunnus",
@@ -272,12 +264,12 @@
     "query_log_cleared": "Pyyntöhistorian tyhjennys onnistui",
     "query_log_updated": "Pyyntöhistorian päivitys onnistui",
     "query_log_clear": "Tyhjennä pyyntöhistoria",
-    "query_log_retention": "Pyyntöhistorian kierto",
+    "query_log_retention": "Kyselylokien kierto",
     "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>asetuksista</0>.",
+    "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öhistorian kiertoa? Jos pienennät aikaväliä, osa tiedoista menetetään.",
+    "query_log_retention_confirm": "Haluatko varmasti muuttaa kyselylokin kiertoa? Jos pienennät intervalliarvoa, osa tiedoista 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",
@@ -291,9 +283,6 @@
     "custom_ip": "Mukautettu IP-osoite",
     "blocking_ipv4": "IPv4-esto",
     "blocking_ipv6": "IPv6-esto",
-    "blocked_response_ttl": "Estetyn vastauksen elinaika",
-    "blocked_response_ttl_desc": "Määrittää montako sekuntia päätteiden tulee puskuroida suodatettuja vastauksia.",
-    "form_enter_blocked_response_ttl": "Syötä estetyn vastauksen elinaika (sekuntia)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -305,23 +294,13 @@
     "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ä pyyntörajoitus",
-    "rate_limit": "Pyyntöajoitus",
+    "form_enter_rate_limit": "Syötä rajoitus",
+    "rate_limit": "Pyyntöjen ajoitus",
     "edns_enable": "Käytä EDNS-päätelaitealivekkoa",
-    "edns_cs_desc": "Lisää EDNS Client Subnet (ECS) -valinta ylävirran pyyntöihin ja kirjaa päätelaitteiden lähettämät arvot pyyntöhistoriaan.",
+    "edns_cs_desc": "Lähetä päätelaitteiden aliverkot DNS-palvelimille.",
     "edns_use_custom_ip": "Käytä omaa IP-osoitetta EDNS:lle",
     "edns_use_custom_ip_desc": "Salli oman IP-osoitteen käyttö EDNS-mekanismille.",
     "rate_limit_desc": "Päätelaitteelle sallittu pyyntöjen enimmäismäärä sekunnissa. Arvo 0 tarkoittaa rajatonta.",
-    "rate_limit_subnet_len_ipv4": "IPv4-osoitteiden aliverkon etuliitteen pituus",
-    "rate_limit_subnet_len_ipv4_desc": "Pyyntörajoitukseen käytettävien IPv4-osoitteiden aliverkon etuliitteen pituus. Oletusarvo on 24.",
-    "rate_limit_subnet_len_ipv4_error": "IPv4-aliverkon etuliitteen pituuden tulee olla väliltä 0–32.",
-    "rate_limit_subnet_len_ipv6": "IPv6-osoitteiden aliverkon etuliitteen pituus",
-    "rate_limit_subnet_len_ipv6_desc": "Pyyntörajoitukseen käytettävien IPv6-osoitteiden aliverkon etuliitteen pituus. Oletusarvo on 56.",
-    "rate_limit_subnet_len_ipv6_error": "IPv6-aliverkon etuliitteen pituuden tulee olla väliltä 0–128.",
-    "form_enter_rate_limit_subnet_len": "Syötä pyyntörajoitukseen käytettävä aliverkon etuliitteen pituus",
-    "rate_limit_whitelist": "Pyyntörajoituksen ohituslista",
-    "rate_limit_whitelist_desc": "IP-osoitteet, jotka eivät kuulu pyyntörajoituksen piiriin.",
-    "rate_limit_whitelist_placeholder": "Syötä yksi IP-osoite per rivi",
     "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ä",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Isäntänimet",
     "encryption_reset": "Haluatko varmasti palauttaa salausasetukset?",
     "encryption_warning": "Varoitus",
-    "encryption_plain_dns_enable": "Käytä tavallista DNS:ää",
-    "encryption_plain_dns_desc": "Tavallinen DNS on oletusarvoisesti käytössä. Voit poistaa sen käytöstä pakottaaksesi kaikki laitteet käyttämään salattua DNS:ää. Tätä varten sinun on otettava käyttöön ainakin yksi salattu DNS-protokolla.",
-    "encryption_plain_dns_error": "Voit poistaa tavallisen DNS:n käytöstä ottamalla käyttöön ainakin yhden salatun DNS-protokollan.",
     "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",
@@ -448,7 +424,7 @@
     "manual_update": "Seuraa <a>näitä ohjeita</a> päivittääksesi manuaalisesti.",
     "processing_update": "Odota kun AdGuard Home päivittyy",
     "clients_title": "Pysyvät päätelaitteet",
-    "clients_desc": "Määritä AdGuard Homeen pysyvästi yhdistettyjen päätelaitteiden tiedot.",
+    "clients_desc": "Määritä pysyvät AdGuard Homeen yhdistetyt päätelaitetiedot.",
     "settings_global": "Yleinen",
     "settings_custom": "Mukautettu",
     "table_client": "Asiakas",
@@ -467,7 +443,6 @@
     "form_add_id": "Lisää tunniste",
     "form_client_name": "Syötä päätelaitteen nimi",
     "name": "Nimi",
-    "client_name": "Päätelaite {{id}}",
     "client_global_settings": "Käytä yleisiä asetuksia",
     "client_deleted": "Päätelaite \"{{key}}\" poistettiin",
     "client_added": "Päätelaite \"{{key}}\" lisättiin",
@@ -481,10 +456,10 @@
     "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 <a>ClientID</a>-tunnisteista. Jos listalla on kohteita, hyväksyy AdGuard Home pyyntöjä vain näiltä päätelaitteilta.",
-    "access_disallowed_title": "Estetyt päätelaitteet",
+    "access_disallowed_title": "Kielletyt päätelaitteet",
     "access_disallowed_desc": "Lista CIDR-merkinnöistä, IP-osoitteista tai <a>ClientID</a>-tunnisteista. Jos listalla on kohteita, hylkää AdGuard Home näiden päätelaitteiden pyynnöt. Tätä kenttää ei huomioida, jos sallittuja päätelaitteita on määritetty.",
-    "access_blocked_title": "Estetyt verkkotunnukset",
-    "access_blocked_desc": "Ei pidä sekoittaa suodattimiin. AdGuard Home hylkää näiden verkkotunnusten DNS-pyynnöt, eivätkä nämä pyynnöt myöskään näy 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_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": "Uusi versio AdGuard Home -ohjelmasta on saatavana\n",
     "updates_version_equal": "AdGuard Home on ajan tasalla",
@@ -563,7 +538,7 @@
     "ignore_domains": "Ohitettavat verkkotunnukset (erotettu rivinvaihdolla)",
     "ignore_domains_title": "Ohitettavat verkkotunnukset",
     "ignore_domains_desc_stats": "Sääntöihin sopivat kyselyt eivät kirjoitu tilastoihin",
-    "ignore_domains_desc_query": "Näitä sääntöjä vastaavia pyyntöjä ei tallenneta pyyntöhistoriaan.",
+    "ignore_domains_desc_query": "Sääntöihin sopivat kyselyt eivät tallennu kyselylokiin",
     "interval_hours": "{{count}} tunti",
     "interval_hours_plural": "{{count}} tuntia",
     "filters_configuration": "Suodatinten määritys",
@@ -636,7 +611,7 @@
     "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": "Estetty",
+    "show_blocked_responses": "Estetyt",
     "show_whitelisted_responses": "Sallitut",
     "show_processed_responses": "Käsitelty",
     "blocked_safebrowsing": "Turvallisen selauksen estämät",
@@ -678,8 +653,8 @@
     "use_saved_key": "Käytä aiemmin tallennettua avainta",
     "parental_control": "Lapsilukko",
     "safe_browsing": "Turvallinen selaus",
-    "served_from_cache_label": "Toimitettu välimuistista",
-    "form_error_password_length": "Salasanan on oltava {{min}} - {{max}} merkkiä pitkä",
+    "served_from_cache": "{{value}} <i>(jaettu välimuistista)</i>",
+    "form_error_password_length": "Salasanan on oltava ainakin {{value}} merkkiä",
     "anonymizer_notification": "<0>Huomioi:</0> IP-osoitteen anonymisointi on käytössä. Voit poistaa sen käytöstä <1>Yleisistä asetuksista</1>.",
     "confirm_dns_cache_clear": "Haluatko varmasti tyhjentää DNS-välimuistin?",
     "cache_cleared": "DNS-välimuistin tyhjennys onnistui",
@@ -706,8 +681,8 @@
     "custom_retention_input": "Syötä säilytysaika tunteina",
     "custom_rotation_input": "Syötä uudistusaika tunteina",
     "protection_section_label": "Suojaus",
-    "log_and_stats_section_label": "Pyyntöhistoria ja tilastot",
-    "ignore_query_log": "Älä huomioi tätä päätelaitetta pyyntöhistoriassa",
+    "log_and_stats_section_label": "Kyselyhistoria ja tilastot",
+    "ignore_query_log": "Älä huomioi tätä päätettä kyselyhistoriassa",
     "ignore_statistics": "Älä huomioi tätä päätettä tilastoissa",
     "schedule_services": "Keskeytä palveluesto",
     "schedule_services_desc": "Määritä palvelunestosuodattimen keskeytysajoitus.",
@@ -740,8 +715,5 @@
     "wednesday_short": "Ke",
     "thursday_short": "To",
     "friday_short": "Pe",
-    "saturday_short": "La",
-    "upstream_dns_cache_configuration": "Ylävirran DNS-välimuistin määritykset",
-    "enable_upstream_dns_cache": "Käytä DNS-välimuistia tämän päätelaitteen mukautetuissa ylävirtamäärityksissä",
-    "dns_cache_size": "DNS-välimuistin koko tavuina"
+    "saturday_short": "La"
 }

client/src/__locales/fr.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Paramètres du client",
     "example_upstream_reserved": "un amont <0>pour des domaines spécifiques</0> ;",
-    "example_multiple_upstreams_reserved": "plusieurs amonts <0>pour des domaines spécifiques</0> ;",
     "example_upstream_comment": " un commentaire.",
     "upstream_parallel": "Utilisez des requêtes parallèles pour accélérer la résolution en requêtant simultanément tous les serveurs en amont.",
     "parallel_requests": "Requêtes en parallèle",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Votre système utilise une configuration d'adresses IP dynamiques pour l'interface <0>{{interfaceName}}</0>. Pour utiliser un serveur DHCP, une adresse IP statique est requise. Votre adresse IP actuelle est <0>{{ipAddress}}</0>. AdGuard Home va automatiquement définir cette adresse IP comme statique si vous appuyez sur le bouton « Activer le serveur DHCP ».",
     "dhcp_lease_added": "« {{key}} » de bail statique ajoutée",
     "dhcp_lease_deleted": "« {{key}} » de bail statique supprimée",
-    "dhcp_lease_updated": "Bail statique « {{key}} » mis à jour correctement",
     "dhcp_new_static_lease": "Nouveau bail statique",
-    "dhcp_edit_static_lease": "Modifier le bail statique",
     "dhcp_static_leases_not_found": "Aucun bail statique DHCP trouvé",
     "dhcp_add_static_lease": "Ajoutez un bail statique",
     "dhcp_reset_leases": "Réinitialiser tous les baux",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Tentative de malware/hameçonnage bloquée",
     "stats_adult": "Sites à contenu adulte bloqués",
     "stats_query_domain": "Domaines les plus recherchés",
-    "for_last_hours": "pendant la dernière {{count}} heure",
-    "for_last_hours_plural": "pendant les dernières {{count}} heures",
+    "for_last_24_hours": "pendant les dernières 24 heures",
     "for_last_days": "pour les {{count}} derniers jours",
     "for_last_days_plural": "pour les {{count}} derniers jours",
     "stats_disabled": "Les statistiques ont été désactivées. Vous pouvez l'activer à partir de la <0>page des paramètres</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Aucune donnée en amont trouvée",
     "number_of_dns_query_days": "Le nombre de requêtes DNS traitées pour les {{count}} derniers jours",
     "number_of_dns_query_days_plural": "Le nombre de requêtes DNS traitées ces {{count}} derniers jours",
-    "number_of_dns_query_hours": "Le nombre de requêtes DNS traitées pendant la dernière {{count}} heure",
-    "number_of_dns_query_hours_plural": "Le nombre de requêtes DNS traitées pendant les dernières {{count}} heures",
+    "number_of_dns_query_24_hours": "Le nombre de requêtes DNS traitées au cours des 24 dernières heures",
     "number_of_dns_query_blocked_24_hours": "Le nombre de requêtes DNS bloquées par les filtres adblock et les listes de blocage des hôtes",
     "number_of_dns_query_blocked_24_hours_by_sec": "Le nombre de requêtes DNS bloquées par le module Sécurité de navigation d'AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Le nombre de sites à contenu adulte bloqués",
     "enforced_save_search": "Recherche sécurisée forcée",
     "number_of_dns_query_to_safe_search": "Le nombre de requêtes DNS faites avec la Recherche securisée",
     "average_processing_time": "Temps moyen de traitement",
-    "average_upstream_response_time": "Temps de réponse moyen en amont",
-    "response_time": "Temps de réponse",
+    "processing_time": "Délai de traitement",
     "average_processing_time_hint": "Temps moyen (en millisecondes) de traitement d'une requête DNS",
     "block_domain_use_filters_and_hosts": "Bloquez les domaines à l'aide des filtres et fichiers hosts",
     "filters_block_toggle_hint": "Vous pouvez configurer les règles de filtrage dans les paramètres des <a>Filtres</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "La section {{section}}: ligne {{line}}: n'a pas pu être utilisée, veuillez vérifier que vous l'avez écrite correctement",
     "dns_test_warning_toast": "L'amont « {{key}} » ne répond pas aux demandes de test et peut ne pas fonctionner correctement",
     "unblock": "Débloquer",
     "block": "Bloquer",
@@ -244,7 +237,6 @@
     "allow_this_client": "Autoriser ce client",
     "block_for_this_client_only": "Bloquer uniquement pour ce client",
     "unblock_for_this_client_only": "Débloquer uniquement pour ce client",
-    "add_persistent_client": "Ajouter comme client persistant",
     "time_table_header": "Temps",
     "date": "Date",
     "domain_name_table_header": "Nom de domaine",
@@ -291,9 +283,6 @@
     "custom_ip": "IP personnalisée",
     "blocking_ipv4": "Blocage IPv4",
     "blocking_ipv6": "Blocage IPv6",
-    "blocked_response_ttl": "Réponse bloquée TTL",
-    "blocked_response_ttl_desc": "Spécifie pendant combien de secondes les clients doivent mettre en cache une réponse filtrée",
-    "form_enter_blocked_response_ttl": "Saisir le TTL de la réponse bloquée (secondes)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Utiliser une IP personnalisée pour EDNS",
     "edns_use_custom_ip_desc": "Autoriser l'utilisation d'une adresse IP personnalisée pour EDNS",
     "rate_limit_desc": "Le nombre de requêtes par seconde qu’un seul client est autorisé à faire. Le réglage 0 fait illimité.",
-    "rate_limit_subnet_len_ipv4": "Longueur du préfixe de sous-réseau pour les adresses IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Longueur du préfixe de sous-réseau pour les adresses IPv4 utilisé pour la limitation de vitesse. La valeur par défaut est 24",
-    "rate_limit_subnet_len_ipv4_error": "La longueur du préfixe du sous-réseau IPv4 doit être entre 0 et 32",
-    "rate_limit_subnet_len_ipv6": "Longueur du préfixe de sous-réseau pour les adresses IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Longueur du préfixe de sous-réseau pour les adresses IPv6 utilisé pour la limitation de débit. La valeur par défaut est 56",
-    "rate_limit_subnet_len_ipv6_error": "La longueur du préfixe du sous-réseau IPv6 doit être entre 0 et 128",
-    "form_enter_rate_limit_subnet_len": "Saisissez la longueur du préfixe de sous-réseau pour la limitation de débit",
-    "rate_limit_whitelist": "Liste d'autorisation de limitation de débit",
-    "rate_limit_whitelist_desc": "Adresses IP exclues de la limitation du débit",
-    "rate_limit_whitelist_placeholder": "Saisissez une adresse IP par ligne",
     "blocking_ipv4_desc": "Adresse IP à renvoyer pour une demande A bloquée",
     "blocking_ipv6_desc": "Adresse IP à renvoyer pour une demande AAAA bloquée",
     "blocking_mode_default": "Par défaut : Répondre avec adresse IP zéro (0.0.0.0 pour A ; :: pour AAAA) lorsque bloqué par la règle de style Adblock ; répondre avec l’adresse IP spécifiée dans la règle lorsque bloquée par la règle du style /etc/hosts",
@@ -340,7 +319,7 @@
     "rule_label": "Règle(s)",
     "list_label": "Liste",
     "unknown_filter": "Filtre inconnu {{filterId}}",
-    "known_tracker": "Traqueur connu",
+    "known_tracker": "Pisteur connu",
     "install_welcome_title": "Bienvenue sur AdGuard Home !",
     "install_welcome_desc": "AdGuard Home est un seveur DNS pour bloquer les pubs et traceurs sur tout un réseau. Son but est de vous donner le contrôle sur l'ensemble de votre réseau et tous vos appareils sans programme côté client supplémentaire.",
     "install_settings_title": "Interface web administrateur",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Noms d'hôte",
     "encryption_reset": "Voulez-vous vraiment réinitialiser les paramètres de chiffrement ?",
     "encryption_warning": "Attention",
-    "encryption_plain_dns_enable": "Activer le DNS simple",
-    "encryption_plain_dns_desc": "Le DNS simple est activé par défaut. Vous pouvez le désactiver pour forcer tous les appareils à utiliser un DNS crypté. Pour faire ça, vous devez activer au moins un protocole DNS crypté",
-    "encryption_plain_dns_error": "Pour désactiver le DNS simple, activez au moins un protocole DNS crypté",
     "topline_expiring_certificate": "Votre certificat SSL est sur le point d'expirer. Mettez à jour vos <0>Paramètres de chiffrement</0>.",
     "topline_expired_certificate": "Votre certificat SSL a expiré. Mettez à jour vos <0>Paramètres de chiffrement</0>.",
     "form_error_port_range": "Saisissez une valeur de port entre 80 et 65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Ajouter identifiant",
     "form_client_name": "Saisissez le nom du client",
     "name": "Nom",
-    "client_name": "Client {{id}}",
     "client_global_settings": "Utiliser les paramètres généraux",
     "client_deleted": "Le client « {{key}} » a été supprimé",
     "client_added": "Le client « {{key}} » a été ajouté",
@@ -562,8 +537,8 @@
     "statistics_enable": "Activer les statistiques",
     "ignore_domains": "Domaines ignorés (séparés par une nouvelle ligne)",
     "ignore_domains_title": "Domaines ignorés",
-    "ignore_domains_desc_stats": "Les requêtes correspondantes à ces règles ne sont pas écrites dans les statistiques",
-    "ignore_domains_desc_query": "Les requêtes correspondantes à ces règles ne sont pas écrites dans le journal des requêtes",
+    "ignore_domains_desc_stats": "Les requêtes pour ces domaines ne sont pas écrites dans les statistiques",
+    "ignore_domains_desc_query": "Les requêtes pour ces domaines ne sont pas écrites dans le journal des requêtes",
     "interval_hours": "{{count}} heure",
     "interval_hours_plural": "{{count}} heures",
     "filters_configuration": "Configuration des filtres",
@@ -612,7 +587,7 @@
     "filtered_custom_rules": "Filtré par des règles de filtrage personnalisées",
     "choose_from_list": "Choisissez dans la liste",
     "add_custom_list": "Ajouter une liste personnalisée",
-    "host_whitelisted": "L’hôte est autorisé",
+    "host_whitelisted": "L’hôte est sur liste blanche",
     "check_ip": "Adresses IP : {{ip}}",
     "check_cname": "CNAME : {{cname}}",
     "check_reason": "Raison : {{reason}}",
@@ -637,12 +612,12 @@
     "validated_with_dnssec": "Validé avec DNSSEC",
     "all_queries": "Toutes les requêtes",
     "show_blocked_responses": "Bloqué",
-    "show_whitelisted_responses": "Autorisée",
+    "show_whitelisted_responses": "Ajouté à la liste blanche",
     "show_processed_responses": "Traité",
-    "blocked_safebrowsing": "Bloqué par la Navigation sécurisée",
+    "blocked_safebrowsing": "Navigation sécurisée bloquée",
     "blocked_adult_websites": "Bloqué par le Contrôle Parental",
     "blocked_threats": "Menaces bloquées",
-    "allowed": "Autorisées",
+    "allowed": "Autorisé",
     "filtered": "Filtré",
     "rewritten": "Réécrit",
     "safe_search": "Recherche Sécurisée",
@@ -664,9 +639,9 @@
     "filter_category_security": "Sécurité",
     "filter_category_regional": "Régional",
     "filter_category_other": "Autre",
-    "filter_category_general_desc": "Listes qui bloquent le suivi et la publicité sur la plupart des appareils",
+    "filter_category_general_desc": "Listes qui bloquent le pistage et la publicité sur la plupart des appareils",
     "filter_category_security_desc": "Listes créées exprès pour bloquer les logiciels malveillants, des domaines hameçonneurs ou frauduleux",
-    "filter_category_regional_desc": "Listes axées sur les annonces régionales et les serveurs de suivi",
+    "filter_category_regional_desc": "Listes axées sur les annonces régionales et les serveurs de pistage",
     "filter_category_other_desc": "Autres listes noires",
     "setup_config_to_enable_dhcp_server": "Configurer les paramètres pour activer le serveur DHCP",
     "original_response": "Réponse originale",
@@ -678,8 +653,8 @@
     "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_label": "Servi depuis le cache",
-    "form_error_password_length": "Le mot de passe doit comporter entre {{min}} et {{max}}  caractères",
+    "served_from_cache": "{{value}} <i>(depuis le cache)</i>",
+    "form_error_password_length": "Le mot de passe doit comporter au moins {{value}} caractères",
     "anonymizer_notification": "<0>Note :</0> L'anonymisation IP est activée. Vous pouvez la désactiver dans les <1>paramètres généraux</1>.",
     "confirm_dns_cache_clear": "Voulez-vous vraiment vider le cache DNS ?",
     "cache_cleared": "Le cache DNS a été vidé",
@@ -740,8 +715,5 @@
     "wednesday_short": "Mer.",
     "thursday_short": "Jeu.",
     "friday_short": "Ven.",
-    "saturday_short": "Sam.",
-    "upstream_dns_cache_configuration": "Configuration du cache DNS en amont",
-    "enable_upstream_dns_cache": "Activer la mise en cache pour la configuration personnalisée du serveur en amont de ce client",
-    "dns_cache_size": "Taille du cache DNS, en bytes"
+    "saturday_short": "Sam."
 }

client/src/__locales/hr.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Postavke klijenta",
     "example_upstream_reserved": "upstream <0>za određene domene</0>;",
-    "example_multiple_upstreams_reserved": "višestruke upstream poslužitelje <0>za određene domene</0>;",
     "example_upstream_comment": "komentar.",
     "upstream_parallel": "Koristi paralelne upite kako bi ubrzali rješavanje istovremenim ispitavanjem svih upstream poslužitelja.",
     "parallel_requests": "Paralelni zahtjevi",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Vaš sustav koristi postavke dinamičke IP adrese za sučelje <0>{{interfaceName}}</0>. Za korištenje DHCP poslužitelja mora se postaviti statička IP adresa. Vaša trenutna IP adresa je <0>{{ipAddress}}</0>. AdGuard Home automatski će postaviti ovu IP adresu kao statičnu ako pritisnete gumb \"Omogući DHCP\".",
     "dhcp_lease_added": "Statični lease \"{{key}}\" je uspješno dodan",
     "dhcp_lease_deleted": "Statični lease \"{{key}}\" je uspješno uklonjen",
-    "dhcp_lease_updated": "Statični lease \"{{key}}\" uspješno ažuriran",
     "dhcp_new_static_lease": "Novi static lease",
-    "dhcp_edit_static_lease": "Uredi statični lease",
     "dhcp_static_leases_not_found": "Nisu pronađeni statični DHCP leases",
     "dhcp_add_static_lease": "Dodaj static lease",
     "dhcp_reset_leases": "Ponovno postavljanje svih najmova",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blokiran zločudni program/krađe identiteta",
     "stats_adult": "Blokirane web stranice za odrasle",
     "stats_query_domain": "Top tražene domene",
-    "for_last_hours": "za posljednji {{count}} sat",
-    "for_last_hours_plural": "za posljednjih {{count}} sati",
+    "for_last_24_hours": "u zadnja 24 sata",
     "for_last_days": "zadnjih {{count}} dana",
     "for_last_days_plural": "zadnjih {{count}} dana",
     "stats_disabled": "Statistika je onemogućena. Možete ga uključiti sa <0>stranice s postavkama</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nema podataka o upstream poslužiteljima",
     "number_of_dns_query_days": "Broj DNS upita obrađenih u posljednja {{count}} dan",
     "number_of_dns_query_days_plural": "Broj DNS upita obrađenih u posljednja {{count}} dana",
-    "number_of_dns_query_hours": "Broj DNS upita obrađenih za posljednji {{count}} sat",
-    "number_of_dns_query_hours_plural": "Broj DNS upita obrađenih za posljednjih {{count}} sati",
+    "number_of_dns_query_24_hours": "Broj DNS upita obrađenih u posljednja 24 sata",
     "number_of_dns_query_blocked_24_hours": "Broj DNS zahtjeva koji blokiraju filtri za blokiranje oglasa i popisi blokova hostova",
     "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahtjeva koje je blokirao modul AdGuard zaštita pregledavanja",
     "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih stranica s sadržajem za odrasle",
     "enforced_save_search": "Omogućeno sigurno pretraživanje",
     "number_of_dns_query_to_safe_search": "Broj DNS zahtjeva prema pretraživačima za koje je omogućeno Sigurno pretraživanje",
     "average_processing_time": "Prosječno vrijeme obrade",
-    "average_upstream_response_time": "Prosječno vrijeme odziva upstream poslužitelja",
-    "response_time": "Vrijeme odziva",
+    "processing_time": "Vrijeme obrade",
     "average_processing_time_hint": "Prosječno vrijeme u milisekundama za obradu DNS zahtjeva",
     "block_domain_use_filters_and_hosts": "Blokiraj domene koristeći filtre ili hosts datoteke",
     "filters_block_toggle_hint": "Pravila blokiranja možete postaviti u postavkama <a>filtara</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Odjeljak {{section}}: redak {{line}}: nije moguće koristiti, provjerite jeste li ispravno napisali",
     "dns_test_warning_toast": "Upstream \"{{key}}\" ne odgovara na zahtjeve za testiranje i možda neće raditi ispravno",
     "unblock": "Odblokiraj",
     "block": "Blokiraj",
@@ -244,7 +237,6 @@
     "allow_this_client": "Omogući ovog klijenta",
     "block_for_this_client_only": "Blokiraj samo za ovog klijenta",
     "unblock_for_this_client_only": "Odblokiraj samo za ovog klijenta",
-    "add_persistent_client": "Dodaj u spremljene klijente",
     "time_table_header": "Vrijeme",
     "date": "Datum",
     "domain_name_table_header": "Naziv domene",
@@ -291,9 +283,6 @@
     "custom_ip": "Prilagođen IP",
     "blocking_ipv4": "Blokiranje IPv4",
     "blocking_ipv6": "Blokiranje IPv6",
-    "blocked_response_ttl": "TTL blokiranog odgovora",
-    "blocked_response_ttl_desc": "Određuje koliko sekundi bi klijenti trebali keširati filtrirani odgovor",
-    "form_enter_blocked_response_ttl": "Unesite TTL blokiranog odgovora (sekunde)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Koristi prilagođeni IP za EDNS",
     "edns_use_custom_ip_desc": "Dopusti korištenje prilagođenog IP-a za EDNS",
     "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu. Postavljanje na 0 znači neograničeno.",
-    "rate_limit_subnet_len_ipv4": "Duljina prefiksa podmreže za IPv4 adrese",
-    "rate_limit_subnet_len_ipv4_desc": "Duljina prefiksa podmreže za IPv4 adrese koje se koriste za ograničavanje brzine. Zadana vrijednost je 24",
-    "rate_limit_subnet_len_ipv4_error": "Dužina IPv4 prefiksa podmreže trebala bi biti između 0 i 32",
-    "rate_limit_subnet_len_ipv6": "Duljina prefiksa podmreže za IPv6 adrese",
-    "rate_limit_subnet_len_ipv6_desc": "Duljina prefiksa podmreže za IPv6 adrese koje se koriste za ograničavanje brzine. Zadana vrijednost je 56",
-    "rate_limit_subnet_len_ipv6_error": "Dužina IPv6 prefiksa podmreže trebala bi biti između 0 i 128",
-    "form_enter_rate_limit_subnet_len": "Unesite duljinu prefiksa podmreže za ograničenje brzine",
-    "rate_limit_whitelist": "Popis dopuštenih za ograničavanje brzine",
-    "rate_limit_whitelist_desc": "IP adrese isključene iz ograničenja brzine",
-    "rate_limit_whitelist_placeholder": "Unesite jednu adresu poslužitelja po retku",
     "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve",
     "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve",
     "blocking_mode_default": "Zadano: Odgovori s nultom IP adresom (0.0.0.0 za A; :: za AAAA) kada ga blokira Adblock slično pravilo; odgovorite s IP adresom definiranom u pravilu kada je blokirano od /etc/hosts sličnog pravila",
@@ -464,7 +443,6 @@
     "form_add_id": "Dodaj identifikator",
     "form_client_name": "Unesite naziv klijenta",
     "name": "Naziv",
-    "client_name": "Klijent {{id}}",
     "client_global_settings": "Koristi globalne postavke",
     "client_deleted": "Klijent \"{{key}}\" je uspješno uklonjen",
     "client_added": "Klijent \"{{key}}\" je uspješno dodan",
@@ -676,7 +654,7 @@
     "parental_control": "Roditeljska zaštita",
     "safe_browsing": "Sigurno surfanje",
     "served_from_cache": "{{value}} <i>(dohvaćeno iz predmemorije)</i>",
-    "form_error_password_length": "Lozinka mora sadržavati od {{min}} do {{max}} znakova",
+    "form_error_password_length": "Lozinka mora imati najmanje {{value}} znakova",
     "anonymizer_notification": "<0>Napomena:</0>IP anonimizacija je omogućena. Možete ju onemogućiti u <1>općim postavkama</1>.",
     "confirm_dns_cache_clear": "Jeste li sigurni da želite očistiti DNS predmemoriju?",
     "cache_cleared": "DNS predmemorija je uspješno izbrisana",
@@ -737,8 +715,5 @@
     "wednesday_short": "Sri",
     "thursday_short": "Čet",
     "friday_short": "Pet",
-    "saturday_short": "Sub",
-    "upstream_dns_cache_configuration": "Konfiguracija predmemoriranja upstream DNS poslužitelja",
-    "enable_upstream_dns_cache": "Uključite keširanje za korisničku konfiguraciju upstream servera ovog klijenta",
-    "dns_cache_size": "Veličina DNS predmemorije, u bajtovima"
+    "saturday_short": "Sub"
 }

client/src/__locales/hu.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Kliens beállítások",
     "example_upstream_reserved": "Megadhat egy DNS kiszolgálót <0>egy adott domainhez vagy domainekhez</0>",
-    "example_multiple_upstreams_reserved": "több upstream szerver <0>adott domainekhez</0>;",
     "example_upstream_comment": "egy megjegyzés.",
     "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",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "A rendszer dinamikus IP-cím konfigurációt használ az <0>{{interfaceName}}</0> interfészhez. A DHCP szerver használatához statikus IP-címet kell beállítani. Jelenlegi IP-címe: <0>{{ipAddress}}</0>. Automatikusan beállítjuk ezt az IP címet statikusnak, ha rányom a DHCP engedélyezése gombra.",
     "dhcp_lease_added": "Statikus bérlet \"{{key}}\" sikeresen hozzáadva",
     "dhcp_lease_deleted": "Statikus bérlet \"{{key}}\" sikeresen törölve",
-    "dhcp_lease_updated": "Statikus bérlet \"{{key}}\" sikeresen frissítve",
     "dhcp_new_static_lease": "Új statikus bérlet",
-    "dhcp_edit_static_lease": "Statikus bérlet szerkesztése",
     "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",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blokkolt kártevő/adathalászat",
     "stats_adult": "Blokkolt felnőtt tartalom",
     "stats_query_domain": "Leglátogatottabb domainek",
-    "for_last_hours": "az utolsó {{count}} órában",
-    "for_last_hours_plural": "az utolsó {{count}} órában",
+    "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>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nem található upstream szerver adat",
     "number_of_dns_query_days": "Lekérdezések száma az utolsó {{count}} napban",
     "number_of_dns_query_days_plural": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} napban",
-    "number_of_dns_query_hours": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} órában",
-    "number_of_dns_query_hours_plural": "Feldolgozott DNS lekérdezések száma az utolsó {{count}} órában",
+    "number_of_dns_query_24_hours": "Az elmúlt 24 órában feldolgozott DNS lekérdezések száma",
     "number_of_dns_query_blocked_24_hours": "A hirdetésblokkoló szűrők és a hosztfájlok által letiltott DNS kérések száma",
     "number_of_dns_query_blocked_24_hours_by_sec": "Az AdGuard böngészési biztonság modulja által letiltott DNS kérések száma",
     "number_of_dns_query_blocked_24_hours_adult": "Blokkolt felnőtt tartalmak száma",
     "enforced_save_search": "Kényszerített biztonságos keresés",
     "number_of_dns_query_to_safe_search": "A biztonságos keresésre kényszerített DNS lekérdezések száma",
     "average_processing_time": "Átlagos feldolgozási idő",
-    "average_upstream_response_time": "Átlagos upstream válaszidő",
-    "response_time": "Válaszidő",
+    "processing_time": "Feldolgozási idő",
     "average_processing_time_hint": "A DNS lekérdezések feldolgozásához szükséges átlagos idő milliszekundumban",
     "block_domain_use_filters_and_hosts": "Domainek blokkolása szűrők és hosztfájlok használatával",
     "filters_block_toggle_hint": "A <a> szűrőbeállításoknál</a> megadhatja a blokkolási szabályokat.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Szekció {{section}}: sor {{line}}: nem használható, ellenőrizze, hogy helyesen írta-e be",
     "dns_test_warning_toast": "A \"{{key}}\" feltöltés nem válaszol a tesztkérelmekre, és lehet, hogy nem működik megfelelően",
     "unblock": "Feloldás",
     "block": "Blokkolás",
@@ -244,7 +237,6 @@
     "allow_this_client": "Engedélyezés ennek a kliensnek",
     "block_for_this_client_only": "Tiltás csak ennek a kliensnek",
     "unblock_for_this_client_only": "Feloldás csak ennek a kliensnek",
-    "add_persistent_client": "Hozzáadás állandó ügyfélként",
     "time_table_header": "Idő",
     "date": "Dátum",
     "domain_name_table_header": "Domain név",
@@ -291,9 +283,6 @@
     "custom_ip": "Egyedi IP",
     "blocking_ipv4": "IPv4 blokkolása",
     "blocking_ipv6": "IPv6 blokkolása",
-    "blocked_response_ttl": "Tiltott válasz TTL-je",
-    "blocked_response_ttl_desc": "Meghatározza, hogy a klienseknek hány másodpercig kell gyorsítótárazniuk a szűrt választ",
-    "form_enter_blocked_response_ttl": "Írja be a blokkolt válasz TTL-jét (másodpercben)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Használjon egyéni IP-címet az EDNS-hez",
     "edns_use_custom_ip_desc": "Engedélyezze az egyéni IP-cím használatát az EDNS-hez",
     "rate_limit_desc": "Maximálisan hány kérést küldhet egy kliens másodpercenkén. Ha 0-ra állítja, akkor nincs korlátozás.",
-    "rate_limit_subnet_len_ipv4": "Az IPv4-címek alhálózati előtagjának hossza",
-    "rate_limit_subnet_len_ipv4_desc": "A sebességkorlátozáshoz használt IPv4-címek alhálózati előtagjának hossza. Az alapértelmezett érték 24",
-    "rate_limit_subnet_len_ipv4_error": "Az IPv4 alhálózati előtag hosszának 0 és 32 között kell lennie",
-    "rate_limit_subnet_len_ipv6": "Az IPv6-címek alhálózati előtagjának hossza",
-    "rate_limit_subnet_len_ipv6_desc": "A sebességkorlátozáshoz használt IPv6-címek alhálózati előtagjának hossza. Az alapértelmezett érték 56",
-    "rate_limit_subnet_len_ipv6_error": "Az IPv6 alhálózati előtag hosszának 0 és 128 között kell lennie",
-    "form_enter_rate_limit_subnet_len": "Adja meg az alhálózati előtag hosszát a sebességkorlátozáshoz",
-    "rate_limit_whitelist": "Sebességkorlátozó engedélyezési lista",
-    "rate_limit_whitelist_desc": "A sebességkorlátozásból kizárt IP-címek",
-    "rate_limit_whitelist_placeholder": "Adjon meg egy IP-címet soronként",
     "blocking_ipv4_desc": "A blokkolt A kéréshez visszaadandó IP-cím",
     "blocking_ipv6_desc": "A blokkolt AAAA kéréshez visszaadandó IP-cím",
     "blocking_mode_default": "Alapértelmezés: Válaszoljon nulla IP-címmel (vagyis 0.0.0.0 az A-hoz, :: pedig az AAAA-hoz), amikor a blokkolás egy adblock-stílusú szabállyal történik; illetve válaszoljon egy, a szabály által meghatározott IP címmel, amikor a blokkolás egy /etc/hosts stílusú szabállyal történik",
@@ -464,7 +443,6 @@
     "form_add_id": "Azonosító hozzáadása",
     "form_client_name": "Adja meg a kliens nevét",
     "name": "Név",
-    "client_name": "Ügyfél {{id}}",
     "client_global_settings": "Globális beállítások használata",
     "client_deleted": "A(z) \"{{key}}\" kliens sikeresen el lett távolítva",
     "client_added": "A(z) \"{{key}}\" kliens sikeresen hozzá lett adva",
@@ -676,7 +654,7 @@
     "parental_control": "Szülői felügyelet",
     "safe_browsing": "Biztonságos böngészés",
     "served_from_cache": "{{value}} <i>(gyorsítótárból kiszolgálva)</i>",
-    "form_error_password_length": "A jelszó legyen {{min}} és {{max}} karakter között",
+    "form_error_password_length": "A jelszó legalább {{value}} karakter hosszú kell, hogy legyen",
     "anonymizer_notification": "<0>Megjegyzés:</0> Az IP anonimizálás engedélyezve van. Az <1>Általános beállításoknál letilthatja</1> .",
     "confirm_dns_cache_clear": "Biztos benne, hogy törölni szeretné a DNS-gyorsítótárat?",
     "cache_cleared": "A DNS gyorsítótár sikeresen törlődött",
@@ -737,8 +715,5 @@
     "wednesday_short": "Szer",
     "thursday_short": "Csüt",
     "friday_short": "Pén",
-    "saturday_short": "Szom",
-    "upstream_dns_cache_configuration": "Upstream DNS gyorsítótár konfigurációja",
-    "enable_upstream_dns_cache": "A DNS gyorsítótárazásának engedélyezése az ügyfél egyéni upstream konfigurációjához",
-    "dns_cache_size": "DNS gyorsítótár mérete, bájtokban"
+    "saturday_short": "Szom"
 }

client/src/__locales/id.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Pengaturan klien",
     "example_upstream_reserved": "upstream <0>untuk domain spesifik</0>;",
-    "example_multiple_upstreams_reserved": "beberapa server upstream <0>untuk domain spesifik</0>;",
     "example_upstream_comment": "komentar.",
     "upstream_parallel": "Gunakan kueri paralel untuk mempercepat resoluasi dengan menanyakan semua server upstream secara bersamaan",
     "parallel_requests": "Permintaan paralel",
@@ -9,18 +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": "Alamat IP server DNS yang digunakan untuk menyelesaikan alamat IP resolver DoH/DoT yang Anda tentukan sebagai upstream. Komentar tidak diizinkan.",
-    "fallback_dns_title": "Server DNS cadangan",
-    "fallback_dns_desc": "Daftar server DNS cadangan yang digunakan ketika server hulu DNS tidak merespons. Sintaksnya sama dengan kolom hulu utama di atas.",
-    "fallback_dns_placeholder": "Masukkan satu server DNS cadangan per baris",
     "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 IP per baris",
+    "local_ptr_placeholder": "Masukkan satu alamat server per baris",
     "resolve_clients_title": "Aktifkan resolusi hostname klien",
     "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 hulu ini. Jika dinonaktifkan, Adguard Home merespons dengan NXDOMAIN untuk semua permintaan PTR tersebut kecuali untuk klien yang diketahui dari DHCP, /etc/hosts, dan seterusnya.",
+    "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",
@@ -68,15 +64,13 @@
     "ip": "IP",
     "dhcp_table_hostname": "Nama host",
     "dhcp_table_expires": "Kadaluwarsa",
-    "dhcp_warning": "Jika Anda tetap ingin mengaktifkan server DHCP, pastikan tidak ada server DHCP lain yang aktif di jaringan Anda, karena hal ini dapat memutus konektivitas Internet untuk perangkat di jaringan!",
+    "dhcp_warning": "Jika anda ingin mengaktifkan server DHCP bawaan, pastikan tidak ada server DHCP lain yang aktif. Jika tidak, akan memutus koneksi internet pada perangkat yang telah terhubung!",
     "dhcp_error": "AdGuard Home tidak dapat menentukan apakah ada server DHCP aktif lain pada jaringan",
     "dhcp_static_ip_error": "Jika ingin menggunakan server DHCP, alamat IP statis harus diatur. AdGuard Home gagal menentukan jika antarmuka jaringan ini dikonfigurasi menggunakan alamat IP statis. Silakan atur alamat IP statis secara manual.",
     "dhcp_dynamic_ip_found": "Sistem Anda menggunakan konfigurasi alamat IP dinamis untuk antarmuka <0>{{interfaceName}}</0>. Untuk menggunakan server DHCP, alamat IP statis harus ditetapkan. Alamat IP Anda saat ini adalah <0>{{ipAddress}}</0>. AdGuard Home akan secara otomatis menetapkan alamat IP ini sebagai statis jika Anda menekan tombol Aktifkan DHCP.",
     "dhcp_lease_added": "Static lease \"{{key}}\" berhasil ditambahkan",
     "dhcp_lease_deleted": "Static lease \"{{key}}\" berhasil dihapus",
-    "dhcp_lease_updated": "Static lease \"{{key}}\" berhasil diperbarui",
     "dhcp_new_static_lease": "Static lease baru",
-    "dhcp_edit_static_lease": "Mengedit static lease",
     "dhcp_static_leases_not_found": "DHCP static lease tidak ditemukan",
     "dhcp_add_static_lease": "Tambah static lease",
     "dhcp_reset_leases": "Atur ulang semua kontrak",
@@ -117,11 +111,10 @@
     "refresh_statics": "Segarkan statistik",
     "dns_query": "Kueri DNS",
     "blocked_by": "<0>Diblokir oleh</0>",
-    "stats_malware_phishing": "Malware/phishing terblokir",
-    "stats_adult": "Situs dewasa terblokir",
+    "stats_malware_phishing": "Malware/phishing diblokir",
+    "stats_adult": "Situs dewasa diblokir",
     "stats_query_domain": "Kueri domain teratas",
-    "for_last_hours": "selama {{count}} jam terakhir",
-    "for_last_hours_plural": "selama {{count}} jam terakhir",
+    "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>.",
@@ -136,19 +129,16 @@
     "no_upstreams_data_found": "Tidak ada data server upstream yang ditemukan",
     "number_of_dns_query_days": "Jumlah kueri DNS diproses selama {{value}} hari terakhir",
     "number_of_dns_query_days_plural": "Jumlah kueri DNS yang diproses selama {{count}} hari terakhir",
-    "number_of_dns_query_hours": "Jumlah kueri DNS diproses selama {{{count}} jam terakhir",
-    "number_of_dns_query_hours_plural": "Jumlah kueri DNS diproses selama {{count}} jam terakhir",
-    "number_of_dns_query_blocked_24_hours": "Jumlah permintaan DNS yang diblokir oleh filter adblock dan daftar hitam host",
-    "number_of_dns_query_blocked_24_hours_by_sec": "Jumlah permintaan DNS yang diblokir oleh modul keamanan penjelajahan AdGuard",
-    "number_of_dns_query_blocked_24_hours_adult": "Jumlah situs web dewasa yang diblokir",
+    "number_of_dns_query_24_hours": "Jumlah kueri DNS diproses selama 24 jam terakhir",
+    "number_of_dns_query_blocked_24_hours": "Julah DNS diblokir oleh penyaring adblock dan daftar blokir hosts",
+    "number_of_dns_query_blocked_24_hours_by_sec": "Jumlah perminataan DNS diblokir oleh modul Kemanan Penjelajahan AdGuard",
+    "number_of_dns_query_blocked_24_hours_adult": "Jumlah website dewasa diblokir",
     "enforced_save_search": "Paksa pencarian aman",
     "number_of_dns_query_to_safe_search": "Jumlah perminataan DNS ke mesin pencari yang dipaksa Pencarian Aman",
     "average_processing_time": "Rata-rata waktu pemrosesan",
-    "average_upstream_response_time": "Rata-rata waktu respons hulu",
-    "response_time": "Waktu respons",
     "average_processing_time_hint": "Rata-rata waktu dalam milidetik untuk pemrosesan sebuah permintaan DNS",
     "block_domain_use_filters_and_hosts": "Blokir domain menggunakan filter dan file hosts",
-    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran dalam pengaturan <a>Filter</a>.",
+    "filters_block_toggle_hint": "Anda dapat menyiapkan aturan pemblokiran di pengaturan <a>Penyaringan</a>.",
     "use_adguard_browsing_sec": "Gunakan layanan web Keamanan Penjelajahan AdGuard",
     "use_adguard_browsing_sec_hint": "AdGuard Home akan 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",
@@ -166,7 +156,7 @@
     "encryption_settings": "Pengaturan enkripsi",
     "dhcp_settings": "Pengaturan DHCP",
     "upstream_dns": "Server DNS hulu",
-    "upstream_dns_help": "Masukkan satu alamat server per baris. <a>Pelajari lebih lanjut</a> mengenai cara mengonfigurasi server DNS hulu.",
+    "upstream_dns_help": "Masukkan alamat server per baris. <a>Pelajari lebih</a> mengenai konfigurasi upstream server DNS.",
     "upstream_dns_configured_in_file": "Diatur dalam {{path}}",
     "test_upstream_btn": "Uji hulu",
     "upstreams": "Upstream",
@@ -180,7 +170,6 @@
     "enabled_parental_toast": "Kontrol orang tua diaktifkan",
     "disabled_safe_search_toast": "Pencarian aman dinonaktifkan",
     "enabled_save_search_toast": "Pencarian aman diaktifkan",
-    "updated_save_search_toast": "Pengaturan Pencarian Aman telah diperbarui",
     "enabled_table_header": "Diaktifkan",
     "name_table_header": "Nama",
     "list_url_table_header": "Daftar URL",
@@ -192,10 +181,10 @@
     "delete_table_action": "Hapus",
     "elapsed": "Berlalu",
     "filters_and_hosts_hint": "AdGuard Home memahami aturan dasar adblock dan sintak file hosts.",
-    "no_blocklist_added": "Tidak ada daftar hitam yang ditambahkan",
-    "no_whitelist_added": "Tidak ada daftar putih yang ditambahkan",
-    "add_blocklist": "Tambahkan daftar hitam",
-    "add_allowlist": "Tambahkan daftar putih",
+    "no_blocklist_added": "Tiada daftar hitam ditambahkan",
+    "no_whitelist_added": "Tiada daftar putih ditambahkan",
+    "add_blocklist": "Tambah daftar hitam",
+    "add_allowlist": "Tambah daftar putih",
     "cancel_btn": "Batal",
     "enter_name_hint": "Masukkan nama",
     "enter_url_or_path_hint": "Masukan sebuah URL atau jalur absolut dari daftar",
@@ -224,10 +213,10 @@
     "example_upstream_regular": "DNS reguler (melalui UDP);",
     "example_upstream_regular_port": "DNS biasa (lebih dari UDP, dengan port);",
     "example_upstream_udp": "DNS biasa (lebih dari UDP, nama host);",
-    "example_upstream_dot": "<0>DNS melalui TLS</0> terenkripsi;",
-    "example_upstream_doh": "<0>DNS melalui HTTPS</0> terenkripsi;",
-    "example_upstream_doh3": "DNS melalui HTTPS terenkripsi dengan <0>HTTP/3</0> secara paksa dan tidak ada cadangan ke HTTP/2 atau lebih rendah;",
-    "example_upstream_doq": "<0>DNS melalui QUIC</0> terenkripsi;",
+    "example_upstream_dot": "terenkripsi <0>DNS-over-TLS</0>;",
+    "example_upstream_doh": "terenkripsi <0>DNS-over-HTTPS</0>;",
+    "example_upstream_doh3": "DNS-over-HTTPS terenkripsi dengan paksa <0>HTTP/3</0> dan tidak ada fallback ke HTTP/2 atau lebih rendah;",
+    "example_upstream_doq": "terenkripsi <0>DNS-over-QUIC</0>;",
     "example_upstream_sdns": "<0>Stempel DNS</0> untuk <1>DNSCrypt</1> atau pengarah <2>DNS-over-HTTPS</2>;",
     "example_upstream_tcp": "DNS reguler (melalui TCP);",
     "example_upstream_tcp_port": "DNS biasa (melalui TCP, dengan port);",
@@ -236,7 +225,6 @@
     "updated_upstream_dns_toast": "Server upstream berhasil disimpan",
     "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",
-    "dns_test_parsing_error_toast": "Bagian {{section}}: baris {{line}}: tidak dapat digunakan, mohon cek bahwa Anda telah menulisnya dengan benar",
     "dns_test_warning_toast": "Upstream \"{{key}}\" tidak menanggapi permintaan pengujian dan mungkin tidak berfungsi dengan baik",
     "unblock": "Buka Blokir",
     "block": "Blok",
@@ -244,7 +232,6 @@
     "allow_this_client": "Ijinkan klien ini",
     "block_for_this_client_only": "Blok hanya untuk klien ini",
     "unblock_for_this_client_only": "Jangan diblok hanya untuk klien ini",
-    "add_persistent_client": "Tambahkan sebagai klien persisten",
     "time_table_header": "Waktu",
     "date": "Tanggal",
     "domain_name_table_header": "Nama domain",
@@ -272,12 +259,12 @@
     "query_log_cleared": "Kueri log telah berhasil dihapus",
     "query_log_updated": "Log permintaan telah berhasil diperbarui",
     "query_log_clear": "Hapus kueri log",
-    "query_log_retention": "Rotasi kueri log",
+    "query_log_retention": "Retensi kueri log",
     "query_log_enable": "Aktifkan log",
     "query_log_configuration": "Konfigurasi log",
     "query_log_disabled": "Kueri log dinonaktifkan dan dapat dikonfigurasi di <0>pengaturan</0>",
     "query_log_strict_search": "Gunakan tanda kutip ganda untuk pencarian ketat",
-    "query_log_retention_confirm": "Apakah Anda yakin ingin mengubah rotasi kueri log? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
+    "query_log_retention_confirm": "Apakah Anda yakin ingin mengubah retensi kueri log? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
     "anonymize_client_ip": "Anonim IP klien",
     "anonymize_client_ip_desc": "Jangan simpan alamat lengkap IP klien dalam log dan statistik",
     "dns_config": "Konfigurasi server DNS",
@@ -291,9 +278,6 @@
     "custom_ip": "Custom IP",
     "blocking_ipv4": "Blokiran IPv4",
     "blocking_ipv6": "Blokiran IPv6",
-    "blocked_response_ttl": "Respons TTL terblokir",
-    "blocked_response_ttl_desc": "Menentukan berapa detik klien harus menyimpan respons yang difilter dalam cache",
-    "form_enter_blocked_response_ttl": "Masukkan TTL respons yang diblokir (detik)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -309,22 +293,10 @@
     "rate_limit": "Batas nilai",
     "edns_enable": "Aktifkan EDNS Klien Subnet",
     "edns_cs_desc": "Tambahkan opsi EDNS Client Subnet (ECS) ke permintaan upstream dan catat nilai yang dikirim oleh klien di log kueri.",
-    "edns_use_custom_ip": "Gunakan IP khusus untuk EDNS",
-    "edns_use_custom_ip_desc": "Izinkan untuk menggunakan IP kustom untuk EDNS",
     "rate_limit_desc": "Jumlah permintaan per detik yang diperbolehkan untuk satu klien. Atur ke 0 untuk tidak terbatas.",
-    "rate_limit_subnet_len_ipv4": "Panjang awalan subnet untuk alamat IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Panjang awalan subnet untuk alamat IPv4 yang digunakan untuk pembatasan kecepatan. Standarnya adalah 24",
-    "rate_limit_subnet_len_ipv4_error": "Panjang awalan subnet IPv4 harus antara 0 dan 32",
-    "rate_limit_subnet_len_ipv6": "Panjang awalan subnet untuk alamat IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Panjang awalan subnet untuk alamat IPv6 yang digunakan untuk pembatasan kecepatan. Standarnya adalah 56",
-    "rate_limit_subnet_len_ipv6_error": "Panjang awalan subnet IPv6 harus antara 0 dan 128",
-    "form_enter_rate_limit_subnet_len": "Masukkan panjang awalan subnet untuk pembatasan kecepatan",
-    "rate_limit_whitelist": "Daftar pembatasan tarif yang diizinkan",
-    "rate_limit_whitelist_desc": "Alamat IP dikecualikan dari pembatasan tarif",
-    "rate_limit_whitelist_placeholder": "Masukkan satu alamat IP per baris",
-    "blocking_ipv4_desc": "Alamat IP yang akan dikembalikan untuk permintaan A yang diblokir",
-    "blocking_ipv6_desc": "Alamat IP yang akan dikembalikan untuk permintaan AAAA yang diblokir",
-    "blocking_mode_default": "Standar: Tanggapi dengan alamat IP nol (0.0.0.0 untuk A; :: untuk AAAA) saat diblokir oleh aturan gaya Adblock; tanggapi dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh aturan /etc/hosts-style",
+    "blocking_ipv4_desc": "Alamat IP akan dikembalikan untuk permintaan A yang diblokir",
+    "blocking_ipv6_desc": "Alamat IP akan dipulihkan untuk permintaan AAAA yang diblokir",
+    "blocking_mode_default": "Default: Tanggapi dengan alamat IP nol (0.0.0.0 untuk A; :: untuk AAAA) saat diblokir oleh aturan gaya Adblock; tanggapi dengan alamat IP yang ditentukan dalam aturan ketika diblokir oleh aturan gaya host /etc/",
     "blocking_mode_refused": "DITOLAK: Respon dengan kode DITOLAK",
     "blocking_mode_nxdomain": "NXDOMAIN: Respon pakai kode NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Respon pakai alamat IP kosong (0.0.0.0 untuk A; :: untuk AAAA)",
@@ -332,7 +304,7 @@
     "theme_auto": "Auto",
     "theme_light": "Terang",
     "theme_dark": "Gelap",
-    "upstream_dns_client_desc": "Jika Anda biarkan kolom ini kosong, AdGuard Home akan menggunakan server yang dikonfigurasi di <0>pengaturan DNS</0>.",
+    "upstream_dns_client_desc": "Jika Anda biarkan bidang ini kosong, AdGuard Home akan memakai server yang dikonfigurasi di<0>Pengaturan DNS</0>.",
     "tracker_source": "Sumber pelacak",
     "source_label": "Sumber",
     "found_in_known_domain_db": "Ditemukan di database domain dikenal",
@@ -342,7 +314,7 @@
     "unknown_filter": "Penyaringan {{filterId}} tidak dikenal",
     "known_tracker": "Pelacak yang dikenal",
     "install_welcome_title": "Selamat datang di AdGuard Home!",
-    "install_welcome_desc": "AdGuard Home adalah server DNS pemblokir iklan dan pelacak di seluruh jaringan. Tujuannya untuk memungkinkan Anda mengendalikan seluruh jaringan dan semua perangkat Anda, dan tidak perlu menggunakan program sisi klien.",
+    "install_welcome_desc": "AdGuard Home adalah sebuah server DNS pemblokiran iklan dan pelacak di jaringan. Tujuannya adalah memungkinkan anda mengkontrol seluruh jaringan dan semua perangkat anda, dan ini tidak membutuhkan aplikasi tambahan di klien",
     "install_settings_title": "Antarmuka Halaman Admin",
     "install_settings_listen": "Antarmuka pengoperasian",
     "install_settings_port": "Port",
@@ -364,10 +336,10 @@
     "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": "Penyiapan ini secara otomatis mencakup semua perangkat yang terhubung ke router rumah Anda, tidak perlu mengkonfigurasi masing-masing perangkat 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 kolom yang memungkinkan dua atau tiga set angka, masing-masing dipecah menjadi empat kelompok dengan satu hingga tiga digit.",
+    "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.",
     "install_devices_router_list_3": "Masukkan alamat server AdGuard Home disana",
     "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.",
@@ -388,7 +360,7 @@
     "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.",
-    "install_devices_ios_list_4": "Di kolom DNS, masukkan alamat server AdGuard Home Anda.",
+    "install_devices_ios_list_4": "Di bidang DNS, masukkan alamat server AdGuard Home anda.",
     "get_started": "Mari mulai",
     "next": "Selanjutnya",
     "open_dashboard": "Buka Beranda",
@@ -424,10 +396,7 @@
     "encryption_issuer": "Penerbit",
     "encryption_hostnames": "Nama host",
     "encryption_reset": "Anda yakin ingin mengatur ulang pengaturan enkripsi?",
-    "encryption_warning": "Peringatan",
-    "encryption_plain_dns_enable": "Aktifkan DNS biasa",
-    "encryption_plain_dns_desc": "DNS biasa diaktifkan secara standar. Anda dapat menonaktifkannya untuk memaksa semua perangkat menggunakan DNS terenkripsi. Untuk melakukan ini, Anda harus mengaktifkan setidaknya satu protokol DNS terenkripsi",
-    "encryption_plain_dns_error": "Untuk menonaktifkan DNS biasa, aktifkan setidaknya satu protokol DNS terenkripsi",
+    "encryption_warning": "Perhatian",
     "topline_expiring_certificate": "Sertifikat SSL Anda hampir kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
     "topline_expired_certificate": "Sertifikat SSL Anda kedaluwarsa. Perbarui <0>Pengaturan enkripsi</0>.",
     "form_error_port_range": "Masukkan nomor port di kisaran 80-65535",
@@ -444,7 +413,7 @@
     "fix": "Perbaiki",
     "dns_providers": "Berikut adalah <0>daftar penyedia DNS yang dikenal</0> untuk dipilih.",
     "update_now": "Perbarui sekarang",
-    "update_failed": "Pembaruan otomatis gagal. Silakan <a>ikuti langkah-langkah berikut</a> untuk memperbarui secara manual.",
+    "update_failed": "Pembaruan otomatis gagal. Silahkan <a>ikuti petunjuk ini</a> untuk perbarui secara manual.",
     "manual_update": "Silakan <a>mengikuti langkah berikut</a> untuk memperbarui secara manual.",
     "processing_update": "Silahkan tunggu, AdGuard Home sedang diperbarui",
     "clients_title": "Klien yang gigih",
@@ -454,7 +423,7 @@
     "table_client": "Klien",
     "table_name": "Nama",
     "save_btn": "Simpan",
-    "client_add": "Tambahkan Klien",
+    "client_add": "Tambah Klien",
     "client_new": "Klien Baru",
     "client_edit": "Ubah Klien",
     "client_identifier": "Identifikasi",
@@ -464,10 +433,9 @@
     "form_enter_subnet_ip": "Masukkan alamat IP di subnet \"{{cidr}}\"",
     "form_enter_mac": "Masukkan MAC",
     "form_enter_id": "Masukkan pengenal",
-    "form_add_id": "Tambahkan pengenal",
+    "form_add_id": "Tambah pengenal",
     "form_client_name": "Masukkan nama klien",
     "name": "Nama",
-    "client_name": "Klien {{id}}",
     "client_global_settings": "Gunakan pengaturan global",
     "client_deleted": "Klien \"{{key}}\" berhasil dihapus",
     "client_added": "Klien \"{{key}}\" berhasil ditambahkan",
@@ -476,22 +444,21 @@
     "client_confirm_delete": "Apakah anda yakin ingin menghapus klien \"{{key}}\"?",
     "list_confirm_delete": "Anda yakin ingin menghapus daftar ini?",
     "auto_clients_title": "Klien (waktu berjalan)",
-    "auto_clients_desc": "Informasi tentang alamat IP perangkat yang menggunakan atau mungkin menggunakan AdGuard Home. Informasi ini dikumpulkan dari beberapa sumber, termasuk file host, reverse DNS, dll.",
+    "auto_clients_desc": "Perangkat yang tidak ada dalam daftar klien Persisten yang mungkin masih menggunakan AdGuard Home",
     "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, alamat IP, atau <a>ClientID</a>. Jika daftar ini memiliki entri, AdGuard Home hanya akan menerima permintaan dari klien ini.",
     "access_disallowed_title": "Klien yang tidak diizinkan",
-    "access_disallowed_desc": "Daftar CIDR, alamat IP, atau <a>ClientID</a>. Jika daftar ini memiliki entri, AdGuard Home akan membatalkan permintaan dari klien ini. Kolom ini diabaikan jika ada entri di daftar putih klien.",
+    "access_disallowed_desc": "Daftar CIDR, alamat IP, atau <a>ClientID</a>. Jika daftar ini memiliki entri, AdGuard Home akan membatalkan permintaan dari klien ini. Bidang ini diabaikan jika ada entri di klien yang diizinkan.",
     "access_blocked_title": "Domain yang diblokir",
     "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": "Versi baru AdGuard Home tersedia\n",
     "updates_version_equal": "AdGuard Home sudah tebaru",
     "check_updates_now": "Periksa pembaruan sekarang",
-    "version_request_error": "Pemeriksaan pembaruan gagal. Harap periksa koneksi internet anda.",
     "dns_privacy": "DNS Privasi",
-    "setup_dns_privacy_1": "<0>DNS melalui TLS:</0> Gunakan <1>{{address}}</1> string.",
+    "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
     "setup_dns_privacy_3": "<0>Berikut daftar perangkat lunak yang dapat Anda gunakan.</0>",
     "setup_dns_privacy_4": "Di perangkat iOS 14 atau macOS Big Sur, Anda dapat mengunduh file '.mobileconfig' khusus yang menambahkan server <highlight>DNS-over-HTTPS</highlight> atau <highlight>DNS-over-TLS</highlight> ke pengaturan DNS.",
@@ -511,7 +478,7 @@
     "rewrite_added": "DNS rewrite untuk \"{{key}}\" berhasil ditambahkan",
     "rewrite_deleted": "DNS rewrite untuk \"{{key}}\" berhasil dihapus",
     "rewrite_updated": "Penulisan ulang DNS berhasil diperbarui",
-    "rewrite_add": "Tambahkan penulisan ulang DNS",
+    "rewrite_add": "Tambah DNS rewrite",
     "rewrite_edit": "Edit penulisan ulang DNS",
     "rewrite_not_found": "Tidak ada DNS rewrite ditemukan",
     "rewrite_confirm_delete": "Apakah anda yakin ingin menghapus DNS rewrite untuk \"{{key}}\"?",
@@ -548,7 +515,7 @@
     "domain": "Domain",
     "ecs": "ECS",
     "punycode": "Kode kecil",
-    "answer": "Jawaban",
+    "answer": "Jawab",
     "filter_added_successfully": "Filter telah berhasil ditambahkan",
     "filter_removed_successfully": "Daftar ini telah sukses dihapus",
     "filter_updated": "Daftar telah sukses diperbarui",
@@ -560,8 +527,6 @@
     "statistics_retention_confirm": "Apakah Anda yakin ingin mengubah retensi statistik? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
     "statistics_cleared": "Statistik berhasil dihapus",
     "statistics_enable": "Aktifkan statistik",
-    "ignore_domains": "Domain yang diabaikan (dipisahkan oleh baris baru)",
-    "ignore_domains_title": "Domain yang diabaikan",
     "ignore_domains_desc_stats": "Kueri yang cocok dengan aturan ini tidak ditulis ke statistik",
     "ignore_domains_desc_query": "Kueri yang cocok dengan aturan ini tidak ditulis ke log kueri",
     "interval_hours": "{{count}} jam",
@@ -600,10 +565,10 @@
     "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.",
-    "autofix_warning_list": "Ini akan melakukan tugas berikut: <0>Nonaktifkan sistem DNSStubListener</0> <0>Atur alamat server DNS ke 127.0.0.1</0> <0>Ganti target tautan simbolis /etc/resolv.conf dengan /run/systemd/resolve/resolv.conf</0> <0>Hentikan DNSStubListener (muat ulang layanan sistemd-resolved)</0>",
+    "autofix_warning_list": "Ini akan melakukan tugas berikut: <0>Nonaktifkan sistem DNSStubListener</0> <0> Atur alamat server DNS ke 127.0.0.1</0> <0>Ganti target tautan simbolis /etc/resolv.conf pakai /run/systemd/resolve/resolv.conf</0> <0>Hentikan DNSStubListener (muat ulang layanan sistemd-resolve service)</0>",
     "autofix_warning_result": "Hasilnya, semua permintaan DNS dari sistem anda akan diproses oleh AdGuardHome secara standar.",
     "tags_title": "Tag",
-    "tags_desc": "Anda dapat memilih tag yang sesuai dengan klien. Sertakan tag dalam aturan pemfilteran untuk menerapkannya dengan lebih akurat. <0>Pelajari lebih lanjut</0>.",
+    "tags_desc": "Anda dapat memilih tag sesuai dengan klien. Tag dapat dimasukkan dalam aturan pemfilteran dan memungkinkan Anda untuk menerapkannya lebih akurat. <0>Pelajari lebih</0>.",
     "form_select_tags": "Pilih tag klien",
     "check_title": "Periksa penyaringan",
     "check_desc": "Periksa apakah nama host telah tersaring.",
@@ -611,7 +576,7 @@
     "form_enter_host": "Masukkan nama host",
     "filtered_custom_rules": "Tersaring oleh aturan penyaring Buatan",
     "choose_from_list": "Pilih dari daftar",
-    "add_custom_list": "Tambahkan daftar kustom",
+    "add_custom_list": "Tambah daftar buatan",
     "host_whitelisted": "Host didaftar putihkan",
     "check_ip": "Alamat IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
@@ -621,8 +586,8 @@
     "check_not_found": "Tidak di temukan di daftar penyaringan anda",
     "client_confirm_block": "Apa anda yakin ingin mem-blokir klien ini \"{{ip}}\"?",
     "client_confirm_unblock": "Apa anda yakin ingin meng-unblock klien ini \"{{ip}}\"?",
-    "client_blocked": "Klien \"{{ip}}\" berhasil diblokir",
-    "client_unblocked": "Klien \"{{ip}}\" berhasil membuka blokir",
+    "client_blocked": "Klien \"{{ip}}\" sukses di blokir",
+    "client_unblocked": "Klien \"{{ip}}\" sukses di unblock",
     "static_ip": "Alamat IP statis",
     "static_ip_desc": "AdGuard Home adalah server jadi perlu alamat IP statis agar berfungsi dengan benar. Jika tidak, pada titik tertentu, router Anda dapat menetapkan alamat IP yang berbeda untuk perangkat ini.",
     "set_static_ip": "Atur alamat IP statik",
@@ -640,8 +605,8 @@
     "show_whitelisted_responses": "Dalam Daftar Putih",
     "show_processed_responses": "Terproses",
     "blocked_safebrowsing": "Diblokir oleh Penjelajahan Aman",
-    "blocked_adult_websites": "Diblokir oleh Kontrol Orang Tua",
-    "blocked_threats": "Ancaman terblokir",
+    "blocked_adult_websites": "Diblok oleh Kontrol Orang tua",
+    "blocked_threats": "Blokir Ancaman",
     "allowed": "Dibolehkan",
     "filtered": "Tersaring",
     "rewritten": "Tulis ulang",
@@ -655,7 +620,7 @@
     "enter_cache_size": "Masukkan ukuran cache (bytes)",
     "enter_cache_ttl_min_override": "Masukkan TTL minimum (detik)",
     "enter_cache_ttl_max_override": "Masukkan TTL maksimum (detik)",
-    "cache_ttl_min_override_desc": "Perpanjang nilai waktu untuk hidup (detik) yang diterima dari server hulu saat menyimpan respons DNS.",
+    "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",
@@ -679,36 +644,13 @@
     "parental_control": "Kontrol Orang Tua",
     "safe_browsing": "Penjelajahan Aman",
     "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>",
-    "form_error_password_length": "Kata sandi harus terdiri dari {{min}} hingga {{max}}",
+    "form_error_password_length": "Kata sandi harus minimal {{value}} karakter",
     "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
     "confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
-    "cache_cleared": "Cache DNS berhasil dihapus",
+    "cache_cleared": "Cache DNS berhasil dibersihkan",
     "clear_cache": "Hapus cache",
-    "make_static": "Jadikan statis",
-    "theme_auto_desc": "Otomatis (berdasarkan skema warna perangkat anda)",
-    "theme_dark_desc": "Tema gelap",
     "theme_light_desc": "Tema terang",
-    "disable_for_seconds": "Untuk {{count}} detik",
-    "disable_for_seconds_plural": "Untuk {{count}} detik",
-    "disable_for_minutes": "Untuk {{count}} menit",
-    "disable_for_minutes_plural": "Untuk {{count}} menit",
-    "disable_for_hours": "Untuk {{count}} jam",
-    "disable_for_hours_plural": "Untuk {{count}} jam",
-    "disable_until_tomorrow": "Sampai besok",
-    "disable_notify_for_seconds": "Hentikan perlindungan selama {{count}} detik",
-    "disable_notify_for_seconds_plural": "Hentikan perlindungan selama {{count}} detik",
-    "disable_notify_for_minutes": "Hentikan perlindungan selama {{count}} menit",
-    "disable_notify_for_minutes_plural": "Hentikan perlindungan selama {{count}} menit",
-    "disable_notify_for_hours": "Hentikan perlindungan selama {{count}} jam",
-    "disable_notify_for_hours_plural": "Hentikan perlindungan selama {{count}} jam",
-    "disable_notify_until_tomorrow": "Hentikan perlindungan sampai besok",
-    "enable_protection_timer": "Perlindungan akan diaktifkan dalam {{time}}",
-    "custom_retention_input": "Masukkan retensi dalam hitungan jam",
-    "custom_rotation_input": "Masukkan rotasi dalam hitungan jam",
     "protection_section_label": "Perlindungan",
-    "log_and_stats_section_label": "Log kueri dan statistik",
-    "ignore_query_log": "Abaikan klien ini di log kueri",
-    "ignore_statistics": "Abaikan klien ini di statistik",
     "schedule_services": "Menjeda pemblokiran layanan",
     "schedule_services_desc": "Mengonfigurasi jadwal jeda filter pemblokiran layanan",
     "schedule_services_desc_client": "Mengonfigurasi jadwal jeda filter pemblokiran layanan untuk klien ini",
@@ -723,25 +665,11 @@
     "schedule_new": "Jadwal baru",
     "schedule_edit": "Edit jadwal",
     "schedule_save": "Simpan jadwal",
-    "schedule_add": "Tambahkan jadwal",
-    "schedule_remove": "Hapus jadwal",
-    "schedule_from": "Dari",
-    "schedule_to": "Hingga",
-    "sunday": "Minggu",
-    "monday": "Senin",
-    "tuesday": "Selasa",
-    "wednesday": "Rabu",
-    "thursday": "Kamis",
-    "friday": "Jumat",
-    "saturday": "Sabtu",
     "sunday_short": "Ming",
     "monday_short": "Sen",
     "tuesday_short": "Sel",
     "wednesday_short": "Rab",
     "thursday_short": "Kam",
     "friday_short": "Jum",
-    "saturday_short": "Sab",
-    "upstream_dns_cache_configuration": "Konfigurasi cache DNS upstream",
-    "enable_upstream_dns_cache": "Aktifkan cache DNS untuk konfigurasi hulu kustom pada klien ini",
-    "dns_cache_size": "Ukuran cache DNS, dalam byte"
+    "saturday_short": "Sab"
 }

client/src/__locales/it.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Impostazioni client",
     "example_upstream_reserved": "un upstream <0>per specifici domini</0>;",
-    "example_multiple_upstreams_reserved": "upstream multipli <0>per domini specifici</0>;",
     "example_upstream_comment": "un commento.",
     "upstream_parallel": "Utilizza richieste parallele per accelerare la risoluzione interrogando simultaneamente tutti i server upstream.",
     "parallel_requests": "Richieste parallele",
@@ -74,9 +73,7 @@
     "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_lease_updated": "Locazione statica \"{{key}}\" aggiornata con successo",
     "dhcp_new_static_lease": "Nuovo lease statico",
-    "dhcp_edit_static_lease": "Modifica locazione statica",
     "dhcp_static_leases_not_found": "Non è stato trovato nessun leases statico DHCP",
     "dhcp_add_static_lease": "Aggiungi lease statico",
     "dhcp_reset_leases": "Reimposta tutti i temporanei",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Malware/phishing bloccati",
     "stats_adult": "Siti per adulti bloccati",
     "stats_query_domain": "Domini maggiormente richiesti",
-    "for_last_hours": "per l'ultima {{count}} ora",
-    "for_last_hours_plural": "per le ultime {{count}} ore",
+    "for_last_24_hours": "nelle ultime 24 ore",
     "for_last_days": "per gli ultimi {{count}} giorni",
     "for_last_days_plural": "per gli ultimi {{count}} giorni",
     "stats_disabled": "Le statistiche sono state disattivate. Puoi attivarle dalla <0>pagina delle impostazioni</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nessun dato upstream trovato",
     "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_hours": "Numero di richieste DNS processate nell'ultima {{count}} ora",
-    "number_of_dns_query_hours_plural": "Numero di richieste DNS processate nelle ultime {{count}} ore",
+    "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 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",
     "number_of_dns_query_to_safe_search": "Numero di richieste DNS dai motori di ricerca per i quali la Ricerca Sicura è stata forzata",
     "average_processing_time": "Tempo di elaborazione medio",
-    "average_upstream_response_time": "Tempo medio di risposta upstream",
-    "response_time": "Tempo di risposta",
+    "processing_time": "Tempo di elaborazione",
     "average_processing_time_hint": "Tempo medio in millisecondi per elaborare una richiesta DNS",
     "block_domain_use_filters_and_hosts": "Blocca domini utilizzando filtri e file hosts",
     "filters_block_toggle_hint": "Puoi impostare le regole di blocco nelle impostazioni dei <a>Filtri</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Sezione {{section}}: riga {{line}}: non può essere usata, controlla se l'hai scritta correttamente",
     "dns_test_warning_toast": "Upstream \"{{key}}\" non risponde alle richieste di test e potrebbe non funzionare correttamente",
     "unblock": "Sblocca",
     "block": "Blocca",
@@ -244,7 +237,6 @@
     "allow_this_client": "Consenti questo client",
     "block_for_this_client_only": "Blocca solo per questo client",
     "unblock_for_this_client_only": "Sblocca solo per questo client",
-    "add_persistent_client": "Aggiungi come client persistente",
     "time_table_header": "Ora",
     "date": "Data",
     "domain_name_table_header": "Nome dominio",
@@ -291,9 +283,6 @@
     "custom_ip": "IP personalizzato",
     "blocking_ipv4": "Blocca IPv4",
     "blocking_ipv6": "Blocca IPv6",
-    "blocked_response_ttl": "Risposta TTL bloccata",
-    "blocked_response_ttl_desc": "Specifica per quanti secondi i client devono tenere nella cache una risposta filtrata",
-    "form_enter_blocked_response_ttl": "Inserisci tempo di vita (TTL) della risposta bloccata (secondi)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS su HTTPS",
     "dns_over_tls": "DNS su TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Usa IP personalizzato per EDNS",
     "edns_use_custom_ip_desc": "Consentire l'uso di un IP personalizzato per EDNS",
     "rate_limit_desc": "Il numero di richieste al secondo consentite da un singolo client. Impostare questo valore a 0 rimuove le limitazioni.",
-    "rate_limit_subnet_len_ipv4": "Lunghezza prefisso di sottorete per indirizzi IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Lunghezza prefisso sottorete per indirizzi IPv4 usati per la limitazione della velocità. Valore predefinito 24",
-    "rate_limit_subnet_len_ipv4_error": "La lunghezza del prefisso di sottorete IPv4 deve essere compresa tra 0 e 32",
-    "rate_limit_subnet_len_ipv6": "Lunghezza prefisso di sottorete per indirizzi IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Lunghezza prefisso di sottorete per indirizzi IPv6 usati per la limitazione della velocità. Valore predefinito 56",
-    "rate_limit_subnet_len_ipv6_error": "La lunghezza del prefisso di sottorete IPv6 deve essere compresa tra 0 e 128",
-    "form_enter_rate_limit_subnet_len": "Inserisci lunghezza prefisso di sottorete per limitazione velocità",
-    "rate_limit_whitelist": "Lista consentita per limitazione velocità",
-    "rate_limit_whitelist_desc": "Indirizzi IP esclusi dalla limitazione della velocità",
-    "rate_limit_whitelist_placeholder": "Inserisci un indirizzo IP per riga",
     "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",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Nomi host",
     "encryption_reset": "Sei sicuro di voler ripristinare le impostazioni di crittografia?",
     "encryption_warning": "Attenzione",
-    "encryption_plain_dns_enable": "Abilita DNS semplice",
-    "encryption_plain_dns_desc": "Il DNS semplice è abilitato per impostazione predefinita. Puoi disabilitarlo per forzare tutti i dispositivi a usare DNS crittografati. Per fare ciò è necessario abilitare almeno un protocollo DNS crittografato",
-    "encryption_plain_dns_error": "Per disabilitare il DNS semplice, abilitare almeno un protocollo DNS crittografato",
     "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",
@@ -467,7 +443,6 @@
     "form_add_id": "Aggiungi identificatore",
     "form_client_name": "Inserisci nome client",
     "name": "Nome",
-    "client_name": "Client {{id}}",
     "client_global_settings": "Utilizza le impostazioni globali",
     "client_deleted": "Client \"{{key}}\" eliminato correttamente",
     "client_added": "Client \"{{key}}\" aggiunto correttamente",
@@ -562,8 +537,8 @@
     "statistics_enable": "Attiva statistiche",
     "ignore_domains": "Domini ignorati (separati da nuova riga)",
     "ignore_domains_title": "Domini ignorati",
-    "ignore_domains_desc_stats": "Le richieste che corrispondono a queste regole non vengono scritte nelle statistiche",
-    "ignore_domains_desc_query": "Le richieste che corrispondono a queste regole non vengono scritte nel registro delle richieste",
+    "ignore_domains_desc_stats": "Le richieste per questi domini non vengono scritte nelle statistiche",
+    "ignore_domains_desc_query": "Le richieste per questi domini non vengono scritte nel registro delle richieste",
     "interval_hours": "{{count}} ora",
     "interval_hours_plural": "{{count}} ore",
     "filters_configuration": "Configurazione filtri",
@@ -678,8 +653,8 @@
     "use_saved_key": "Utilizza la chiave salvata in precedenza",
     "parental_control": "Controllo Parentale",
     "safe_browsing": "Navigazione Sicura",
-    "served_from_cache_label": "Servito dalla cache",
-    "form_error_password_length": "La password deve contenere da {{min}} a {{max}} caratteri",
+    "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
+    "form_error_password_length": "La password deve contenere almeno {{value}} caratteri",
     "anonymizer_notification": "<0>Attenzione:</0> L'anonimizzazione dell'IP è abilitata. Puoi disabilitarla in <1>Impostazioni generali</1>.",
     "confirm_dns_cache_clear": "Sei sicuro di voler cancellare la cache DNS?",
     "cache_cleared": "Cache DNS è stata cancellata correttamente",
@@ -740,8 +715,5 @@
     "wednesday_short": "Mer",
     "thursday_short": "Gio",
     "friday_short": "Ven",
-    "saturday_short": "Sab",
-    "upstream_dns_cache_configuration": "Configurazione cache DNS upstream",
-    "enable_upstream_dns_cache": "Abilita cache DNS per la configurazione upstream personalizzata del client",
-    "dns_cache_size": "Dimensioni cache DNS (in byte)"
+    "saturday_short": "Sab"
 }

client/src/__locales/ja.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "クライアント設定",
     "example_upstream_reserved": "<0>特定のドメイン</0>に対してDNSアップストリームを指定できます。",
-    "example_multiple_upstreams_reserved": "<0>特定ドメイン</0>のための複数のアップストリームサーバー;",
     "example_upstream_comment": "コメントを追加できます。",
     "upstream_parallel": "並列リクエストを使用する（同時にすべてのアップストリームサーバーに処理要求することで解決スピードが向上）",
     "parallel_requests": "並列リクエスト",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "お使いのシステムは、インターフェース<0>{{interfaceName}}</0>用に動的IPアドレス構成を使用しています。DHCPサーバを使用するには、静的IPアドレスで設定する必要があります。あなたの現在のIPアドレスは<0>{{ipAddress}}</0>です。「DHCPサーバを有効にする」ボタンを押すと、AdGuard Homeは自動的にこのIPアドレスを静的IPアドレスとして設定します。",
     "dhcp_lease_added": "静的リース \"{{key}}\" の追加が完了しました。",
     "dhcp_lease_deleted": "静的リース \"{{key}}\" の削除が完了しました。",
-    "dhcp_lease_updated": "静的リース \"{{key}}\" の更新に成功しました。",
     "dhcp_new_static_lease": "新規静的割り当て",
-    "dhcp_edit_static_lease": "静的リースを編集",
     "dhcp_static_leases_not_found": "DHCP静的割り当てはありません",
     "dhcp_add_static_lease": "静的割り当てを追加する",
     "dhcp_reset_leases": "すべてのリースをリセットする",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "ブロックされたマルウェア／フィッシング",
     "stats_adult": "ブロックされたアダルトウェブサイト",
     "stats_query_domain": "最も問合せされたドメイン",
-    "for_last_hours": "過去{{count}}時間",
-    "for_last_hours_plural": "過去{{count}}時間",
+    "for_last_24_hours": "過去24時間以内",
     "for_last_days": "過去{{count}}日間以内",
     "for_last_days_plural": "過去{{count}}日間以内",
     "stats_disabled": "統計は無効化されています。<0>設定ページ</0>でオンにすることができます。",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "アップストリームのデータが見つかりません",
     "number_of_dns_query_days": "過去{{count}}日間に処理されたDNSクエリの数",
     "number_of_dns_query_days_plural": "過去{{count}}日間に処理されたDNSクエリの数",
-    "number_of_dns_query_hours": "過去{{count}}時間に処理されたDNSクエリの数",
-    "number_of_dns_query_hours_plural": "過去{{count}}時間に処理されたDNSクエリの数",
+    "number_of_dns_query_24_hours": "過去24時間に処理されたDNSクエリの数",
     "number_of_dns_query_blocked_24_hours": "広告ブロックフィルタとhostsブロックリストによってブロックされたDNSリクエストの数",
     "number_of_dns_query_blocked_24_hours_by_sec": "AdGuardブラウジングセキュリティモジュールによってブロックされたDNSリクエストの数",
     "number_of_dns_query_blocked_24_hours_adult": "ブロックされたアダルトウェブサイトの数",
     "enforced_save_search": "強制されたセーフサーチ",
     "number_of_dns_query_to_safe_search": "セーフサーチが強制適用された検索エンジンへのDNSリクエストの数",
     "average_processing_time": "平均処理時間",
-    "average_upstream_response_time": "アップストリームの平均応答時間",
-    "response_time": "応答時間",
+    "processing_time": "処理時間",
     "average_processing_time_hint": "DNSリクエストの処理にかかる平均時間（ミリ秒単位）",
     "block_domain_use_filters_and_hosts": "フィルタとhostsファイルを使用してドメインをブロックする",
     "filters_block_toggle_hint": "<a>フィルタ</a>の設定でブロックするルールを設定することができます。",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "アップストリームサーバーを保存しました。",
     "dns_test_ok_toast": "指定されたDNSサーバは正しく動作しています",
     "dns_test_not_ok_toast": "サーバ \"{{key}}\": 使用できませんでした。正しく入力されているかどうかを確認してください",
-    "dns_test_parsing_error_toast": "セクション {{section}}: 行 {{line}}: を使用できませんでした。正しく記述されているか確認してください",
     "dns_test_warning_toast": "アップストリーム\"{{key}}\"はテストリクエストに応答せず、正しく動作しない可能性があります。",
     "unblock": "ブロック解除",
     "block": "ブロック",
@@ -244,7 +237,6 @@
     "allow_this_client": "このクライアントを許可する",
     "block_for_this_client_only": "このクライアントに対してのみブロックする",
     "unblock_for_this_client_only": "このクライアントに対してのみブロックを解除する",
-    "add_persistent_client": "永続クライアントとして追加する",
     "time_table_header": "時刻",
     "date": "購入日時",
     "domain_name_table_header": "ドメイン名",
@@ -291,9 +283,6 @@
     "custom_ip": "カスタムIP",
     "blocking_ipv4": "ブロック中のIPv4",
     "blocking_ipv6": "ブロック中のIPv6",
-    "blocked_response_ttl": "Blocked Response TTL（ブロック済み応答のTTL）",
-    "blocked_response_ttl_desc": "フィルタリングされた応答をクライアントがキャッシュしておく時間（秒）を指定します。",
-    "form_enter_blocked_response_ttl": "ブロック済み応答のTTL（秒単位）を入力してください",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "EDNSにカスタムIPを使用する",
     "edns_use_custom_ip_desc": "EDNS に対してカスタム IP の使用を許可します。",
     "rate_limit_desc": "一つのクライアントに対して許可される1秒あたりのリクエスト数（「0」に設定すると、制限なしになります）",
-    "rate_limit_subnet_len_ipv4": "IPv4 アドレスのサブネットプレフィックス長",
-    "rate_limit_subnet_len_ipv4_desc": "rate limiting（レート制限）に使用される IPv4 アドレスのサブネットプレフィックス長です。デフォルト値は 24 です。",
-    "rate_limit_subnet_len_ipv4_error": "IPv4 サブネットプレフィックス長は0〜32の範囲内である必要があります。",
-    "rate_limit_subnet_len_ipv6": "IPv6 アドレスのサブネットプレフィックス長",
-    "rate_limit_subnet_len_ipv6_desc": "rate limiting（レート制限）に使用される IPv6 アドレスのサブネットプレフィックス長です。デフォルト値は 56 です。",
-    "rate_limit_subnet_len_ipv6_error": "IPv6 サブネットのプレフィックス長は0〜128の範囲内である必要があります。",
-    "form_enter_rate_limit_subnet_len": "rate limiting（レート制限）のためのサブネットプレフィックス長を入力してください",
-    "rate_limit_whitelist": "rate limiting（レート制限）の許可リスト",
-    "rate_limit_whitelist_desc": "rate limiting（レート制限）の対象から外すIPアドレスを指定できます。",
-    "rate_limit_whitelist_placeholder": "IPアドレスを1行に1つずづ入力してください。",
     "blocking_ipv4_desc": "ブロックされたAリクエストに対して応答されるIPアドレス",
     "blocking_ipv6_desc": "ブロックされたAAAAリクエストに対して応答されるIPアドレス",
     "blocking_mode_default": "デフォルト：Adblock系ルールによってブロックされると、ゼロIPアドレス（Aに対しては「0.0.0.0」、AAAAに対しては「::」）で応答します。/etc/hosts系ルールによってブロックされると、ルールにて指定されているIPアドレスで応答します。",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "ホスト名",
     "encryption_reset": "暗号化設定をリセットして良いですか？",
     "encryption_warning": "警告",
-    "encryption_plain_dns_enable": "プレーンDNSを有効にする",
-    "encryption_plain_dns_desc": "プレーンDNSはデフォルトで有効になっています。無効にして、すべてのデバイスに暗号化された DNS の使用を強制適用できます。これを行うには、少なくとも 1 つの暗号化されたDNSプロトコルを有効にする必要があります。",
-    "encryption_plain_dns_error": "プレーンDNSを無効にするには、暗号化DNSプロトコルを少なくとも 1 つ有効にしてください",
     "topline_expiring_certificate": "SSL証明書は期限切れになります。<0>暗号化設定</0>を更新します。",
     "topline_expired_certificate": "SSL証明書は期限切れです。<0>暗号化設定</0>を更新します。",
     "form_error_port_range": "80〜65535 の範囲内でポート番号を入力してください",
@@ -467,7 +443,6 @@
     "form_add_id": "識別子を追加する",
     "form_client_name": "クライアント名を入力してください",
     "name": "名前",
-    "client_name": "クライアント {{id}}",
     "client_global_settings": "グローバル設定を使用する",
     "client_deleted": "クライアント \"{{key}}\" の削除に成功しました",
     "client_added": "クライアント \"{{key}}\" の追加に成功しました",
@@ -678,8 +653,8 @@
     "use_saved_key": "以前に保存したキーを使用する",
     "parental_control": "ペアレンタルコントロール",
     "safe_browsing": "セーフブラウジング",
-    "served_from_cache_label": "キャッシュからの配信:",
-    "form_error_password_length": "パスワードの長さは{{min}}〜{{max}}文字にしてください。",
+    "served_from_cache": "{{value}} <i>(キャッシュから応答)</i>",
+    "form_error_password_length": "パスワードは{{value}}文字以上にしてください",
     "anonymizer_notification": "【<0>注意</0>】IPの匿名化が有効になっています。 <1>一般設定</1>で無効にできます。",
     "confirm_dns_cache_clear": "DNS キャッシュをクリアしてもよろしいですか？",
     "cache_cleared": "DNSキャッシュのクリア完了です。",
@@ -740,8 +715,5 @@
     "wednesday_short": "水",
     "thursday_short": "木",
     "friday_short": "金",
-    "saturday_short": "土",
-    "upstream_dns_cache_configuration": "Upstream DNS cache configuration（アップストリームDNSキャッシュの構成）",
-    "enable_upstream_dns_cache": "このクライアントのカスタムアップストリーム構成に対してDNSキャッシュを有効にする",
-    "dns_cache_size": "DNSキャッシュサイズ（バイト単位）"
+    "saturday_short": "土"
 }

client/src/__locales/ko.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "클라이언트 설정",
     "example_upstream_reserved": "<0>특정 도메인에 대한</0> 업스트림;",
-    "example_multiple_upstreams_reserved": "<0>특정 도메인</0>에 대한 여러 업스트림",
     "example_upstream_comment": "댓글.",
     "upstream_parallel": "쿼리 처리 속도를 높이려면 모든 업스트림 서버에서 동시에 병렬 쿼리를 사용해주세요.",
     "parallel_requests": "병렬 처리 요청",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "시스템은 <0>{{interfaceName}}</0> 인터페이스에 동적 IP 주소를 사용합니다. DHCP 서버를 사용하려면 고정 IP 주소를 설정해야 합니다. 현재 IP 주소는 <0>{{ipAddress}}</0>입니다. 'DHCP 서버 활성화' 버튼을 누르면 AdGuard Home이 이 IP 주소를 고정 IP 주소로 자동 설정합니다.",
     "dhcp_lease_added": "'{{key}}' 고정 임대 정상적으로 추가되었습니다",
     "dhcp_lease_deleted": "'{{key}}' 고정 임대 정상적으로 삭제되었습니다",
-    "dhcp_lease_updated": "'{{key}}' 고정 임대 정상적으로 업데이트되었습니다.",
     "dhcp_new_static_lease": "새 고정 임대",
-    "dhcp_edit_static_lease": "고정 임대 수정",
     "dhcp_static_leases_not_found": "DHCP 고정 임대를 찾을 수 없음",
     "dhcp_add_static_lease": "고정 임대 추가",
     "dhcp_reset_leases": "모든 임대 초기화",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "차단된 멀웨어/피싱",
     "stats_adult": "차단된 성인 웹사이트",
     "stats_query_domain": "쿼리 도메인",
-    "for_last_hours": "마지막 {{count}} 시간",
-    "for_last_hours_plural": "마지막 {{count}} 시간의 기록",
+    "for_last_24_hours": "지난 24시간 동안",
     "for_last_days": "마지막 {{count}} 일",
     "for_last_days_plural": "마지막 {{count}} 일의 기록",
     "stats_disabled": "통계 기능이 꺼졌습니다. <0>설정 페이지</0>에서 켤 수 있습니다.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "업스트림 데이터 없음",
     "number_of_dns_query_days": "최근 {{count}}일 동안 처리된 DNS 쿼리의 수",
     "number_of_dns_query_days_plural": "최근 {{count}}일 동안 처리된 DNS 쿼리의 수",
-    "number_of_dns_query_hours": "최근 {{count}}시간 동안 처리된 DNS 쿼리의 수",
-    "number_of_dns_query_hours_plural": "최근 {{count}}시간 동안 처리된 DNS 쿼리의 수",
+    "number_of_dns_query_24_hours": "최근 24시간 동안 처리된 DNS 쿼리의 수",
     "number_of_dns_query_blocked_24_hours": "광고 차단 필터 및 호스트 차단 목록에 의해 차단된 DNS 요청 수",
     "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard 브라우징 보안 모듈에 의해 차단된 DNS 요청 수",
     "number_of_dns_query_blocked_24_hours_adult": "차단된 성인 웹 사이트의 수",
     "enforced_save_search": "세이프서치 강제",
     "number_of_dns_query_to_safe_search": "세이프서치가 적용된 검색 엔진에 대해 DNS 요청 수",
     "average_processing_time": "평균처리 시간",
-    "average_upstream_response_time": "평균 업스트림 응답 시간",
-    "response_time": "응답 시간",
+    "processing_time": "처리 시간",
     "average_processing_time_hint": "DNS 요청 처리시 평균 시간(밀리초)",
     "block_domain_use_filters_and_hosts": "필터 및 호스트 파일을 사용하여 도메인 차단",
     "filters_block_toggle_hint": "차단규칙<a>필터</a>을 설정할 수 있습니다.",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "업스트림 서버가 성공적으로 저장되었습니다",
     "dns_test_ok_toast": "지정된 DNS 서버가 올바르게 작동하고 있습니다.",
     "dns_test_not_ok_toast": "서버 '{{key}}': 사용할 수 없습니다, 제대로 작성했는지 확인하세요",
-    "dns_test_parsing_error_toast": "섹션 {{section}}: 줄 {{line}}: 사용할 수 없으며, 올바르게 작성했는지 확인하세요.",
     "dns_test_warning_toast": "업스트림 '{{key}}'이(가) 테스트 요청에 응답하지 않으며 제대로 작동하지 않을 수 있습니다",
     "unblock": "차단 해제",
     "block": "차단",
@@ -244,7 +237,6 @@
     "allow_this_client": "클라이언트 허용",
     "block_for_this_client_only": "이 클라이언트에 대해서만 차단",
     "unblock_for_this_client_only": "이 클라이언트에 대해서만 차단 해제",
-    "add_persistent_client": "저장된 클라이언트에 추가",
     "time_table_header": "시간",
     "date": "날짜",
     "domain_name_table_header": "도메인명",
@@ -291,9 +283,6 @@
     "custom_ip": "사용자 지정 IP",
     "blocking_ipv4": "IPv4 차단",
     "blocking_ipv6": "IPv6 차단",
-    "blocked_response_ttl": "차단된 TTL 응답",
-    "blocked_response_ttl_desc": "클라이언트가 필터링된 응답을 캐시해야 하는 시간(초)을 지정합니다.",
-    "form_enter_blocked_response_ttl": "차단된 응답 TTL(초)을 입력하세요.",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "EDNS에 사용자 지정 IP 사용",
     "edns_use_custom_ip_desc": "EDNS에 사용자 지정 IP 사용하도록 허용합니다.",
     "rate_limit_desc": "단일 클라이언트에서 허용 가능한 초 당 요청 생성 숫자 (0: 무제한)",
-    "rate_limit_subnet_len_ipv4": "IPv4 주소의 서브넷 접두사 길이",
-    "rate_limit_subnet_len_ipv4_desc": "속도 제한에 사용되는 IPv4 주소의 서브넷 접두사 길이입니다. 기본값은 24입니다.",
-    "rate_limit_subnet_len_ipv4_error": "IPv4 서브넷 접두사 길이는 0에서 32 사이여야 합니다.",
-    "rate_limit_subnet_len_ipv6": "IPv6 주소의 서브넷 접두사 길이",
-    "rate_limit_subnet_len_ipv6_desc": "속도 제한에 사용되는 IPv6 주소의 서브넷 접두사 길이입니다. 기본값은 56입니다.",
-    "rate_limit_subnet_len_ipv6_error": "IPv6 서브넷 접두사 길이는 0에서 128 사이여야 합니다.",
-    "form_enter_rate_limit_subnet_len": "속도 제한을 위한 서브넷 접두사 길이를 입력하세요",
-    "rate_limit_whitelist": "속도 제한 허용 목록",
-    "rate_limit_whitelist_desc": "속도 제한에서 제외되는 IP 주소",
-    "rate_limit_whitelist_placeholder": "한 줄에 하나씩 IP 주소를 입력하세요.",
     "blocking_ipv4_desc": "차단된 A 요청에 대해서 반환할 IP 주소",
     "blocking_ipv6_desc": "차단된 AAAA 요청에 대해서 반환할 IP 주소",
     "blocking_mode_default": "기본: Adblock 스타일 규칙에 의해 차단되면 제로 IP 주소(A는 0.0.0.0; AAAA는 ::)로 응답합니다; /etc/hosts 스타일 규칙에 의해 차단되면 규칙에 정의된 IP 주소로 응답합니다",
@@ -424,10 +403,7 @@
     "encryption_issuer": "발행자",
     "encryption_hostnames": "호스트 이름",
     "encryption_reset": "암호화 설정을 재설정하시겠습니까?",
-    "encryption_warning": "주의",
-    "encryption_plain_dns_enable": "평문 DNS 활성화",
-    "encryption_plain_dns_desc": "평문 DNS가 기본으로 설정되어 있습니다. 비활성화해서 모든 기기가 암호화된 DNS를 사용하도록 할 수 있습니다. 그러려면 암호화된 DNS 프로토콜을 하나 이상 활성화해야 합니다.",
-    "encryption_plain_dns_error": "평문 DNS를 비활성화하려면, 암호화된 DNS 프로토콜을 하나 이상 활성화하세요",
+    "encryption_warning": "경고",
     "topline_expiring_certificate": "SSL 인증서가 곧 만료됩니다. 업데이트<0> 암호화 설정</0>.",
     "topline_expired_certificate": "SSL 인증서가 만료되었습니다. 업데이트<0> 암호화 설정</0>.",
     "form_error_port_range": "80-65535 범위의 포트 번호를 입력하세요",
@@ -467,7 +443,6 @@
     "form_add_id": "식별자 추가",
     "form_client_name": "클라이언트 이름 입력",
     "name": "이름",
-    "client_name": "클라이언트 {{id}}",
     "client_global_settings": "글로벌 설정 사용",
     "client_deleted": "클라이언트 '{{key}}'이(가) 정상적으로 삭제되었습니다",
     "client_added": "클라이언트 '{{key}}'이(가) 정상적으로 추가되었습니다",
@@ -678,8 +653,8 @@
     "use_saved_key": "이전에 저장했던 키 사용하기",
     "parental_control": "자녀 보호",
     "safe_browsing": "세이프 브라우징",
-    "served_from_cache_label": "캐시에서 가져옴",
-    "form_error_password_length": "비밀번호는 {{min}}~{{max}}자 길이여야 합니다.",
+    "served_from_cache": "{{value}} <i>(캐시에서 제공)</i>",
+    "form_error_password_length": "비밀번호는 {{value}}자 이상이어야 합니다",
     "anonymizer_notification": "<0>참고:</0> IP 익명화가 활성화되었습니다. <1>일반 설정</1>에서 비활성화할 수 있습니다.",
     "confirm_dns_cache_clear": "정말로 DNS 캐시를 지우시겠습니까?",
     "cache_cleared": "DNS 캐시를 성공적으로 지웠습니다",
@@ -740,8 +715,5 @@
     "wednesday_short": "수",
     "thursday_short": "목",
     "friday_short": "금",
-    "saturday_short": "토",
-    "upstream_dns_cache_configuration": "업스트림 DNS 캐시 설정",
-    "enable_upstream_dns_cache": "이 클라이언트의 사용자 지정 업스트림 설정에서 DNS 캐싱 사용",
-    "dns_cache_size": "DNS 캐시 크기(바이트)"
+    "saturday_short": "토"
 }

client/src/__locales/nl.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Cliëntinstellingen",
     "example_upstream_reserved": "een upstream <0>voor specifieke domeinen</0>;",
-    "example_multiple_upstreams_reserved": "meerdere upstreams <0>voor specifieke domeinen</0>;",
     "example_upstream_comment": "een commentaar.",
     "upstream_parallel": "Parallelle verzoeken gebruiken om te versnellen door gelijktijdig verzoeken te sturen naar alle upstream servers.",
     "parallel_requests": "Parallelle verzoeken",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Je systeem gebruikt dynamische IP-adres configuratie voor interface <0>{{interfaceName}}</0>. Om de DHCP server te gebruiken moet er een statisch IP-adres worden ingesteld. Je huidige IP-adres is <0>{{ipAddress}}</0>. AdGuard Home zal automatisch dit IP-adres als statisch IP-adres instellen wanneer je op de knop \"DHCP inschakelen\" drukt.",
     "dhcp_lease_added": "Statische uitgifte \"{{key}}\" met succes toegevoegd",
     "dhcp_lease_deleted": "Statische uitgifte \"{{key}}\" met succes verwijderd",
-    "dhcp_lease_updated": "Statische lease \"{{key}}\" succesvol bijgewerkt",
     "dhcp_new_static_lease": "Voeg static lease toe",
-    "dhcp_edit_static_lease": "Statische lease bewerken",
     "dhcp_static_leases_not_found": "Geen DHCP static lease gevonden",
     "dhcp_add_static_lease": "Voeg statische lease toe",
     "dhcp_reset_leases": "Alle leases resetten",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Geblokkeerde malware/phishing",
     "stats_adult": "Geblokkeerde 18+ websites",
     "stats_query_domain": "Meest bezochte domeinen",
-    "for_last_hours": "voor het afgelopen {{count}} uur",
-    "for_last_hours_plural": "voor de afgelopen {{count}} uren",
+    "for_last_24_hours": "van de laatste 24-uur",
     "for_last_days": "sinds de laatste {{count}} dagen",
     "for_last_days_plural": "sinds de laatste {{count}} dagen",
     "stats_disabled": "Statistieken zijn uitgeschakeld. Je kunt ze inschakelen op de <0>instellingen pagina</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Geen upstreams-gegevens gevonden",
     "number_of_dns_query_days": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dag",
     "number_of_dns_query_days_plural": "Aantal verwerkte DNS aanvragen van de laatste {{count}} dagen",
-    "number_of_dns_query_hours": "Het aantal DNS-verzoeken dat het afgelopen {{count}} uur is verwerkt",
-    "number_of_dns_query_hours_plural": "Het aantal DNS-verzoeken dat de afgelopen {{count}} uren is verwerkt",
+    "number_of_dns_query_24_hours": "Aantal verwerkte DNS aanvragen van de laatste 24 uur",
     "number_of_dns_query_blocked_24_hours": "Aantal geblokkeerde DNS aanvragen door advertentie blokkering en hosts blokkeerlijsten",
     "number_of_dns_query_blocked_24_hours_by_sec": "Aantal geblokkeerde DNS aanvragen door AdGuard browsing beveiligingsmodule",
     "number_of_dns_query_blocked_24_hours_adult": "Aantal geblokkeerde 18+ websites",
     "enforced_save_search": "Geforceerd veilig zoeken",
     "number_of_dns_query_to_safe_search": "Aantal DNS aanvragen in zoekmachines dmv geforceerd veilig zoeken",
     "average_processing_time": "Gemiddelde procestijd",
-    "average_upstream_response_time": "Gemiddelde upstream responstijd",
-    "response_time": "Responsetijd",
+    "processing_time": "Verwerkingstijd",
     "average_processing_time_hint": "Gemiddelde verwerkingstijd in milliseconden van een DNS aanvraag",
     "block_domain_use_filters_and_hosts": "Domeinen blokkeren d.m.v. filters en host-bestanden",
     "filters_block_toggle_hint": "Je kan blokkeringsregels toevoegen in de <a>Filters</a> instellingen.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Sectie {{section}}: regel {{line}}: kan niet worden gebruikt. Controleer of je het correct hebt geschreven",
     "dns_test_warning_toast": "Upstream \"{{key}}\" reageert niet op testverzoeken en werkt mogelijk niet goed",
     "unblock": "Deblokkeren",
     "block": "Blokkeren",
@@ -244,7 +237,6 @@
     "allow_this_client": "Toepassing/systeem toelaten",
     "block_for_this_client_only": "Alleen voor deze cliënt blokkeren",
     "unblock_for_this_client_only": "Alleen voor deze cliënt deblokkeren",
-    "add_persistent_client": "Toevoegen als permanente client",
     "time_table_header": "Tijd",
     "date": "Datum",
     "domain_name_table_header": "Domein naam",
@@ -291,9 +283,6 @@
     "custom_ip": "Aangepast IP",
     "blocking_ipv4": "Blokkeren IP4",
     "blocking_ipv6": "Blokkeren IP6",
-    "blocked_response_ttl": "Geblokkeerde reactie TTL",
-    "blocked_response_ttl_desc": "Hiermee geef je op hoeveel seconden de clients een gefilterd antwoord in de cache moeten opslaan",
-    "form_enter_blocked_response_ttl": "Voer geblokkeerd antwoord TTL in (seconden)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-via-HTTPS",
     "dns_over_tls": "DNS-via-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Aangepast IP-adres gebruiken voor EDNS",
     "edns_use_custom_ip_desc": "Toestaan om aangepast IP-adres voor EDNS te gebruiken",
     "rate_limit_desc": "Het aantal verzoeken per seconde toegelaten per toestel. 0 betekent onbeperkt.",
-    "rate_limit_subnet_len_ipv4": "Lengte subnetvoorvoegsel voor IPv4-adressen",
-    "rate_limit_subnet_len_ipv4_desc": "Lengte subnetvoorvoegsel voor IPv4-adressen die worden gebruikt voor snelheidsbeperking. De standaardwaarde is 24",
-    "rate_limit_subnet_len_ipv4_error": "De lengte van het IPv4-subnetvoorvoegsel moet tussen 0 en 32 liggen",
-    "rate_limit_subnet_len_ipv6": "Lengte subnetvoorvoegsel voor IPv6-adressen",
-    "rate_limit_subnet_len_ipv6_desc": "Lengte subnetvoorvoegsel voor IPv6-adressen die worden gebruikt voor snelheidsbeperking. De standaardwaarde is 56",
-    "rate_limit_subnet_len_ipv6_error": "De lengte van het IPv6-subnetvoorvoegsel moet tussen 0 en 128 liggen",
-    "form_enter_rate_limit_subnet_len": "Voer de lengte van het subnetvoorvoegsel in voor snelheidsbeperking",
-    "rate_limit_whitelist": "Toelatingslijst voor snelheidsbeperking",
-    "rate_limit_whitelist_desc": "IP-adressen uitgesloten van snelheidsbeperking",
-    "rate_limit_whitelist_placeholder": "Voer één IP-adres per regel in",
     "blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
     "blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
     "blocking_mode_default": "Standaard: Reageer met een nul IP adres (0.0.0.0 for A; :: voor AAAA) wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer geblokkeerd door een /etc/hosts type regel",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Hostnamen",
     "encryption_reset": "Ben je zeker dat je de encryptie instellingen wil resetten?",
     "encryption_warning": "Waarschuwing",
-    "encryption_plain_dns_enable": "Gewone DNS inschakelen",
-    "encryption_plain_dns_desc": "Gewone DNS is standaard ingeschakeld. Je kunt het uitschakelen om alle apparaten te dwingen versleutelde DNS te gebruiken. Om dit te doen, moet je ten minste één versleuteld DNS-protocol inschakelen",
-    "encryption_plain_dns_error": "Als je gewone DNS wilt uitschakelen, schakel je ten minste één versleuteld DNS-protocol in",
     "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": "Poortnummer invoeren tussen 80 en 65535",
@@ -467,7 +443,6 @@
     "form_add_id": "ID toevoegen",
     "form_client_name": "Vul gebruikersnaam in",
     "name": "Naam",
-    "client_name": "Client {{id}}",
     "client_global_settings": "Gebruik globale instelling",
     "client_deleted": "Gebruiker \"{{key}}\" met succes verwijderd",
     "client_added": "Gebruiker \"{{key}}\" met succes toegevoegd",
@@ -678,8 +653,8 @@
     "use_saved_key": "De eerder opgeslagen sleutel gebruiken",
     "parental_control": "Ouderlijk toezicht",
     "safe_browsing": "Veilig browsen",
-    "served_from_cache_label": "Geleverd vanuit cache",
-    "form_error_password_length": "Wachtwoord moet {{min}} tot {{max}} tekens lang zijn",
+    "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
+    "form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn",
     "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>.",
     "confirm_dns_cache_clear": "Weet je zeker dat je de DNS-cache wilt wissen?",
     "cache_cleared": "DNS-cache succesvol gewist",
@@ -740,8 +715,5 @@
     "wednesday_short": "wo",
     "thursday_short": "do",
     "friday_short": "vr",
-    "saturday_short": "za",
-    "upstream_dns_cache_configuration": "Upstream DNS-cacheconfiguratie",
-    "enable_upstream_dns_cache": "DNS-caching inschakelen voor de aangepaste upstream-configuratie van deze client",
-    "dns_cache_size": "DNS-cachegrootte, in bytes"
+    "saturday_short": "za"
 }

client/src/__locales/no.json

@@ -128,6 +128,7 @@
     "enforced_save_search": "Påtvungede barnevennlige søk",
     "number_of_dns_query_to_safe_search": "Antall DNS-forespørsler til søkemotorer der \"Safe Search\" ble fremtvunget",
     "average_processing_time": "Gjennomsnittlig behandlingstid",
+    "processing_time": "Behandlingstid",
     "average_processing_time_hint": "Gjennomsnittstid for behandling av DNS-forespørsler i millisekunder",
     "block_domain_use_filters_and_hosts": "Blokker domener ved hjelp av filtre, «hosts»-filer, og rå domener",
     "filters_block_toggle_hint": "Du kan sette opp blokkeringsoppføringer i <a>Filtre</a>-innstillingene.",
@@ -212,7 +213,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Seksjon {{section}}: linje {{line}}: kunne ikke brukes, vennligst sjekk at du har skrevet det riktig",
     "unblock": "Tillat",
     "block": "Blokker",
     "disallow_this_client": "Ikke tillat denne klienten",

client/src/__locales/pl.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Ustawienia klienta",
     "example_upstream_reserved": "upstream <0>dla określonych domen</0>;",
-    "example_multiple_upstreams_reserved": "wiele serwerów nadrzędnych <0>dla konkretnej domeny</0>;",
     "example_upstream_comment": "komentarz.",
     "upstream_parallel": "Użyj zapytań równoległych, aby przyspieszyć rozwiązywanie przez jednoczesne wysyłanie zapytań do wszystkich serwerów nadrzędnych.",
     "parallel_requests": "Równoległe żądania",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Twój system używa dynamicznej konfiguracji adresu IP dla interfejsu <0>{{interfaceName}}</0>. Aby można było korzystać z serwera DHCP, należy ustawić statyczny adres IP. Twój obecny adres IP to <0>{{ipAddress}}</0>. AdGuard Home automatycznie ustawi ten adres IP jako statyczny, jeśli naciśniesz przycisk \"Włącz serwer DHCP\".",
     "dhcp_lease_added": "Dzierżawa statyczna \"{{key}}\" pomyślnie dodana",
     "dhcp_lease_deleted": "Dzierżawa statyczna \"{{key}}\" pomyślnie usunięta",
-    "dhcp_lease_updated": "Dzierżawa statyczna \"{{key}}\" pomyślnie zaktualizowana",
     "dhcp_new_static_lease": "Nowa dzierżawa statyczna",
-    "dhcp_edit_static_lease": "Edytuj dzierżawę statyczną",
     "dhcp_static_leases_not_found": "Nie znaleziono statycznych dzierżaw DHCP",
     "dhcp_add_static_lease": "Dodaj dzierżawę statyczną",
     "dhcp_reset_leases": "Zresetuj wszystkie dzierżawy",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Zablokowane złośliwe oprogramowanie/phishing",
     "stats_adult": "Zablokowane witryny dla dorosłych",
     "stats_query_domain": "Najczęściej wyszukiwane domeny",
-    "for_last_hours": "w ciągu ostatniej {{count}} godziny",
-    "for_last_hours_plural": "w ciągu ostatnich {{count}} godzin",
+    "for_last_24_hours": "przez ostatnie 24 godziny",
     "for_last_days": "za ostatni dzień {{count}}",
     "for_last_days_plural": "z ostatnich {{count}} dni",
     "stats_disabled": "Statystyki zostały wyłączone. Można je włączyć na <0>stronie ustawień</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Brak danych dotyczących serwerów nadrzędnych",
     "number_of_dns_query_days": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} dni",
     "number_of_dns_query_days_plural": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} dni",
-    "number_of_dns_query_hours": "Liczba przetworzonych zapytań DNS w ciągu ostatniej {{count}} godziny",
-    "number_of_dns_query_hours_plural": "Liczba przetworzonych zapytań DNS w ciągu ostatnich {{count}} godzin",
+    "number_of_dns_query_24_hours": "Liczba zapytań DNS przetworzonych w ciągu ostatnich 24 godzin",
     "number_of_dns_query_blocked_24_hours": "Liczba żądań DNS zablokowanych przez filtry blokowania reklam i listy zablokowanych hostów",
     "number_of_dns_query_blocked_24_hours_by_sec": "Liczba żądań DNS zablokowanych przez moduł Bezpiecznego przeglądania AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Liczba zablokowanych witryn dla dorosłych",
     "enforced_save_search": "Wymuszone bezpieczne wyszukiwanie",
     "number_of_dns_query_to_safe_search": "Liczba żądań DNS kierowanych do wyszukiwarek, dla których wymuszono Bezpieczne wyszukiwanie",
     "average_processing_time": "Średni czas przetwarzania",
-    "average_upstream_response_time": "Średni czas odpowiedzi serwera nadrzędnego",
-    "response_time": "Czas odpowiedzi",
+    "processing_time": "Czas przetwarzania",
     "average_processing_time_hint": "Średni czas przetwarzania żądania DNS liczony w milisekundach",
     "block_domain_use_filters_and_hosts": "Zablokuj domeny za pomocą filtrów i plików host",
     "filters_block_toggle_hint": "Możesz skonfigurować reguły blokowania w ustawieniach <a>Filtry</a>.",
@@ -236,7 +230,6 @@
     "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że być użyte, sprawdź, czy zapisano go poprawnie",
-    "dns_test_parsing_error_toast": "Sekcja {{section}}: linia {{line}}: nie może być użyte, sprawdź, czy zapisano go poprawnie",
     "dns_test_warning_toast": "Upstream \"{{key}}\" nie odpowiada na zapytania testowe i może nie działać prawidłowo",
     "unblock": "Odblokuj",
     "block": "Zablokuj",
@@ -244,7 +237,6 @@
     "allow_this_client": "Pozwól temu klientowi",
     "block_for_this_client_only": "Zablokuj tylko tego klienta",
     "unblock_for_this_client_only": "Odblokuj tylko tego klienta",
-    "add_persistent_client": "Dodaj do zapisanych klientów",
     "time_table_header": "Czas",
     "date": "Data",
     "domain_name_table_header": "Nazwa domeny",
@@ -291,9 +283,6 @@
     "custom_ip": "Niestandardowy adres IP",
     "blocking_ipv4": "Blokowanie IPv4",
     "blocking_ipv6": "Blokowanie IPv6",
-    "blocked_response_ttl": "TTL zablokowanej odpowiedzi",
-    "blocked_response_ttl_desc": "Określa, przez ile sekund klienci powinni buforować przefiltrowaną odpowiedź",
-    "form_enter_blocked_response_ttl": "Wprowadź TTL zablokowanej odpowiedzi (sekundy)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Użyj niestandardowego adresu IP dla EDNS",
     "edns_use_custom_ip_desc": "Zezwól na użycie niestandardowego adresu IP dla EDNS",
     "rate_limit_desc": "Liczba żądań na sekundę dozwolona na klienta. Ustawienie wartości 0 oznacza brak ograniczeń.",
-    "rate_limit_subnet_len_ipv4": "Długość maski podsieci dla adresów IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Długość maski podsieci dla adresów IPv4 używanych do ograniczania prędkości. Domyślnie jest to 24",
-    "rate_limit_subnet_len_ipv4_error": "Długość maski podsieci IPv4 powinna wynosić od 0 do 32",
-    "rate_limit_subnet_len_ipv6": "Długość prefiksu podsieci dla adresów IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Długość prefiksu podsieci dla adresów IPv6 używanych do ograniczania szybkości. Domyślnie jest to 56",
-    "rate_limit_subnet_len_ipv6_error": "Długość prefiksu podsieci IPv6 powinna wynosić od 0 do 128",
-    "form_enter_rate_limit_subnet_len": "Wprowadź długość prefiksu podsieci dla ograniczenia prędkości",
-    "rate_limit_whitelist": "Lista zezwoleń ograniczających prędkość",
-    "rate_limit_whitelist_desc": "Adresy IP wykluczone z ograniczania prędkości",
-    "rate_limit_whitelist_placeholder": "Wprowadź po jednym adresie IP w każdym wierszu",
     "blocking_ipv4_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania A",
     "blocking_ipv6_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania AAAA",
     "blocking_mode_default": "Domyślna: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA) po zablokowaniu przez regułę Adblock; odpowiedź adresem IP wpisanym w regule, jeśli jest blokowany przez regułę w stylu /etc/hosts",
@@ -424,10 +403,7 @@
     "encryption_issuer": "Zgłaszający",
     "encryption_hostnames": "Nazwy hostów",
     "encryption_reset": "Czy na pewno chcesz zresetować ustawienia szyfrowania?",
-    "encryption_warning": "Ostrzeżenie",
-    "encryption_plain_dns_enable": "Włącz zwykły DNS",
-    "encryption_plain_dns_desc": "Zwykły DNS jest domyślnie włączony. Możesz go wyłączyć, aby zmusić wszystkie urządzenia do korzystania z szyfrowanego DNS. Aby to zrobić, musisz włączyć co najmniej jeden szyfrowany protokół DNS",
-    "encryption_plain_dns_error": "Aby wyłączyć zwykły DNS, włącz co najmniej jeden szyfrowany protokół DNS",
+    "encryption_warning": "Uwaga",
     "topline_expiring_certificate": "Twój certyfikat SSL wkrótce wygaśnie. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "topline_expired_certificate": "Twój certyfikat SSL wygasł. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "form_error_port_range": "Wpisz numer portu z zakresu 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Dodaj identyfikator",
     "form_client_name": "Wpisz nazwę klienta",
     "name": "Nazwa",
-    "client_name": "Klient {{id}}",
     "client_global_settings": "Użyj ustawień globalnych",
     "client_deleted": "Klient \"{{key}}\" został pomyślnie usunięty",
     "client_added": "Klient \"{{key}}\" został pomyślnie dodany",
@@ -678,8 +653,8 @@
     "use_saved_key": "Użyj wcześniej zapisanego klucza",
     "parental_control": "Kontrola rodzicielska",
     "safe_browsing": "Bezpieczne przeglądanie",
-    "served_from_cache_label": "Podano z pamięci podręcznej",
-    "form_error_password_length": "Hasło musi zawierać od {{min}} do {{max}} znaków",
+    "served_from_cache": "{{value}} <i>(podawane z pamięci podręcznej)</i>",
+    "form_error_password_length": "Hasło musi mieć co najmniej {{value}} znaków",
     "anonymizer_notification": "<0>Uwaga:</0> Anonimizacja IP jest włączona. Możesz ją wyłączyć w <1>Ustawieniach ogólnych</1>.",
     "confirm_dns_cache_clear": "Czy na pewno chcesz wyczyścić pamięć podręczną DNS?",
     "cache_cleared": "Pamięć podręczna DNS została pomyślnie wyczyszczona",
@@ -740,8 +715,5 @@
     "wednesday_short": "Śro",
     "thursday_short": "Czw",
     "friday_short": "Pt",
-    "saturday_short": "Sob",
-    "upstream_dns_cache_configuration": "Konfiguracja pamięci podręcznej upstream serwerów DNS",
-    "enable_upstream_dns_cache": "Włącz pamięć podręczną dla niestandardowej konfiguracji serwera upstream tego klienta",
-    "dns_cache_size": "Rozmiar pamięci podręcznej DNS, w bajtach"
+    "saturday_short": "Sob"
 }

client/src/__locales/pt-br.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Configurações do cliente",
     "example_upstream_reserved": "um DNS primário <0>para o domínios especificos</0>;",
-    "example_multiple_upstreams_reserved": "múltiplos upstreams <0>para domínios específicos</0>;",
     "example_upstream_comment": "um comentário.",
     "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS primário",
     "parallel_requests": "Solicitações paralelas",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Seu sistema usa a configuração de endereço IP dinâmico para a interface <0>{{interfaceName}}</0>. Para usar o servidor DHCP, você deve definir um endereço de IP estático. Seu endereço IP atual é <0> {{ipAddress}} </ 0>. AdGuard Home irá definir automaticamente este endereço IP como estático se você pressionar o botão \"Ativar servidor DHCP\".",
     "dhcp_lease_added": "Concessão estática \"{{key}}\" adicionada com sucesso",
     "dhcp_lease_deleted": "Concessão estática \"{{key}}\" excluída com sucesso",
-    "dhcp_lease_updated": "Concessão estática \"{{key}}\" atualizada com sucesso",
     "dhcp_new_static_lease": "Nova concessão estática",
-    "dhcp_edit_static_lease": "Editar concessão estática",
     "dhcp_static_leases_not_found": "Nenhuma concessão DHCP estática foi encontrada",
     "dhcp_add_static_lease": "Adicionar nova concessão estática",
     "dhcp_reset_leases": "Redefinir todas as concessões",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Bloqueado malware/phishing",
     "stats_adult": "Bloqueado sites adultos",
     "stats_query_domain": "Principais domínios consultados",
-    "for_last_hours": "na última {{count}} hora",
-    "for_last_hours_plural": "nas últimas {{count}} horas",
+    "for_last_24_hours": "nas últimas 24 horas",
     "for_last_days": "nos últimos {{count}} dias",
     "for_last_days_plural": "nos últimos {{count}} dias",
     "stats_disabled": "As estatísticas foram desativadas. Você pode ligá-las através da <0>página de configurações</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nenhum dado de servidor DNS primário encontrado",
     "number_of_dns_query_days": "O número de consultas DNS processadas nos últimos {{count}} dias",
     "number_of_dns_query_days_plural": "Número de consultas DNS processadas nos últimos {{count}} dias",
-    "number_of_dns_query_hours": "Número de consultas DNS processadas durante a última {{count}} hora",
-    "number_of_dns_query_hours_plural": "Número de consultas DNS processadas durante as últimas {{count}} horas",
+    "number_of_dns_query_24_hours": "O número de consultas DNS processadas nas últimas 24 horas",
     "number_of_dns_query_blocked_24_hours": "Várias solicitações DNS bloqueadas por filtros de bloqueio de anúncios e listas de bloqueio de hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Várias solicitações de DNS bloqueadas pelo módulo de segurança da navegação do AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "O número de sites adultos bloqueados",
     "enforced_save_search": "Forçar pesquisa segura",
     "number_of_dns_query_to_safe_search": "O número de solicitações de DNS para mecanismos de pesquisa para os quais a pesquisa segura foi aplicada",
     "average_processing_time": "Tempo médio de processamento",
-    "average_upstream_response_time": "Tempo médio de resposta upstream",
-    "response_time": "Tempo de resposta",
+    "processing_time": "Tempo de processamento",
     "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
     "block_domain_use_filters_and_hosts": "Bloquear domínios usando arquivos de filtros e hosts",
     "filters_block_toggle_hint": "Você pode configurar as regras de bloqueio nas configurações de <a>Filtros</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "A seção {{section}}: linha {{line}}: não pôde ser usada. Verifique se foi escrita corretamente",
     "dns_test_warning_toast": "Servidor DNS primário \"{{key}}\" não responde aos Solicitações de teste e pode não funcionar corretamente",
     "unblock": "Desbloquear",
     "block": "Bloquear",
@@ -244,7 +237,6 @@
     "allow_this_client": "Permitir este cliente",
     "block_for_this_client_only": "Bloquear apenas para este cliente",
     "unblock_for_this_client_only": "Desbloquear apenas para este cliente",
-    "add_persistent_client": "Adicionar como cliente persistente",
     "time_table_header": "Data",
     "date": "Data",
     "domain_name_table_header": "Nome de domínio",
@@ -291,9 +283,6 @@
     "custom_ip": "IP personalizado",
     "blocking_ipv4": "Bloqueando IPv4",
     "blocking_ipv6": "Bloqueando IPv6",
-    "blocked_response_ttl": "Resposta bloqueada TTL",
-    "blocked_response_ttl_desc": "Especifica por quantos segundos os clientes devem armazenar em cache uma resposta filtrada",
-    "form_enter_blocked_response_ttl": "Insira o TTL da resposta bloqueada (segundos)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-sobre-HTTPS",
     "dns_over_tls": "DNS-sobre-TLS",
@@ -305,23 +294,13 @@
     "download_mobileconfig_dot": "BAixar .mobileconfig para DNS-sobre-TLS",
     "download_mobileconfig": "Baixar arquivo de configuração",
     "plain_dns": "DNS simples",
-    "form_enter_rate_limit": "Insira a velocidade limite",
-    "rate_limit": "Velocidade limite",
+    "form_enter_rate_limit": "Insira a taxa limite",
+    "rate_limit": "Taxa limite",
     "edns_enable": "Ativar a sub-rede do cliente EDNS",
     "edns_cs_desc": "Adicione a opção de sub-rede de cliente EDNS (ECS) às solicitações de servidor DNS primário e registre os valores enviados pelos clientes no registro de consulta.",
     "edns_use_custom_ip": "Usar IP personalizado para EDNS",
     "edns_use_custom_ip_desc": "Permitir o uso de IP personalizado para EDNS",
     "rate_limit_desc": "O número de solicitações por segundo permitidas por cliente. Definir como 0 significa que não há limite.",
-    "rate_limit_subnet_len_ipv4": "Comprimento do prefixo de sub-rede para endereços IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Comprimento do prefixo de sub-rede para endereços IPv4 usados para limitação de velocidade. O padrão é 24",
-    "rate_limit_subnet_len_ipv4_error": "O comprimento do prefixo da sub-rede IPv4 deve estar entre 0 e 32",
-    "rate_limit_subnet_len_ipv6": "Comprimento do prefixo de sub-rede para endereços IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Comprimento do prefixo de sub-rede para endereços IPv6 usados para limitação de velocidade. O padrão é 56",
-    "rate_limit_subnet_len_ipv6_error": "O comprimento do prefixo da sub-rede IPv6 deve estar entre 0 e 128",
-    "form_enter_rate_limit_subnet_len": "Insira o comprimento do prefixo da sub-rede para limitação de taxa",
-    "rate_limit_whitelist": "Lista de permissões de limitação de velocidade",
-    "rate_limit_whitelist_desc": "Endereços IP excluídos da limitação de velocidade",
-    "rate_limit_whitelist_placeholder": "Insira um endereço IP por linha",
     "blocking_ipv4_desc": "Endereço de IP a ser retornado para uma solicitação bloqueada",
     "blocking_ipv6_desc": "Endereço de IP a ser retornado para uma solicitação AAAA bloqueada",
     "blocking_mode_default": "Padrão: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Nomes dos servidores",
     "encryption_reset": "Você tem certeza de que deseja redefinir a configuração de criptografia?",
     "encryption_warning": "Aviso",
-    "encryption_plain_dns_enable": "Ativar DNS simples (sem criptografia)",
-    "encryption_plain_dns_desc": "O DNS simples (sem criptografia) está ativado por padrão. Você pode desativá-lo para forçar todos os dispositivos a usar DNS criptografado. Para fazer isso, você deve ativar pelo menos um protocolo DNS criptografado",
-    "encryption_plain_dns_error": "Para desativar o DNS simples, ative pelo menos um protocolo DNS criptografado",
     "topline_expiring_certificate": "Seu certificado SSL está prestes a expirar. Atualize suas <0>configurações de criptografia</]0>",
     "topline_expired_certificate": "Seu certificado SSL está expirado. Atualize suas <0>configurações de criptografia</0>",
     "form_error_port_range": "Digite um número de porta entre 80 e 65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Adicionar identificador",
     "form_client_name": "Digite o nome do cliente",
     "name": "Nome",
-    "client_name": "Cliente {{id}}",
     "client_global_settings": "Usar configurações global",
     "client_deleted": "Cliente \"{{key}}\" excluído com sucesso",
     "client_added": "Cliente \"{{key}}\" adicionado com sucesso",
@@ -678,8 +653,8 @@
     "use_saved_key": "Use a chave salva anteriormente",
     "parental_control": "Controle parental",
     "safe_browsing": "Navegação segura",
-    "served_from_cache_label": "Servido a partir do cache",
-    "form_error_password_length": "A senha deve ter entre {{min}} e {{max}} caracteres",
+    "served_from_cache": "{{value}} <i>(servido do cache)</i>",
+    "form_error_password_length": "A senha deve ter pelo menos {{value}} caracteres",
     "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-lo em <1>Configurações gerais</1>.",
     "confirm_dns_cache_clear": "Tem certeza de que deseja limpar o cache DNS?",
     "cache_cleared": "Cache DNS limpo com sucesso",
@@ -709,7 +684,7 @@
     "log_and_stats_section_label": "Registro de consultas e estatísticas",
     "ignore_query_log": "Ignorar este cliente no registo de consultas",
     "ignore_statistics": "Ignorar este cliente nas estatísticas",
-    "schedule_services": "Pausar bloqueio de serviço",
+    "schedule_services": "Pausa o bloqueio de serviço",
     "schedule_services_desc": "Configura o agendamento de pausa do filtro de bloqueio de serviço",
     "schedule_services_desc_client": "Configura o agendamento de pausa do filtro de bloqueio de serviço para este cliente",
     "schedule_desc": "Define períodos de inatividade para serviços bloqueados",
@@ -740,8 +715,5 @@
     "wednesday_short": "Quar",
     "thursday_short": "Qui",
     "friday_short": "Sex",
-    "saturday_short": "Sab",
-    "upstream_dns_cache_configuration": "Configuração do cache de DNS upstream",
-    "enable_upstream_dns_cache": "Ativar o armazenamento em cache do DNS para a configuração de upstream personalizada deste cliente",
-    "dns_cache_size": "Tamanho do cache do DNS, em bytes"
+    "saturday_short": "Sab"
 }

client/src/__locales/pt-pt.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Definições do cliente",
     "example_upstream_reserved": "Podes especificar o DNS primário <0>para domínio(s) especifico(s)</0>",
-    "example_multiple_upstreams_reserved": "múltiplos upstreams <0>para domínios específicos</0>;",
     "example_upstream_comment": "um comentário.",
     "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS",
     "parallel_requests": "Solicitações paralelas",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "O seu sistema usa a configuração de endereço IP dinâmico para a interface <0>{{interfaceName}}</0>. Para usar o servidor DHCP, deve definir um endereço de IP estático. O seu endereço IP atual é <0> {{ipAddress}} </ 0>. AdGuard Home irá definir automaticamente este endereço IP como estático se pressionar o botão \"Ativar servidor DHCP\".",
     "dhcp_lease_added": "Concessão estática \"{{key}}\" adicionada com sucesso",
     "dhcp_lease_deleted": "Concessão estática \"{{key}}\" excluída com sucesso",
-    "dhcp_lease_updated": "Concessão estática \"{{key}}\" atualizada com sucesso",
     "dhcp_new_static_lease": "Nova concessão estática",
-    "dhcp_edit_static_lease": "Editar concessão estática",
     "dhcp_static_leases_not_found": "Nenhuma concessão DHCP estática foi encontrada",
     "dhcp_add_static_lease": "Adicionar nova concessão estática",
     "dhcp_reset_leases": "Repor todas as concessões",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Malware/phishing bloqueados",
     "stats_adult": "Sítios adultos bloqueados",
     "stats_query_domain": "Principais domínios consultados",
-    "for_last_hours": "na última {{count}} hora",
-    "for_last_hours_plural": "nas últimas {{count}} horas",
+    "for_last_24_hours": "nas últimas 24 horas",
     "for_last_days": "nos últimos {{count}} dias",
     "for_last_days_plural": "nos últimos {{count}} dias",
     "stats_disabled": "As estatísticas foram desativadas. Você pode ligá-las através da <0>página de definições</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nenhum dado de servidor DNS primário encontrado",
     "number_of_dns_query_days": "Número de consultas DNS processadas durante los últimos {{count}} días",
     "number_of_dns_query_days_plural": "Número de consultas DNS processadas durante os últimos {{count}} dias",
-    "number_of_dns_query_hours": "Número de consultas DNS processadas durante a última {{count}} hora",
-    "number_of_dns_query_hours_plural": "Número de consultas DNS processadas durante as últimas {{count}} horas",
+    "number_of_dns_query_24_hours": "O número de consultas DNS processadas nas últimas 24 horas",
     "number_of_dns_query_blocked_24_hours": "Várias solicitações DNS bloqueadas por filtros de bloqueio de anúncios e listas de bloqueio de hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Várias solicitações de DNS bloqueadas pelo módulo de segurança da navegação do AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "O número de sítios adultos bloqueados",
     "enforced_save_search": "Forçar pesquisa segura",
     "number_of_dns_query_to_safe_search": "O número de solicitações de DNS para motores de busca para os quais a pesquisa segura foi aplicada",
     "average_processing_time": "Tempo médio de processamento",
-    "average_upstream_response_time": "Tempo médio de resposta upstream",
-    "response_time": "Tempo de resposta",
+    "processing_time": "Tempo de processamento",
     "average_processing_time_hint": "Tempo médio em milissegundos no processamento de uma solicitação DNS",
     "block_domain_use_filters_and_hosts": "Bloquear domínios usando ficheiros de filtros e hosts",
     "filters_block_toggle_hint": "Pode configurar as regras de bloqueio nas configurações de <a>Filtros</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "A seção {{section}}: linha {{line}}: não pôde ser usada. Verifique se foi escrita corretamente",
     "dns_test_warning_toast": "Servidor DNS primário \"{{key}}\" não responde aos solicitações de teste e pode não funcionar corretamente",
     "unblock": "Desbloquear",
     "block": "Bloquear",
@@ -244,7 +237,6 @@
     "allow_this_client": "Permitir este cliente",
     "block_for_this_client_only": "Bloquear apenas para este cliente",
     "unblock_for_this_client_only": "Desbloquear apenas para este cliente",
-    "add_persistent_client": "Adicionar como cliente persistente",
     "time_table_header": "Data",
     "date": "Data",
     "domain_name_table_header": "Nome do domínio",
@@ -291,9 +283,6 @@
     "custom_ip": "IP Personalizado",
     "blocking_ipv4": "A bloquear IPv4",
     "blocking_ipv6": "A bloquear IPv6",
-    "blocked_response_ttl": "Resposta bloqueada TTL",
-    "blocked_response_ttl_desc": "Especifica por quantos segundos os clientes devem armazenar em cache uma resposta filtrada",
-    "form_enter_blocked_response_ttl": "Insira o TTL da resposta bloqueada (segundos)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-sobre-HTTPS",
     "dns_over_tls": "DNS-sobre-TLS",
@@ -305,23 +294,13 @@
     "download_mobileconfig_dot": "Transferir .mobileconfig para DNS-sobre-TLS",
     "download_mobileconfig": "Transferir ficheiro de configuração",
     "plain_dns": "DNS simples",
-    "form_enter_rate_limit": "Insira o limite de velocidade",
-    "rate_limit": "Limite de velocidade",
+    "form_enter_rate_limit": "Insira o limite de taxa",
+    "rate_limit": "Limite de taxa",
     "edns_enable": "Ativar a sub-rede do cliente EDNS",
     "edns_cs_desc": "Adicione a opção de sub-rede de cliente EDNS (ECS) às solicitações de servidor DNS primário e registre os valores enviados pelos clientes no registo de consulta.",
     "edns_use_custom_ip": "Usar IP personalizado para EDNS",
     "edns_use_custom_ip_desc": "Permitir a utilização de IP personalizado para EDNS",
     "rate_limit_desc": "O número de solicitações por segundo permitido por cliente. Configurando para 0 significa sem limite.",
-    "rate_limit_subnet_len_ipv4": "Comprimento do prefixo de sub-rede para endereços IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Comprimento do prefixo de sub-rede para endereços IPv4 usados para limitação de velocidade. O padrão é 24",
-    "rate_limit_subnet_len_ipv4_error": "O comprimento do prefixo da sub-rede IPv4 deve estar entre 0 e 32",
-    "rate_limit_subnet_len_ipv6": "Comprimento do prefixo de sub-rede para endereços IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Comprimento do prefixo de sub-rede para endereços IPv6 usados para limitação de velocidade. O padrão é 56",
-    "rate_limit_subnet_len_ipv6_error": "O comprimento do prefixo da sub-rede IPv6 deve situar-se entre 0 e 128",
-    "form_enter_rate_limit_subnet_len": "Introduza o comprimento do prefixo da sub-rede para limitação da velocidade",
-    "rate_limit_whitelist": "Lista de permissões de limitação de velocidade",
-    "rate_limit_whitelist_desc": "Endereços IP excluídos da limitação de velocidade",
-    "rate_limit_whitelist_placeholder": "Insira um endereço IP por linha",
     "blocking_ipv4_desc": "Endereço IP a ser devolvido para uma solicitação A bloqueada",
     "blocking_ipv6_desc": "Endereço IP a ser devolvido para uma solicitação AAAA bloqueada",
     "blocking_mode_default": "Predefinido: Responder com zero endereço IP (0.0.0.0 para A; :: para AAAA) quando bloqueado pela regra de estilo Adblock; responde com o endereço IP especificado na regra quando bloqueado pela regra /etc/hosts-style",
@@ -424,10 +403,7 @@
     "encryption_issuer": "Emissor",
     "encryption_hostnames": "Nomes dos servidores",
     "encryption_reset": "Tem a certeza de que deseja repor a definição de criptografia?",
-    "encryption_warning": "Cuidado",
-    "encryption_plain_dns_enable": "Habilitar DNS simples (sem criptografia)",
-    "encryption_plain_dns_desc": "O DNS simples (sem criptografia) está ativado por padrão. Pode desativá-lo para forçar todos os dispositivos a usar DNS criptografado. Para isso, deve ativar pelo menos um protocolo DNS criptografado",
-    "encryption_plain_dns_error": "Para desabilitar o DNS simples, habilite pelo menos um protocolo DNS criptografado",
+    "encryption_warning": "Aviso",
     "topline_expiring_certificate": "O seu certificado SSL está prestes a expirar. Atualize as suas <0>definições de criptografia</0>.",
     "topline_expired_certificate": "O seu certificado SSL está expirado. Atualize as suas <0>definições de criptografia</0>.",
     "form_error_port_range": "Digite um numero de porta entre 80 e 65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Adicionar identificador",
     "form_client_name": "Insira o nome do cliente",
     "name": "Nome",
-    "client_name": "Cliente {{id}}",
     "client_global_settings": "Usar definições globais",
     "client_deleted": "Cliente \"{{key}}\" excluído com sucesso",
     "client_added": "Cliente \"{{key}}\" adicionado com sucesso",
@@ -678,8 +653,8 @@
     "use_saved_key": "Use a chave guardada anteriormente",
     "parental_control": "Controlo parental",
     "safe_browsing": "Navegação segura",
-    "served_from_cache_label": "Servido a partir do cache",
-    "form_error_password_length": "A palavra-passe deve ter {{min}} a {{max}} caracteres",
+    "served_from_cache": "{{value}} <i>(servido do cache)</i>",
+    "form_error_password_length": "A palavra-passe deve ter pelo menos {{value}} caracteres",
     "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-la em <1>Definições gerais</1>.",
     "confirm_dns_cache_clear": "Tem certeza de que quer limpar a cache DNS?",
     "cache_cleared": "O cache DNS foi apagado com sucesso",
@@ -740,8 +715,5 @@
     "wednesday_short": "Quarta",
     "thursday_short": "Quinta",
     "friday_short": "Sexta",
-    "saturday_short": "Sábado",
-    "upstream_dns_cache_configuration": "Configuração da cache do DNS upstream",
-    "enable_upstream_dns_cache": "Ativar o armazenamento em cache do DNS para a configuração de upstream personalizada deste cliente",
-    "dns_cache_size": "Tamanho da cache DNS, em bytes"
+    "saturday_short": "Sábado"
 }

client/src/__locales/ro.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Setări client",
     "example_upstream_reserved": "un flux în amonte <0>pentru domenii specifice</0>;",
-    "example_multiple_upstreams_reserved": "mai mulți servere în amonte <0>pentru domenii specifice</0>;",
     "example_upstream_comment": "un comentariu.",
     "upstream_parallel": "Folosiți interogări paralele pentru a accelera rezolvarea, interogând simultan toate serverele în amonte.",
     "parallel_requests": "Solicitări paralele",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Sistemul dvs. folosește configurația dinamică a adreselor IP pentru interfața <0>{{interfaceName}}</0>. Pentru a utiliza serverul DHCP, trebuie setată o adresă IP statică. Adresa IP curentă este <0>{{ipAddress}}</0>. AdGuard Home o va configura automat ca adresă IP statică, dacă apăsați butonul \"Activați serverul DHCP\".",
     "dhcp_lease_added": "\"{{key}}\" statică închiriată adăugată cu succes",
     "dhcp_lease_deleted": "\"{{key}}\" statică închiriată eliminată cu succes",
-    "dhcp_lease_updated": "\"{{key}}\" statică închiriată actualizată cu succes",
     "dhcp_new_static_lease": "Închiriere statică nouă",
-    "dhcp_edit_static_lease": "Editați închiriere statică",
     "dhcp_static_leases_not_found": "Nu s-au găsit închirieri statice DHCP",
     "dhcp_add_static_lease": "Adăugați închiriere statică",
     "dhcp_reset_leases": "Resetați toate închirierile",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Malware/phishing blocate",
     "stats_adult": "Site-uri cu conținut adult blocate",
     "stats_query_domain": "Domeniile cele mai căutate",
-    "for_last_hours": "în ultima {{count}} oră",
-    "for_last_hours_plural": "în ultimele {{count}} ore",
+    "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>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nu există date despre serverele din amonte",
     "number_of_dns_query_days": "Numărul de interogări DNS procesate în ultima {{count}} zi",
     "number_of_dns_query_days_plural": "Numărul de interogări DNS procesate în ultimele {{count}} zile",
-    "number_of_dns_query_hours": "Numărul de interogări DNS procesate în ultima {{count}} oră",
-    "number_of_dns_query_hours_plural": "Numărul de interogări DNS procesate în ultimele {{count}} ore",
+    "number_of_dns_query_24_hours": "Numărul de interogări DNS procesate în ultimele 24 de ore",
     "number_of_dns_query_blocked_24_hours": "Numărul de interogări DNS blocate de filtrele adblock și lista de blocări din hosts",
     "number_of_dns_query_blocked_24_hours_by_sec": "Numărul de interogări DNS blocate de modulul de securitate de navigare AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Numărul de site-uri pentru adulți blocate",
     "enforced_save_search": "Căutare protejată întărită",
     "number_of_dns_query_to_safe_search": "Numărul de interogări DNS pe motoarele de căutare pentru care a fost impusă Căutarea Sigură",
     "average_processing_time": "Timpul mediu de procesare",
-    "average_upstream_response_time": "Timpul mediu de răspuns al serverului în amonte",
-    "response_time": "Timp de răspuns",
+    "processing_time": "Timp de procesare",
     "average_processing_time_hint": "Timp mediu în milisecunde la procesarea unei cereri DNS",
     "block_domain_use_filters_and_hosts": "Blocați domenii folosind filtre și fișiere hosts",
     "filters_block_toggle_hint": "Puteți configura regulile de blocare în setările <a>Filtre</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Secțiune {{section}}: linie {{line}}: nu a putut fi folosit, vă rugăm să verificați dacă l-ați scris corect",
     "dns_test_warning_toast": "„{{key}}” în amonte nu răspunde la solicitările de testare și s-ar putea să nu funcționeze corect",
     "unblock": "Deblocați",
     "block": "Blocați",
@@ -244,7 +237,6 @@
     "allow_this_client": "Permiteți acest client",
     "block_for_this_client_only": "Blocați numai pentru acest client",
     "unblock_for_this_client_only": "Deblocați numai pentru acest client",
-    "add_persistent_client": "Adăugați ca client persistent",
     "time_table_header": "Ora",
     "date": "Data",
     "domain_name_table_header": "Nume domeniu",
@@ -291,9 +283,6 @@
     "custom_ip": "IP personalizat",
     "blocking_ipv4": "Blocarea IPv4",
     "blocking_ipv6": "Blocarea IPv6",
-    "blocked_response_ttl": "Răspuns blocat TTL",
-    "blocked_response_ttl_desc": "Specifică pentru câte secunde trebuie să memoreze clienții un răspuns filtrat",
-    "form_enter_blocked_response_ttl": "Introduceți răspunsul blocat TTL (secunde)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Utilizați IP personalizat pentru EDNS",
     "edns_use_custom_ip_desc": "Permiteți utilizarea IP-ului personalizat pentru EDNS",
     "rate_limit_desc": "Numărul de interogări pe secundă permise pe client. Setarea la 0 înseamnă că nu există limită.",
-    "rate_limit_subnet_len_ipv4": "Lungimea prefixului de subrețea pentru adrese IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Lungimea prefixului de subrețea pentru adresele IPv4 utilizate pentru limitarea ratei. Valoarea implicită este 24",
-    "rate_limit_subnet_len_ipv4_error": "Lungimea prefixului de subrețea IPv4 ar trebui să fie între 0 și 32",
-    "rate_limit_subnet_len_ipv6": "Lungimea prefixului de subrețea pentru adrese IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Lungimea prefixului de subrețea pentru adresele IPv6 utilizate pentru limitarea ratei. Valoarea implicită este 56",
-    "rate_limit_subnet_len_ipv6_error": "Lungimea prefixului de subrețea IPv6 ar trebui să fie între 0 și 128",
-    "form_enter_rate_limit_subnet_len": "Introduceți lungimea prefixului de subrețea pentru limitarea ratei",
-    "rate_limit_whitelist": "Lista permisă pentru limitarea ratei",
-    "rate_limit_whitelist_desc": "Adresele IP excluse de la limitarea ratei",
-    "rate_limit_whitelist_placeholder": "Introduceți o adresă IP per linie",
     "blocking_ipv4_desc": "Adresa IP de returnat pentru o cerere A de blocare",
     "blocking_ipv6_desc": "Adresa IP de returnat pentru o cerere AAAA de blocare",
     "blocking_mode_default": "Implicit: Răspunde cu adresa IP (0.0.0.0 for A; :: pentru AAAA) când sunt blocate de regulă tip Adblock; răspunde cu adresa IP specificată în regulă când sunt blocate de regula tip /etc/hosts",
@@ -424,7 +403,7 @@
     "encryption_issuer": "Emitent",
     "encryption_hostnames": "Nume de host",
     "encryption_reset": "Sunteți sigur că doriți să resetați setările de criptare?",
-    "encryption_warning": "Atenție",
+    "encryption_warning": "Avertisment",
     "topline_expiring_certificate": "Certificatul dvs. SSL este pe cale să expire. Actualizați <0>Setările de criptare</0>.",
     "topline_expired_certificate": "Certificatul dvs. SSL a expirat. Actualizați <0>Setările de criptare</0>.",
     "form_error_port_range": "Introduceți valoarea portului între 80-65535",
@@ -464,7 +443,6 @@
     "form_add_id": "Adăugați identificator",
     "form_client_name": "Introduceți nume client",
     "name": "Nume",
-    "client_name": "Client {{id}}",
     "client_global_settings": "Folosiți setări globale",
     "client_deleted": "Clientul \"{{key}}\" a fost șters cu succes",
     "client_added": "Clientul \"{{key}}\" a fost adăugat cu succes",
@@ -676,7 +654,7 @@
     "parental_control": "Control Parental",
     "safe_browsing": "Navigare în siguranță",
     "served_from_cache": "{{value}} <i>(furnizat din cache)</i>",
-    "form_error_password_length": "Parola trebuie să aibă între {{min}} și {{max}} caractere",
+    "form_error_password_length": "Parola trebuie să aibă cel puțin {{value}} caractere",
     "anonymizer_notification": "<0>Nota:</0> Anonimizarea IP este activată. Puteți să o dezactivați în <1>Setări generale</1>.",
     "confirm_dns_cache_clear": "Sunteți sigur că doriți să ștergeți memoria cache DNS?",
     "cache_cleared": "Cache-ul DNS a fost golit cu succes",
@@ -737,8 +715,5 @@
     "wednesday_short": "mi",
     "thursday_short": "jo",
     "friday_short": "vi",
-    "saturday_short": "sa",
-    "upstream_dns_cache_configuration": "Configurarea cache-ului DNS în amonte",
-    "enable_upstream_dns_cache": "Activați memoria cache DNS pentru configurația personalizată în amonte a acestui client",
-    "dns_cache_size": "Dimensiunea cache-ului DNS, în octeți"
+    "saturday_short": "sa"
 }

client/src/__locales/ru.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Настройки клиентов",
     "example_upstream_reserved": "DNS-сервер <0>для конкретных доменов</0>;",
-    "example_multiple_upstreams_reserved": "несколько DNS-серверов <0>для конкретных доменов</0>;",
     "example_upstream_comment": "комментарий.",
     "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса.",
     "parallel_requests": "Параллельные запросы",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Ваша система использует динамический IP-адрес для интерфейса <0>{{interfaceName}}</0>. Чтобы использовать DHCP-сервер, необходимо установить статический IP-адрес. Ваш текущий IP-адрес – <0>{{ipAddress}}</0>. Мы автоматически установим его как статический, если вы нажмёте кнопку «Включить DHCP-сервер».",
     "dhcp_lease_added": "Статическая аренда «{{key}}» успешно добавлена",
     "dhcp_lease_deleted": "Статическая аренда «{{key}}» успешно удалена",
-    "dhcp_lease_updated": "Статическая аренда «{{key}}» успешно обновлена",
     "dhcp_new_static_lease": "Новая статическая аренда",
-    "dhcp_edit_static_lease": "Редактирование статической аренды",
     "dhcp_static_leases_not_found": "Не найдено статических аренд DHCP",
     "dhcp_add_static_lease": "Добавить статическую аренду",
     "dhcp_reset_leases": "Сбросить все аренды",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Заблокированные вредоносные и фишинговые сайты",
     "stats_adult": "Заблокированные «взрослые» сайты",
     "stats_query_domain": "Часто запрашиваемые домены",
-    "for_last_hours": "за последний {{count}} час",
-    "for_last_hours_plural": "за последние {{count}} часов",
+    "for_last_24_hours": "за 24 часа",
     "for_last_days": "за последний {{count}} день",
     "for_last_days_plural": "за последние {{count}} дней",
     "stats_disabled": "Статистика отключена. Вы можете включить её на <0>странице настроек</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Нет данных об upstream-серверах",
     "number_of_dns_query_days": "Количество DNS-запросов за последний {{count}} день",
     "number_of_dns_query_days_plural": "Количество DNS запросов, обработанных за последние {{count}} дней",
-    "number_of_dns_query_hours": "Количество DNS-запросов, обработанных за последний {{count}} час",
-    "number_of_dns_query_hours_plural": "Количество DNS-запросов, обработанных за последние {{count}} часов",
+    "number_of_dns_query_24_hours": "Количество DNS-запросов за последние 24 часа",
     "number_of_dns_query_blocked_24_hours": "Количество DNS-запросов, заблокированных фильтрами и блок-списками",
     "number_of_dns_query_blocked_24_hours_by_sec": "Количество DNS-запросов, заблокированных модулем Антифишинга AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Количество заблокированных «сайтов для взрослых»",
     "enforced_save_search": "Применён безопасный поиск",
     "number_of_dns_query_to_safe_search": "Количество запросов DNS для поисковых систем, для которых был применён Безопасный поиск",
     "average_processing_time": "Среднее время обработки запроса",
-    "average_upstream_response_time": "Среднее время ответа upstream-сервера",
-    "response_time": "Время ответа",
+    "processing_time": "Время обработки",
     "average_processing_time_hint": "Среднее время для обработки запроса DNS  в миллисекундах",
     "block_domain_use_filters_and_hosts": "Блокировать домены с использованием фильтров и файлов hosts",
     "filters_block_toggle_hint": "Вы можете настроить правила блокировки в <a>«Фильтрах»</a>.",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "DNS-серверы успешно обновлены",
     "dns_test_ok_toast": "Указанные серверы DNS работают корректно",
     "dns_test_not_ok_toast": "Сервер «{{key}}»: невозможно использовать, проверьте правильность написания",
-    "dns_test_parsing_error_toast": "Раздел {{section}}: строка {{line}}: невозможно использовать, проверьте правильность написания",
     "dns_test_warning_toast": "Upstream «{{key}}» не отвечает на тестовые запросы и может работать некорректно",
     "unblock": "Разблокировать",
     "block": "Заблокировать",
@@ -244,7 +237,6 @@
     "allow_this_client": "Разрешить доступ клиенту",
     "block_for_this_client_only": "Заблокировать только для этого клиента",
     "unblock_for_this_client_only": "Разблокировать только для этого клиента",
-    "add_persistent_client": "Добавить в сохранённые клиенты",
     "time_table_header": "Время",
     "date": "Дата",
     "domain_name_table_header": "Домен",
@@ -291,9 +283,6 @@
     "custom_ip": "Свой IP",
     "blocking_ipv4": "Блокировка IPv4",
     "blocking_ipv6": "Блокировка IPv6",
-    "blocked_response_ttl": "TTL заблокированного ответа",
-    "blocked_response_ttl_desc": "Указывает, в течение скольких секунд клиенты должны кешировать отфильтрованный ответ",
-    "form_enter_blocked_response_ttl": "Введите TTL заблокированного ответа (в секундах)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Использовать указанный IP для EDNS",
     "edns_use_custom_ip_desc": "Разрешить использовать собственный IP для EDNS",
     "rate_limit_desc": "Ограничение на количество запросов в секунду для каждого клиента (0 — неограниченно).",
-    "rate_limit_subnet_len_ipv4": "Длина префикса подсети для IPv4-адресов",
-    "rate_limit_subnet_len_ipv4_desc": "Длина префикса подсети для IPv4-адресов, используемых для ограничения скорости. По умолчанию 24",
-    "rate_limit_subnet_len_ipv4_error": "Длина префикса IPv4-подсетей должна составлять от 0 до 32",
-    "rate_limit_subnet_len_ipv6": "Длина префикса подсети для IPv6-адресов",
-    "rate_limit_subnet_len_ipv6_desc": "Длина префикса подсети для IPv6-адресов, используемых для ограничения скорости. По умолчанию 56",
-    "rate_limit_subnet_len_ipv6_error": "Длина префикса IPv6-подсетей должна составлять от 0 до 128",
-    "form_enter_rate_limit_subnet_len": "Введите длину префикса подсети для ограничения скорости",
-    "rate_limit_whitelist": "Белый список ограничения скорости",
-    "rate_limit_whitelist_desc": "IP-адреса, на которые не распространяется ограничение скорости",
-    "rate_limit_whitelist_placeholder": "Введите по одному адресу на строчку",
     "blocking_ipv4_desc": "IP-адрес, возвращаемый при блокировке A-запроса",
     "blocking_ipv6_desc": "IP-адрес, возвращаемый при блокировке AAAA-запроса",
     "blocking_mode_default": "Стандартный: Отвечает с нулевым IP-адресом, (0.0.0.0 для A; :: для AAAA) когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле файлов hosts",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Имена хостов",
     "encryption_reset": "Вы уверены, что хотите сбросить настройки шифрования?",
     "encryption_warning": "Предупреждение",
-    "encryption_plain_dns_enable": "Включить незашифрованный DNS",
-    "encryption_plain_dns_desc": "Незашифрованный DNS включён по умолчанию. Вы можете отключить его, чтобы заставить все устройства использовать зашифрованный DNS. Для этого необходимо включить хотя бы один зашифрованный протокол DNS",
-    "encryption_plain_dns_error": "Чтобы отключить незашифрованный DNS, включите хотя бы один зашифрованный протокол DNS",
     "topline_expiring_certificate": "Ваш SSL-сертификат скоро истекает. Обновите <0>Настройки шифрования</0>.",
     "topline_expired_certificate": "Ваш SSL-сертификат истёк. Обновите <0>Настройки шифрования</0>.",
     "form_error_port_range": "Введите номер порта из интервала 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Добавить идентификатор",
     "form_client_name": "Введите имя клиента",
     "name": "Имя",
-    "client_name": "Клиент {{id}}",
     "client_global_settings": "Использовать глобальные настройки",
     "client_deleted": "Клиент «{{key}}» успешно удалён",
     "client_added": "Клиент «{{key}}» успешно добавлен",
@@ -678,8 +653,8 @@
     "use_saved_key": "Использовать сохранённый ранее ключ",
     "parental_control": "Родительский контроль",
     "safe_browsing": "Безопасный интернет",
-    "served_from_cache_label": "Получено из кеша",
-    "form_error_password_length": "Пароль должен содержать от {{min}} до {{max}} символов",
+    "served_from_cache": "{{value}} <i>(получено из кеша)</i>",
+    "form_error_password_length": "Пароль должен быть длиной не меньше {{value}} символов",
     "anonymizer_notification": "<0>Внимание:</0> включена анонимизация IP-адресов. Вы можете отключить её в разделе <1>Основные настройки</1>.",
     "confirm_dns_cache_clear": "Вы уверены, что хотите очистить кеш DNS?",
     "cache_cleared": "Кеш DNS успешно очищен",
@@ -740,8 +715,5 @@
     "wednesday_short": "Ср",
     "thursday_short": "Чт",
     "friday_short": "Пт",
-    "saturday_short": "Сб",
-    "upstream_dns_cache_configuration": "Конфигурация кеша upstream DNS-серверов",
-    "enable_upstream_dns_cache": "Включить кеширование для пользовательской конфигурации upstream-серверов этого клиента",
-    "dns_cache_size": "Размер DNS-кеша в байтах"
+    "saturday_short": "Сб"
 }

client/src/__locales/si-lk.json

@@ -122,6 +122,7 @@
     "enforced_save_search": "ආරක්‍ෂිත සෙවීම බලාත්මක කළ",
     "number_of_dns_query_to_safe_search": "ආරක්‍ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
     "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
+    "processing_time": "සැකසුම් කාලය",
     "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
     "block_domain_use_filters_and_hosts": "පෙරහන් හා සත්කාරක ගොනු භාවිතයෙන් වසම් අවහිර කරන්න",
     "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
@@ -208,9 +209,9 @@
     "dns_test_not_ok_toast": "\"{{key}}\" සේවාදායක(ය): භාවිතා කිරීමට නොහැකි විය, ඔබ එය නිවැරදිව ලියා ඇතිදැයි පරීක්‍ෂා කරන්න",
     "unblock": "අනවහිර",
     "block": "අවහිර",
-    "disallow_this_client": "මෙම අනුග්‍රාහකයට ඉඩ නොදෙන්න",
+    "disallow_this_client": "මෙම අනුග්‍රාහකයට නොඉඩ දෙන්න",
     "allow_this_client": "මෙම අනුග්‍රාහකයට ඉඩ දෙන්න",
-    "block_for_this_client_only": "මෙම අනුග්‍රාහකයට අවහිර කරන්න",
+    "block_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අවහිර කරන්න",
     "unblock_for_this_client_only": "මෙම අනුග්‍රාහකයට පමණක් අනවහිර කරන්න",
     "time_table_header": "වේලාව",
     "date": "දිනය",
@@ -646,20 +647,6 @@
     "log_and_stats_section_label": "විමසුම් සටහන හා සංඛ්‍යාලේඛන",
     "ignore_query_log": "විමසුම් සටහනට මෙම අනුග්‍රාහකය යොදන්න එපා",
     "ignore_statistics": "සංඛ්‍යාලේඛනයට මෙම අනුග්‍රාහකය යොදන්න එපා",
-    "schedule_invalid_select": "ආරම්භක වේලාව අවසන් වේලාවට කලින් විය යුතුය",
-    "schedule_select_days": "දවස් තෝරන්න",
-    "schedule_timezone": "වේලා කලාපයක් තෝරන්න",
-    "schedule_current_timezone": "වත්මන් වේලා කලාපය: {{value}}",
-    "schedule_time_all_day": "දවස පුරාම",
-    "schedule_from": "සිට",
-    "schedule_to": "දක්වා",
-    "sunday": "ඉරිදා",
-    "monday": "සඳුදා",
-    "tuesday": "අඟහරුවාදා",
-    "wednesday": "බදාදා",
-    "thursday": "බ්‍රහස්පතින්දා",
-    "friday": "සිකුරාදා",
-    "saturday": "සෙනසුරාදා",
     "sunday_short": "ඉරිදා",
     "monday_short": "සඳුදා",
     "tuesday_short": "අඟහ",

client/src/__locales/sk.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Nastavenie klienta",
     "example_upstream_reserved": "upstream <0>pre konkrétne domény</0>;",
-    "example_multiple_upstreams_reserved": "viaceré upstreamy pre <0>konkrétne domény</0>;",
     "example_upstream_comment": "komentár.",
     "upstream_parallel": "Používať paralelné dopyty na zrýchlenie súčasným dopytovaním všetkých upstream serverov súčasne.",
     "parallel_requests": "Paralelné dopyty",
@@ -26,7 +25,7 @@
     "enabled_dhcp": "DHCP server zapnutý",
     "disabled_dhcp": "DHCP server vypnutý",
     "unavailable_dhcp": "DHCP nie je dostupné",
-    "unavailable_dhcp_desc": "AdGuard Home nemôže vo Vašom OS prevádzkovať DHCP server",
+    "unavailable_dhcp_desc": "AdGuard Home nemôže vo vašom OS prevádzkovať DHCP server",
     "dhcp_title": "DHCP server (experimentálne!)",
     "dhcp_description": "Ak Váš smerovač neposkytuje možnosť nastaviť DHCP, môžete použiť vlastný zabudovaný DHCP server AdGuard.",
     "dhcp_enable": "Zapnúť DHCP server",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Váš systém používa pre rozhranie <0>{{interfaceName}}</0> dynamickú konfiguráciu IP adresy. Aby bolo možné používať DHCP server, musí byť nastavená statická IP adresa. Vaša aktuálna IP adresa je <0>{{ipAddress}}</0>. ak Ak stlačíte tlačidlo \"Povoliť DHCP server\", AdGuard Home automaticky nastaví túto IP adresu ako statickú.",
     "dhcp_lease_added": "Statický  \"{{key}}\" prenájmu bol úspešne pridaný",
     "dhcp_lease_deleted": "Statický \"{{key}}\" prenájmu bol úspešne vymazaný",
-    "dhcp_lease_updated": "Statický prenájom \"{{key}}\" bol úspešne aktualizovaný",
     "dhcp_new_static_lease": "Nový statický prenájom",
-    "dhcp_edit_static_lease": "Upraviť statický prenájom",
     "dhcp_static_leases_not_found": "Nebol nájdený žiadny statický DHCP prenájom",
     "dhcp_add_static_lease": "Pridať statický prenájom",
     "dhcp_reset_leases": "Resetovať všetky prenájmy",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blokovaný škodlivý kód/pokus o podvod",
     "stats_adult": "Blokovaná stránka pre dospelých",
     "stats_query_domain": "Najčastejšie dopytované domény",
-    "for_last_hours": "za poslednú {{count}} hodinu",
-    "for_last_hours_plural": "za posledné {{count}} hodiny|za posledných {{count}} hodín",
+    "for_last_24_hours": "za posledných 24 hodín",
     "for_last_days": "za posledný {{count}} deň",
     "for_last_days_plural": "za posledných {{count}} dní",
     "stats_disabled": "Štatistiky boli vypnuté. Môžete ich zapnúť na <0>stránke nastavení</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nenašli sa žiadne údaje o upstream serveroch",
     "number_of_dns_query_days": "Počet DNS dopytov spracovaných za posledný {{count}} deň",
     "number_of_dns_query_days_plural": "Počet DNS dopytov spracovaných za posledných {{count}} dní",
-    "number_of_dns_query_hours": "Počet DNS dopytov spracovaných za poslednú {{count}} hodinu",
-    "number_of_dns_query_hours_plural": "Počet DNS dopytov spracovaných za posledné {{count}} hodiny)|Počet DNS dopytov spracovaných za posledných {{count}} hodín",
+    "number_of_dns_query_24_hours": "Počet DNS dopytov spracovaných za posledných 24 hodín",
     "number_of_dns_query_blocked_24_hours": "Počet DNS dopytov zablokovaných filtrami reklamy a zoznamami blokovaných hostov",
     "number_of_dns_query_blocked_24_hours_by_sec": "Počet DNS dopytov zablokovaných AdGuard modulom Bezpečné prehliadanie",
     "number_of_dns_query_blocked_24_hours_adult": "Počet zablokovaných stránok pre dospelých",
     "enforced_save_search": "Vynútené bezpečné vyhľadávanie",
     "number_of_dns_query_to_safe_search": "Počet DNS dopytov na vyhľadávače, pri ktorých bolo vynútené bezpečné vyhľadávanie",
     "average_processing_time": "Priemerný čas spracovania",
-    "average_upstream_response_time": "Priemerný čas odozvy upstreamu",
-    "response_time": "Čas odozvy",
+    "processing_time": "Doba spracovania",
     "average_processing_time_hint": "Priemerný čas spracovania DNS dopytu v milisekundách",
     "block_domain_use_filters_and_hosts": "Blokovať domény pomocou filtrov a zoznamov adries",
     "filters_block_toggle_hint": "Pravidlá blokovania môžete nastaviť v nastaveniach <a>Filtre</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Sekcia {{section}}: riadok {{line}}: nepodarilo sa použiť, skontrolujte, či ste ho napísali správne",
     "dns_test_warning_toast": "Upstream \"{{key}}\" neodpovedá na testovacie dopyty a nemusí fungovať správne",
     "unblock": "Odblokovať",
     "block": "Blokovať",
@@ -244,7 +237,6 @@
     "allow_this_client": "Povoliť tohto klienta",
     "block_for_this_client_only": "Blokovať len pre tohto klienta",
     "unblock_for_this_client_only": "Odblokovať len pre tohto klienta",
-    "add_persistent_client": "Pridať ako trvalého klienta",
     "time_table_header": "Čas",
     "date": "Dátum",
     "domain_name_table_header": "Meno domény",
@@ -291,9 +283,6 @@
     "custom_ip": "Vlastná IP adresa",
     "blocking_ipv4": "Blokovanie IPv4",
     "blocking_ipv6": "Blokovanie IPv6",
-    "blocked_response_ttl": "Blokovaná odozva TTL",
-    "blocked_response_ttl_desc": "Určuje, na koľko sekúnd by mali klienti uložiť filtrovanú odozvu do vyrovnávacej pamäte",
-    "form_enter_blocked_response_ttl": "Zadajte TTL blokovanej odozve (sekundy)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Použiť vlastnú IP adresu pre EDNS",
     "edns_use_custom_ip_desc": "Povoliť používanie vlastnej IP adresy pre EDNS",
     "rate_limit_desc": "Počet požiadaviek za sekundu, ktoré môže jeden klient vykonať. Nastavenie na hodnotu 0 znamená neobmedzene.",
-    "rate_limit_subnet_len_ipv4": "Dĺžka prefixu podsiete pre adresy IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Dĺžka prefixu podsiete pre adresy IPv4 používané na obmedzenie rýchlosti. Predvolená hodnota je 24",
-    "rate_limit_subnet_len_ipv4_error": "Dĺžka prefixu podsiete IPv4 musí byť od 0 do 32",
-    "rate_limit_subnet_len_ipv6": "Dĺžka prefixu podsiete pre adresy IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Dĺžka prefixu podsiete pre adresy IPv6 používané na obmedzenie rýchlosti. Predvolená hodnota je 56",
-    "rate_limit_subnet_len_ipv6_error": "Dĺžka prefixu podsiete IPv6 musí byť od 0 do 128",
-    "form_enter_rate_limit_subnet_len": "Zadajte dĺžku prefixu podsiete pre obmedzenie rýchlosti",
-    "rate_limit_whitelist": "Zoznam povolení obmedzujúcich rýchlosť",
-    "rate_limit_whitelist_desc": "IP adresy vylúčené z obmedzenia rýchlosti",
-    "rate_limit_whitelist_placeholder": "Na každý riadok zadajte IP adresu jedného servera",
     "blocking_ipv4_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti A",
     "blocking_ipv6_desc": "IP adresa, ktorá sa má vrátiť v prípade blokovanej žiadosti AAAA",
     "blocking_mode_default": "Predvolené: Odpovedať nulovou adresou IP (0,0.0.0 pre A; :: pre AAAA), keď je blokovaná pravidlom v štýle Adblock; odpovedať IP adresou uvedenou v pravidle, keď je blokovaná pravidlom v štýle /etc/hosts",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Názvy hostiteľov",
     "encryption_reset": "Naozaj chcete obnoviť nastavenia šifrovania?",
     "encryption_warning": "Varovanie",
-    "encryption_plain_dns_enable": "Zapnúť jednoduchý DNS",
-    "encryption_plain_dns_desc": "Jednoduchý DNS je predvolene zapnutý. Môžete ho vypnúť, aby ste prinútili všetky zariadenia používať šifrovaný DNS. Ak to chcete urobiť, musíte zapnúť aspoň jeden šifrovaný DNS protokol",
-    "encryption_plain_dns_error": "Ak chcete vypnúť jednoduchý DNS protokol, zapnite aspoň jeden šifrovaný DNS protokol",
     "topline_expiring_certificate": "Váš SSL certifikát čoskoro vyprší. Aktualizujte <0>Nastavenia šifrovania</0>.",
     "topline_expired_certificate": "Váš SSL certifikát vypršal. Aktualizujte <0>Nastavenia šifrovania</0>.",
     "form_error_port_range": "Zadajte číslo portu v rozsahu 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Pridajte identifikátor",
     "form_client_name": "Zadajte meno klienta",
     "name": "Meno",
-    "client_name": "Klient {{id}}",
     "client_global_settings": "Použiť globálne nastavenia",
     "client_deleted": "\"{{key}}\" klienta bol úspešne vymazaný",
     "client_added": "\"{{key}}\" klienta bol úspešne pridaný",
@@ -678,8 +653,8 @@
     "use_saved_key": "Použiť predtým uložený kľúč",
     "parental_control": "Rodičovská kontrola",
     "safe_browsing": "Bezpečné prehliadanie",
-    "served_from_cache_label": "Prevzaté z cache pamäte",
-    "form_error_password_length": "Heslo musí mať od {{min}} do {{max}} znakov",
+    "served_from_cache": "{{value}} <i>(prevzatá z cache pamäte)</i>",
+    "form_error_password_length": "Heslo musí mať dĺžku aspoň {{value}} znakov",
     "anonymizer_notification": "<0>Poznámka:</0> Anonymizácia IP je zapnutá. Môžete ju vypnúť vo <1>Všeobecných nastaveniach</1>.",
     "confirm_dns_cache_clear": "Naozaj chcete vymazať vyrovnávaciu pamäť DNS?",
     "cache_cleared": "Vyrovnávacia pamäť DNS bola úspešne vymazaná",
@@ -740,8 +715,5 @@
     "wednesday_short": "Str",
     "thursday_short": "Štr",
     "friday_short": "Pia",
-    "saturday_short": "Sob",
-    "upstream_dns_cache_configuration": "Konfigurácia cache pamäte DNS pre upstream",
-    "enable_upstream_dns_cache": "Zapnúť ukladanie DNS do cache pamäte pre vlastnú konfiguráciu odosielania tohto klienta",
-    "dns_cache_size": "Veľkosť cache pamäte DNS v bajtoch"
+    "saturday_short": "Sob"
 }

client/src/__locales/sl.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Nastavitve odjemalca",
     "example_upstream_reserved": "gorvodni <0>za določene domene</0>;",
-    "example_multiple_upstreams_reserved": "več gorvodnih <0>za določene domene</0>;",
     "example_upstream_comment": "komentar.",
     "upstream_parallel": "Uporabite vzporedne zahteve za pospešitev reševanja s hkratnim poizvedovanjem vseh gorvodnih strežnikov.",
     "parallel_requests": "Vzporedne zahteve",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Vaš sistem uporablja dinamično nastavitev naslova IP kartice <0>{{interfaceName}}</0>. Za uporabo strežnika DHCP morate nastaviti statični naslov IP. Vaš trenutni naslov IP je<0>{{ipAddress}}</0>. AdGuard Home bo samodejno nastavil ta naslov IP kot statičen, če pritisnete gumb 'Omogoči strežnik DHCP'.",
     "dhcp_lease_added": "Statičen najem \"{{key}}\" je uspešno dodan",
     "dhcp_lease_deleted": "Statičen najem \"{{key}}\" je uspešno izbrisan",
-    "dhcp_lease_updated": "Statični najem \"{{key}}\" je uspešno posodobljen",
     "dhcp_new_static_lease": "Nov statični najem",
-    "dhcp_edit_static_lease": "Uredi statični najem",
     "dhcp_static_leases_not_found": "Ni najdenih statičnih najemov DHCP",
     "dhcp_add_static_lease": "Dodaj statičen najem",
     "dhcp_reset_leases": "Ponastavi vse najeme",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Onemogočeno zlonamernih programov/lažnih predstavljanj",
     "stats_adult": "Onemogočeno spletnih strani za odrasle",
     "stats_query_domain": "Najbolj poizvedovane domene",
-    "for_last_hours": "za zadnjo {{count}} uro",
-    "for_last_hours_plural": "za zadnjih {{count}} ur",
+    "for_last_24_hours": "v zadnjih 24 urah",
     "for_last_days": "zadnjega {{count}} dne",
     "for_last_days_plural": "zadnjih {{count}} dni",
     "stats_disabled": "Statistika je onemogočena. Vklopite ga lahko na <0>strani z nastavitvami</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Ni podatkov o gorvodnih strežnikih",
     "number_of_dns_query_days": "Število obdelanih poizvedb DNS v zadnjem {{count}} dnevu",
     "number_of_dns_query_days_plural": "Število obdelanih poizvedb DNS v zadnjih {{count}} dneh",
-    "number_of_dns_query_hours": "Število poizvedb DNS, obdelanih v zadnji {{count}} uri",
-    "number_of_dns_query_hours_plural": "Število poizvedb DNS, obdelanih v zadnjih {{count}} urah",
+    "number_of_dns_query_24_hours": "Število obdelanih poizvedb DNS v zadnjih 24 urah",
     "number_of_dns_query_blocked_24_hours": "Število zahtev DNS, ki so jih onemogočili filtri za zaviranje oglasov in seznami nedovoljenih, gostiteljev",
     "number_of_dns_query_blocked_24_hours_by_sec": "Število zahtev DNS, ki jih je blokiral AdGuard zaščitni modul brskanja",
     "number_of_dns_query_blocked_24_hours_adult": "Število onemogočenih spletnih strani za odrasle",
     "enforced_save_search": "Prisilno varno iskanje",
     "number_of_dns_query_to_safe_search": "Število zahtev DNS za iskalnike, za katere je bilo uveljavljeno varno iskanje",
     "average_processing_time": "Povprečni čas obdelave",
-    "average_upstream_response_time": "Povprečni gorvodni odzivni čas",
-    "response_time": "Odzivni čas",
+    "processing_time": "Čas obdelave",
     "average_processing_time_hint": "Povprečni čas v milisekundah pri obdelavi zahteve DNS",
     "block_domain_use_filters_and_hosts": "Onemogoči domene s filtri in gostiteljskimi datotekami",
     "filters_block_toggle_hint": "Pravila zaviranja lahko nastavite v nastavitvah <a>Filtri</a>.",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "Razdelek {{section}}: vrstica {{line}}: ni bilo mogoče uporabiti, preverite, ali ste ga pravilno zapisali",
     "dns_test_warning_toast": "Upstream \"{{key}}\" se ne odziva na testne zahteve in morda ne deluje pravilno",
     "unblock": "Omogoči",
     "block": "Onemogoči",
@@ -244,7 +237,6 @@
     "allow_this_client": "Dovoli tega odjemalca",
     "block_for_this_client_only": "Onemogoči samo za tega odjemalca",
     "unblock_for_this_client_only": "Omogoči samo za tega odjemalca",
-    "add_persistent_client": "Dodaj kot vztrajnega odjemalca",
     "time_table_header": "Čas",
     "date": "Datum",
     "domain_name_table_header": "Ime domene",
@@ -291,9 +283,6 @@
     "custom_ip": "IP po meri",
     "blocking_ipv4": "Onemogočanje IPv4",
     "blocking_ipv6": "Onemogočanje IPv6",
-    "blocked_response_ttl": "Zaviran odziv TTL",
-    "blocked_response_ttl_desc": "Določa, koliko sekund naj odjemalci predpomnijo filtrirane odgovore",
-    "form_enter_blocked_response_ttl": "Vnesite TTL zaviranega odgovora (sekunde)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-prek-HTTPS",
     "dns_over_tls": "DNS-prek-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Uporabi IP po meri za EDNS",
     "edns_use_custom_ip_desc": "Dovoli uporabo naslova IP po meri za EDNS",
     "rate_limit_desc": "Dovoljeno število zahtev na sekundo na odjemalca. Nastavitev na 0 pomeni brez omejitve.",
-    "rate_limit_subnet_len_ipv4": "Dolžina predpone podomrežja za naslove IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Dolžina predpone podomrežja za naslove IPv4, ki se uporabljajo za omejevanje hitrosti. Privzeto je 24",
-    "rate_limit_subnet_len_ipv4_error": "Dolžina predpone podomrežja IPv4 mora biti med 0 in 32",
-    "rate_limit_subnet_len_ipv6": "Dolžina predpone podomrežja za naslove IPv4",
-    "rate_limit_subnet_len_ipv6_desc": "Dolžina predpone podomrežja za naslove IPv6, ki se uporabljajo za omejevanje hitrosti. Privzeta vrednost je 56",
-    "rate_limit_subnet_len_ipv6_error": "Dolžina podomrežne predpone IPv6 mora biti med 0 in 128",
-    "form_enter_rate_limit_subnet_len": "Vnesite dolžino predpone podomrežja za omejitev hitrosti",
-    "rate_limit_whitelist": "Seznam dovoljenih za omejevanje hitrosti",
-    "rate_limit_whitelist_desc": "Naslovi IP so izključeni iz omejitve hitrosti",
-    "rate_limit_whitelist_placeholder": "Vnesite en naslov IP na vrstico",
     "blocking_ipv4_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo A",
     "blocking_ipv6_desc": "IP naslov, ki mora biti vrnjen za onemogočeno zahtevo AAAA",
     "blocking_mode_default": "Privzeto: odgovori z ničelnim naslovom IP (0.0.0.0 za A; :: za AAAA), ko je onemogočen s pravilom v slogu Adblocka; odgovor z naslovom IP, določenim v pravilu, ko je onemogočen s pravilom /etc/hosts",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Imena gostiteljev",
     "encryption_reset": "Ali ste prepričani, da želite ponastaviti nastavitve šifriranja?",
     "encryption_warning": "Opozorilo",
-    "encryption_plain_dns_enable": "Omogoči navaden DNS",
-    "encryption_plain_dns_desc": "Navaden DNS je privzeto omogočen. Lahko ga onemogočite, da vse naprave prisilite k uporabi šifriranega DNS-ja. Če želite to narediti, morate omogočiti vsaj en šifriran protokol DNS",
-    "encryption_plain_dns_error": "Da onemogočite navaden DNS, omogočite vsaj en šifriran protokol DNS",
     "topline_expiring_certificate": "Vaš e digitalno potrdilo SSL bo kmalu poteklol. Posodobite <0>Nastavitve šifriranja</0>.",
     "topline_expired_certificate": "Vaše digitalno potrdilo SSL je poteklo. Posodobi <0>Nastavitve šifriranja</0>.",
     "form_error_port_range": "Vnesite številko vrat v razponu med 80-65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Dodaj identifikatorja",
     "form_client_name": "Vnesite ime odjemalca",
     "name": "Ime",
-    "client_name": "Odjemalec {{id}}",
     "client_global_settings": "Uporabi splošne nastavitve",
     "client_deleted": "Odjemalec \"{{key}}\" je bil uspešno izbrisan",
     "client_added": "Odjemalec \"{{key}}\" je bil uspešno dodan",
@@ -678,8 +653,8 @@
     "use_saved_key": "Uporabi prej shranjeni ključ",
     "parental_control": "Starševski nadzor",
     "safe_browsing": "Varno brskanje",
-    "served_from_cache_label": "Dostavljeno iz predpomnilnika",
-    "form_error_password_length": "Geslo mora vsebovati od {{min}} do {{max}} znakov",
+    "served_from_cache": "{{value}} <i>(postreženo iz predpomnilnika)</i>",
+    "form_error_password_length": "Geslo mora vsebovati najmanj {{value}} znakov",
     "anonymizer_notification": "<0>Opomba:</0> Anonimizacija IP je omogočena. Onemogočite ga lahko v <1>Splošnih nastavitvah</1>.",
     "confirm_dns_cache_clear": "Ali ste prepričani, da želite počistiti predpomnilnik DNS?",
     "cache_cleared": "Predpomnilnik DNS je bil uspešno počiščen",
@@ -740,8 +715,5 @@
     "wednesday_short": "Sre",
     "thursday_short": "Čet",
     "friday_short": "Pet",
-    "saturday_short": "Sob",
-    "upstream_dns_cache_configuration": "Nastavitve predpomnilnika gorvodnega DNS",
-    "enable_upstream_dns_cache": "Omogoči predpomnjenje nastavitev gorvodnega DNS po meri tega odjemalca",
-    "dns_cache_size": "Velikost predpomnilnika DNS, v bajtih"
+    "saturday_short": "Sob"
 }

client/src/__locales/sr-cs.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Postavke klijenta",
     "example_upstream_reserved": "upstream <0>za određene domene</0>;",
-    "example_multiple_upstreams_reserved": "nekoliko DNS servera <0>za određene domene</0>;",
     "example_upstream_comment": "komentar.",
     "upstream_parallel": "Koristite paralelne upite da biste ubrzali rešavanje tako što ćete istovremeno ispitati sve uzvodne servere.",
     "parallel_requests": "Paralelni zahtevi",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Vaš sistem koristi dinamičku IP adresu za okruženje <0>{{interfaceName}}</0>. Kako biste koristili DHCP server, morate podesiti statičku IP adresu. Vaša trenutna IP adresa je <0>{{ipAddress}}</0>. Automatski ćemo podesiti ovu IP adresu kao statičku ako pritisnete Uključi DHCP dugme.",
     "dhcp_lease_added": "Statičko iznajmljivanje \"{{key}}\" uspešno dodato",
     "dhcp_lease_deleted": "Statičko iznajmljivanje lease \"{{key}}\" uspešno izbrisano",
-    "dhcp_lease_updated": "Statičko iznajmljivanje \"{{key}}\" ažurirano",
     "dhcp_new_static_lease": "Novo statičko iznajmljivanje",
-    "dhcp_edit_static_lease": "Uređivanje statičkog iznajmljivanja",
     "dhcp_static_leases_not_found": "Nisu pronađena statička DHCP iznajmljivanja",
     "dhcp_add_static_lease": "Dodaj statičko iznajmljivanje",
     "dhcp_reset_leases": "Resetuj sva unajmljivanja",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blokiraj štetan softver i fišing",
     "stats_adult": "Blokiraj sajtove za odrasle",
     "stats_query_domain": "Najčešće unošeni domeni",
-    "for_last_hours": "u poslednjih {{count}} sat",
-    "for_last_hours_plural": "u poslednjih {{count}} sati",
+    "for_last_24_hours": "u poslednja 24 časa",
     "for_last_days": "u poslednjih {{count}} dana",
     "for_last_days_plural": "u poslednjih {{count}} dana",
     "stats_disabled": "Statistika je isključena. Možete ga uključiti sa stranice <0>sa postavkama</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Nema podataka o upstream serverima",
     "number_of_dns_query_days": "Broj obrađenih DNS unosa u poslednjih {{count}} dan",
     "number_of_dns_query_days_plural": "Broj obrađenih DNS unosa u poslednjih {{count}} dana",
-    "number_of_dns_query_hours": "Broj obrađenih DNS unosa u poslednji {{count}} sat",
-    "number_of_dns_query_hours_plural": "Broj obrađenih DNS unosa u poslednjih {{count}} sati",
+    "number_of_dns_query_24_hours": "Broj obrađenih DNS unosa u poslednja 24 časa",
     "number_of_dns_query_blocked_24_hours": "Broj DNS zahteva blokiranih od filtera blokatora reklama i blok liste hostova",
     "number_of_dns_query_blocked_24_hours_by_sec": "Broj DNS zahteva blokiranih od AdGuard-ovog podprograma za bezbedno pregledanje",
     "number_of_dns_query_blocked_24_hours_adult": "Broj blokiranih sajtova za odrasle",
     "enforced_save_search": "Nametni sigurno pretraživanje",
     "number_of_dns_query_to_safe_search": "Broj DNS zahteva ka pretraživačima za koje je nametnuto sigurno pretraživanje",
     "average_processing_time": "Prosečno vreme obrade",
-    "average_upstream_response_time": "Prosečno vreme odziva upstream-servera",
-    "response_time": "Vreme odziva",
+    "processing_time": "Vreme obrade",
     "average_processing_time_hint": "Prosečno vreme u milisekundama za obradu DNS zahteva",
     "block_domain_use_filters_and_hosts": "Blokiraj domene koristeći filtere i hosts datoteke",
     "filters_block_toggle_hint": "Možete postaviti pravila blokiranja u <a>Filters</a> postavkama.",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "Upstream serveri su uspešno sačuvani",
     "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",
-    "dns_test_parsing_error_toast": "Odeljak {{section}}: linija {{line}}: ne može se koristiti, molimo proverite da li ste ga ispravno napisali",
     "dns_test_warning_toast": "Apstrim \"{{key}}\" ne odgovara na zahteve za testiranje i možda neće raditi kako treba",
     "unblock": "Odblokiraj",
     "block": "Blokiraj",
@@ -244,7 +237,6 @@
     "allow_this_client": "Dozvoli ovaj klijent",
     "block_for_this_client_only": "Blokiraj samo za ovaj klijent",
     "unblock_for_this_client_only": "Odblokiraj samo za ovaj klijent",
-    "add_persistent_client": "Dodati u sačuvane klijente",
     "time_table_header": "Vreme",
     "date": "Datum",
     "domain_name_table_header": "Ime domena",
@@ -291,9 +283,6 @@
     "custom_ip": "Prilagođeni IP",
     "blocking_ipv4": "Blokiranje IPv4",
     "blocking_ipv6": "Blokiranje IPv6",
-    "blocked_response_ttl": "TTL blokiranog odgovora",
-    "blocked_response_ttl_desc": "Određuje koliko sekundi klijenti treba da keširaju filtrirani odgovor",
-    "form_enter_blocked_response_ttl": "Unesite TTL blokiranog odgovora (sekunde)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Koristi prilagođeni IP za EDNS",
     "edns_use_custom_ip_desc": "Dozvoli korišćenje prilagođenog IP-a za EDNS",
     "rate_limit_desc": "Broj zahteva u sekundi dozvoljen po klijentu. Postavljanje na 0 znači da nema ograničenja.",
-    "rate_limit_subnet_len_ipv4": "Dužina prefixa podmreže za IPv4 adrese",
-    "rate_limit_subnet_len_ipv4_desc": "Dužina prefixa podmreže za IPv4 adrese koje se koriste za ograničavanje brzine. Podrazumevano je 24",
-    "rate_limit_subnet_len_ipv4_error": "Dužina prefixa IPv4 podmreže treba da bude između 0 i 32",
-    "rate_limit_subnet_len_ipv6": "Dužina prefixa podmreže za IPv6 adrese",
-    "rate_limit_subnet_len_ipv6_desc": "Dužina prefixa podmreže za IPv6 adrese koje se koriste za ograničavanje brzine. Podrazumevano je 56",
-    "rate_limit_subnet_len_ipv6_error": "Dužina prefixa IPv6 podmreže treba da bude između 0 i 128",
-    "form_enter_rate_limit_subnet_len": "Unesite dužinu prefixa podmreže da biste ograničili brzinu",
-    "rate_limit_whitelist": "Lista dozvoljenih lista za ograničavanje brzine",
-    "rate_limit_whitelist_desc": "IP adrese koje nisu obuhvaćene ograničenjem brzine",
-    "rate_limit_whitelist_placeholder": "Unesite jednu IP adresu servera po redu",
     "blocking_ipv4_desc": "IP adresa koja će biti vraćena za blokirane zahteve",
     "blocking_ipv6_desc": "IP adresa koja će biti vraćena za blokirane AAAA zahteve",
     "blocking_mode_default": "Podrazumevano: Odgovara sa REFUSED kada je blokirano od Adblock-style pravila; odgovara sa IP adresom koja je određena u pravilu kada je blokiran od /etc/hosts-style pravila",
@@ -464,7 +443,6 @@
     "form_add_id": "Dodaj identifikator",
     "form_client_name": "Unesite ime klijenta",
     "name": "Ime",
-    "client_name": "Klijent {{id}}",
     "client_global_settings": "Koristi globalne postavke",
     "client_deleted": "Klijent \"{{key}}\" uspešno izbrisan",
     "client_added": "Klijent \"{{key}}\" uspešno dodat",
@@ -676,7 +654,7 @@
     "parental_control": "Roditeljska kontrola",
     "safe_browsing": "Sigurno pregledanje",
     "served_from_cache": "{{value}} <i>(posluženo iz predmemorije)</i>",
-    "form_error_password_length": "Lozinka mora imati od {{min}} do {{max}} znakova",
+    "form_error_password_length": "Lozinka mora imati najmanje {{value}} znakova",
     "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>.",
     "confirm_dns_cache_clear": "Želite li zaista da obrišite DNS keš?",
     "cache_cleared": "DNS keš je uspešno očišćen",
@@ -737,8 +715,5 @@
     "wednesday_short": "Sre",
     "thursday_short": "Čet",
     "friday_short": "Pet",
-    "saturday_short": "Sub",
-    "upstream_dns_cache_configuration": "Konfiguracija keša upstream DNS servera",
-    "enable_upstream_dns_cache": "Uključite keširanje za korisničku konfiguraciju upstream servera ovog klijenta",
-    "dns_cache_size": "Veličina DNS keša, u bajtovima"
+    "saturday_short": "Sub"
 }

client/src/__locales/sv.json

@@ -1,8 +1,7 @@
 {
     "client_settings": "Klientinställningar",
     "example_upstream_reserved": "uppström <0>för en specifik domän</0>;",
-    "example_multiple_upstreams_reserved": "flera uppströmsservrar <0>för specifika domäner</0>;",
-    "example_upstream_comment": "en kommentar.",
+    "example_upstream_comment": "du kan ange en kommentar.",
     "upstream_parallel": "Använd parallella förfrågningar för att snabba upp dessa genom att fråga alla uppströmsservrar samtidigt.",
     "parallel_requests": "Parallella förfrågningar",
     "load_balancing": "Lastbalansering",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Din enhet använder en dynamisk IP-adress för gränssnittet <0>{{interfaceName}}</0>. För att kunna använda DHCP-servern behövs en statisk IP-adress. Din nuvarande IP-adress är <0>{{ipAddress}}</0>. AdGuard Home kommer automatiskt att göra denna IP-adress statisk om du trycker på knappen \"Aktivera DHCP\".",
     "dhcp_lease_added": "Statisk lease \"{{key}}\" har lagts till",
     "dhcp_lease_deleted": "Statisk lease \"{{key}}\" har raderats",
-    "dhcp_lease_updated": "Statiskt lease \"{{key}}\" har uppdaterats",
     "dhcp_new_static_lease": "Ny statisk lease",
-    "dhcp_edit_static_lease": "Redigera statiskt lease",
     "dhcp_static_leases_not_found": "Inga statiska DHCP-leases hittade",
     "dhcp_add_static_lease": "Lägg till statisk lease",
     "dhcp_reset_leases": "Återställ alla leasingavtal",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Blockerad skadekod/phishing",
     "stats_adult": "Blockerade vuxensajter",
     "stats_query_domain": "Mest eftersökta domäner",
-    "for_last_hours": "för den senaste {{count}} timme",
-    "for_last_hours_plural": "för de senaste {{count}} timmar",
+    "for_last_24_hours": "under de senaste 24 timmarna",
     "for_last_days": "för den senaste {{count}} dagen",
     "for_last_days_plural": "för de senaste {{count}} dagarna",
     "stats_disabled": "Statistiken har inaktiverats. Du kan aktivera det från <0>inställningssidan</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Inga uppströmsdata hittades",
     "number_of_dns_query_days": "Antalet DNS-förfrågningar som utfördes under senaste {{count}} dagen",
     "number_of_dns_query_days_plural": "Ett antal DNS förfrågningar utfördes under de senaste {{count}} dagarna",
-    "number_of_dns_query_hours": "Ett antal DNS förfrågningar utfördes för den senaste {{count}} timme",
-    "number_of_dns_query_hours_plural": "Ett antal DNS förfrågningar utfördes för den senaste {{count}} timmar",
+    "number_of_dns_query_24_hours": "Antalet DNS-förfrågningar som utfördes under de senaste 24 timmarna",
     "number_of_dns_query_blocked_24_hours": "Antalet DNS-förfrågningar som blockerades av annonsfilter och värdens blockeringsklistor",
     "number_of_dns_query_blocked_24_hours_by_sec": "Antalet DNS-förfrågningar som blockerades av AdGuards modul för surfsäkerhet",
     "number_of_dns_query_blocked_24_hours_adult": "Antalet vuxensajter som blockerats",
     "enforced_save_search": "Aktivering av Säker surf",
     "number_of_dns_query_to_safe_search": "Antalet DNS-förfrågningar mot sökmotorer där Säker surf tvingats",
     "average_processing_time": "Genomsnittlig processtid",
-    "average_upstream_response_time": "Genomsnittlig svarstid uppströmsserver",
-    "response_time": "Svarstid",
+    "processing_time": "Bearbetningstid",
     "average_processing_time_hint": "Genomsnittlig processtid i millisekunder för DNS-förfrågning",
     "block_domain_use_filters_and_hosts": "Blockera domäner med filter- och värdfiler",
     "filters_block_toggle_hint": "Du kan ställa in egna blockerings regler i <a>Filterinställningar</a>.",
@@ -180,7 +174,6 @@
     "enabled_parental_toast": "Föräldrakontroll inkopplat",
     "disabled_safe_search_toast": "Säker webbsökning bortkopplat",
     "enabled_save_search_toast": "Säker webbsökning inkopplat",
-    "updated_save_search_toast": "Inställningarna för Säker sökning uppdaterade",
     "enabled_table_header": "Inkopplat",
     "name_table_header": "Namn",
     "list_url_table_header": "Lista URL",
@@ -236,7 +229,6 @@
     "updated_upstream_dns_toast": "Sparade 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",
-    "dns_test_parsing_error_toast": "Avsnitt {{section}}: rad {{line}}: kunde inte användas, kontrollera att du har skrivit det korrekt",
     "dns_test_warning_toast": "Uppströms \"{{key}}\" svarar inte på testförfrågningar och kanske inte fungerar korrekt",
     "unblock": "Avblockera",
     "block": "Blockera",
@@ -244,7 +236,6 @@
     "allow_this_client": "Tillåt den här klienten",
     "block_for_this_client_only": "Blockera endast för denna klient",
     "unblock_for_this_client_only": "Avblockera endast för denna klient",
-    "add_persistent_client": "Lägg till som beständig klient",
     "time_table_header": "Tid",
     "date": "Datum",
     "domain_name_table_header": "Domännamn",
@@ -291,9 +282,6 @@
     "custom_ip": "Eget IP",
     "blocking_ipv4": "Blockera IPv4",
     "blocking_ipv6": "Blockera IPv6",
-    "blocked_response_ttl": "TTL för blockerat svar",
-    "blocked_response_ttl_desc": "Anger hur många sekunder klienterna ska cache ett filtrerat svar",
-    "form_enter_blocked_response_ttl": "Ange TTL för blockerat svar (sekunder)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,15 +300,6 @@
     "edns_use_custom_ip": "Använd anpassad IP för EDNS",
     "edns_use_custom_ip_desc": "Tillåt att använda anpassad IP för EDNS",
     "rate_limit_desc": "Antalet förfrågningar per sekund som tillåts per klient. Att sätta den till 0 innebär ingen gräns.",
-    "rate_limit_subnet_len_ipv4": "Prefixlängd för subnät för IPv4-adresser",
-    "rate_limit_subnet_len_ipv4_desc": "Subnätprefixlängd för IPv4-adresser som används för hastighetsbegränsning. Standard är 24",
-    "rate_limit_subnet_len_ipv4_error": "IPv4-subnätets prefixlängd ska vara mellan 0 och 32",
-    "rate_limit_subnet_len_ipv6": "Prefixlängd för subnät för IPv6-adresser",
-    "rate_limit_subnet_len_ipv6_desc": "Subnätprefixlängd för IPv6-adresser som används för hastighetsbegränsning. Standard är 56",
-    "rate_limit_subnet_len_ipv6_error": "IPv6-subnätets prefixlängd ska vara mellan 0 och 128",
-    "form_enter_rate_limit_subnet_len": "Ange subnätprefixlängd för hastighetsbegränsning",
-    "rate_limit_whitelist_desc": "IP-adresser uteslutna från hastighetsbegränsning",
-    "rate_limit_whitelist_placeholder": "Ange en IP-adress per rad",
     "blocking_ipv4_desc": "IP adress som ska returneras för en blockerad A förfrågan",
     "blocking_ipv6_desc": "IP adress som ska returneras för en blockerad AAAA förfrågan",
     "blocking_mode_default": "Standard: Svara med noll IP-adress (0.0.0.0 för A; :: för AAAA) när det blockeras av regel i Adblock-stil; svara med IP-adressen som anges i regeln när den blockeras av regel i /etc/hosts-stil",
@@ -463,7 +442,6 @@
     "form_add_id": "Lägg till identifierare",
     "form_client_name": "Skriv in klientnamn",
     "name": "Namn",
-    "client_name": "Klient {{id}}",
     "client_global_settings": "Använda globala inställningar",
     "client_deleted": "Klient \"{{key}}\" har raderats",
     "client_added": "Klient \"{{key}}\" har lagts till",
@@ -675,7 +653,7 @@
     "parental_control": "Föräldrakontroll",
     "safe_browsing": "Säker surfning",
     "served_from_cache": "{{value}} <i>(levereras från cache)</i>",
-    "form_error_password_length": "Lösenordet måste vara {{min}} till {{max}} tecken långt",
+    "form_error_password_length": "Lösenordet måste vara minst {{value}} tecken långt",
     "anonymizer_notification": "<0>Observera:</0> IP-anonymisering är aktiverad. Du kan inaktivera den i <1>Allmänna inställningar</1>.",
     "confirm_dns_cache_clear": "Är du säker på att du vill rensa DNS-cache?",
     "cache_cleared": "DNS-cacheminnet har rensats",
@@ -691,19 +669,8 @@
     "disable_for_hours": "I {{count}} timme",
     "disable_for_hours_plural": "I {{count}} timmar",
     "disable_until_tomorrow": "Tills imorgon",
-    "disable_notify_for_seconds": "Inaktivera skyddet i {{count}} sekund",
-    "disable_notify_for_seconds_plural": "Inaktivera skyddet i {{count}} sekunder",
-    "disable_notify_for_minutes": "Inaktivera skyddet i {{count}} minut",
-    "disable_notify_for_minutes_plural": "Inaktivera skyddet i {{count}} minuter",
-    "disable_notify_for_hours": "Inaktivera skyddet i {{count}} timme",
-    "disable_notify_for_hours_plural": "Inaktivera skyddet i {{count}} timmar",
-    "disable_notify_until_tomorrow": "Inaktivera skyddet tills imorgon",
-    "enable_protection_timer": "Skyddet kommer att aktiveras i {{time}}",
-    "custom_retention_input": "Ange retention i timmar",
-    "custom_rotation_input": "Ange rotation i timmar",
     "protection_section_label": "Skydd",
     "log_and_stats_section_label": "Förfrågningslogg och statistik",
-    "ignore_query_log": "Ignorera den här klienten i frågeloggen",
     "ignore_statistics": "Ignorera denna kund i statistiken",
     "schedule_services": "Pausa blockering av tjänst",
     "schedule_services_desc": "Konfigurera pausschemat för det tjänsteblockerande filtret",
@@ -736,8 +703,5 @@
     "wednesday_short": "Ons",
     "thursday_short": "Tor",
     "friday_short": "Fre",
-    "saturday_short": "Lör",
-    "upstream_dns_cache_configuration": "Konfiguration av uppströms DNS-cache",
-    "enable_upstream_dns_cache": "Aktivera DNS-cachelagring för den här klientens anpassade uppströmskonfiguration",
-    "dns_cache_size": "DNS-cachestorlek, i byte"
+    "saturday_short": "Lör"
 }

client/src/__locales/tr.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "İstemci ayarları",
     "example_upstream_reserved": "<0>belirli alan adları</0> için bir üst sunucusu;",
-    "example_multiple_upstreams_reserved": "<0>belirli alanlar için</0> birden fazla üst kaynaklar;",
     "example_upstream_comment": "bir yorum.",
     "upstream_parallel": "Tüm üst sunucuları eş zamanlı sorgulayarak çözümlemeyi hızlandırmak için paralel sorgular kullanın.",
     "parallel_requests": "Paralel istekler",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Sisteminiz, <0>{{interfaceName}}</0> arayüzü için dinamik IP adresi yapılandırması kullanıyor. DHCP sunucusunu kullanmak için sabit bir IP adresi ayarlanmalıdır. Geçerli olan IP adresiniz <0>{{ipAddress}}</0>. \"DHCP sunucusunu etkinleştir\" düğmesine basarsanız, AdGuard Home bu IP adresini otomatik bir şekilde sabit olarak ayarlayacaktır.",
     "dhcp_lease_added": "Sabit kiralama \"{{key}}\" başarıyla eklendi",
     "dhcp_lease_deleted": "Sabit kiralama \"{{key}}\" başarıyla silindi",
-    "dhcp_lease_updated": "Statik kiralama \"{{key}}\" başarıyla güncellendi",
     "dhcp_new_static_lease": "Yeni sabit kiralama",
-    "dhcp_edit_static_lease": "Statik kiralamayı düzenle",
     "dhcp_static_leases_not_found": "Sabit DHCP kiralaması bulunamadı",
     "dhcp_add_static_lease": "Sabit kiralama ekle",
     "dhcp_reset_leases": "Tüm kiralamaları sıfırla",
@@ -93,12 +90,12 @@
     "client_details": "İstemci ayrıntıları",
     "details": "Ayrıntılar",
     "back": "Geri",
-    "dashboard": "Pano",
+    "dashboard": "Ana Sayfa",
     "settings": "Ayarlar",
     "filters": "Filtreler",
     "filter": "Filtre",
     "query_log": "Sorgu Günlüğü",
-    "compact": "Sık",
+    "compact": "Yoğun",
     "nothing_found": "Hiçbir şey bulunamadı",
     "faq": "SSS",
     "version": "Sürüm",
@@ -120,8 +117,7 @@
     "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": "Başlıca sorgulanan alan adları",
-    "for_last_hours": "son {{count}} saat için",
-    "for_last_hours_plural": "son {{count}} saat için",
+    "for_last_24_hours": "son 24 saat içindekiler",
     "for_last_days": "son {{count}} gün boyunca",
     "for_last_days_plural": "son {{count}} gün boyunca",
     "stats_disabled": "İstatistikler devre dışı bırakıldı. Bunu, <0>ayarlar sayfasından</0> etkinleştirebilirsiniz.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Üst kaynak verisi bulunamadı",
     "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_hours": "Son {{count}} saat için işlenen DNS sorgularının sayısı",
-    "number_of_dns_query_hours_plural": "Son {{count}} saatiçin 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 hosts 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_upstream_response_time": "Ortalama üst kaynak yanıt süresi",
-    "response_time": "Yanıt süresi",
+    "processing_time": "İş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 hosts dosyalarını kullanarak alan adlarını engelle",
     "filters_block_toggle_hint": "<a>Filtreler</a> ayarlarında engelleme kuralları oluşturabilirsiniz.",
@@ -182,7 +176,7 @@
     "enabled_save_search_toast": "Güvenli Arama etkinleştirildi",
     "updated_save_search_toast": "Güvenli Arama ayarları güncellendi",
     "enabled_table_header": "Etkin",
-    "name_table_header": "Adı",
+    "name_table_header": "Ad",
     "list_url_table_header": "Liste URL'si",
     "rules_count_table_header": "Kural sayısı",
     "last_time_updated_table_header": "Son güncelleme zamanı",
@@ -236,7 +230,6 @@
     "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",
-    "dns_test_parsing_error_toast": "{{section}} bölümü: {{line}}. satır: kullanılamadı, lütfen doğru yazdığınızı kontrol edin",
     "dns_test_warning_toast": "Üst kaynak \"{{key}}\", test isteklerine yanıt vermiyor ve düzgün çalışmayabilir",
     "unblock": "Engeli kaldır",
     "block": "Engelle",
@@ -244,7 +237,6 @@
     "allow_this_client": "Bu istemciye izin ver",
     "block_for_this_client_only": "Yalnızca bu istemci için engelle",
     "unblock_for_this_client_only": "Yalnızca bu istemci için engellemeyi kaldır",
-    "add_persistent_client": "Kalıcı istemci olarak ekle",
     "time_table_header": "Saat",
     "date": "Tarih",
     "domain_name_table_header": "Alan adı",
@@ -291,9 +283,6 @@
     "custom_ip": "Özel IP",
     "blocking_ipv4": "IPv4 engelleme",
     "blocking_ipv6": "IPv6 engelleme",
-    "blocked_response_ttl": "Engellenen yanıt kullanım süresi",
-    "blocked_response_ttl_desc": "İstemcilerin filtrelenmiş bir yanıtı kaç saniye süreyle önbelleğe alması gerektiğini belirtir",
-    "form_enter_blocked_response_ttl": "Engellenen yanıt kullanım süresini girin (saniye)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,19 +301,9 @@
     "edns_use_custom_ip": "EDNS için özel IP kullan",
     "edns_use_custom_ip_desc": "EDNS için özel IP kullanımına izin ver",
     "rate_limit_desc": "İstemci başına izin verilen saniyedeki istek sayısı. 0 olarak ayarlamak, sınır olmadığı anlamına gelir.",
-    "rate_limit_subnet_len_ipv4": "IPv4 adresleri için alt ağ önek uzunluğu",
-    "rate_limit_subnet_len_ipv4_desc": "Hız sınırlaması için kullanılan IPv4 adreslerinin alt ağ önek uzunluğu. Varsayılan 24'tür",
-    "rate_limit_subnet_len_ipv4_error": "IPv4 alt ağ önek uzunluğu 0 ile 32 arasında olmalıdır",
-    "rate_limit_subnet_len_ipv6": "IPv6 adresleri için alt ağ önek uzunluğu",
-    "rate_limit_subnet_len_ipv6_desc": "Hız sınırlaması için kullanılan IPv6 adreslerinin alt ağ önek uzunluğu. Varsayılan 56'tür",
-    "rate_limit_subnet_len_ipv6_error": "IPv6 alt ağ önek uzunluğu 0 ile 128 arasında olmalıdır",
-    "form_enter_rate_limit_subnet_len": "Hız sınırlaması için alt ağ önek uzunluğunu girin",
-    "rate_limit_whitelist": "Hız sınırlama izin listesi",
-    "rate_limit_whitelist_desc": "Hız sınırlamasından hariç tutulan IP adresleri",
-    "rate_limit_whitelist_placeholder": "Her satıra bir IP adresi girin",
     "blocking_ipv4_desc": "Engellenen bir A isteği için geri döndürülecek IP adresi",
     "blocking_ipv6_desc": "Engellenen bir AAAA isteği için geri döndürülecek IP adresi",
-    "blocking_mode_default": "Varsayılan: Reklam engelleme stili kuralı tarafından engellendiğinde sıfır IP adresiyle (A için 0.0.0.0; :: AAAA için) yanıt verin; /etc/hosts-tarzı kural tarafından engellendiğinde, kuralda belirtilen IP adresiyle yanıt verin",
+    "blocking_mode_default": "Varsayılan: Reklam engelleme tarzı kural tarafından engellendiğinde sıfır IP adresiyle (A için 0.0.0.0; :: AAAA için) yanıt verin; /etc/hosts-tarzı kural tarafından engellendiğinde, kuralda belirtilen IP adresiyle yanıt verin",
     "blocking_mode_refused": "REFUSED: REFUSED koduyla yanıt verin",
     "blocking_mode_nxdomain": "NXDOMAIN: NXDOMAIN koduyla yanıt verin",
     "blocking_mode_null_ip": "Boş IP: Sıfır IP adresiyle yanıt verin (A için 0.0.0.0; :: AAAA için)",
@@ -391,7 +370,7 @@
     "install_devices_ios_list_4": "DNS alanına AdGuard Home sunucunuzun adreslerini girin.",
     "get_started": "Başlayın",
     "next": "Sonraki",
-    "open_dashboard": "Panoyu Aç",
+    "open_dashboard": "Ana Sayfayı Aç",
     "install_saved": "Başarıyla kaydedildi",
     "encryption_title": "Şifreleme",
     "encryption_desc": "DNS ve yönetici web arayüzü için şifreleme (HTTPS/TLS) desteği",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Ana makine adları",
     "encryption_reset": "Şifreleme ayarlarını sıfırlamak istediğinizden emin misiniz?",
     "encryption_warning": "Uyarı",
-    "encryption_plain_dns_enable": "Düz DNS'i etkinleştir",
-    "encryption_plain_dns_desc": "Düz DNS varsayılan olarak etkindir. Tüm aygıtları şifrelenmiş DNS kullanmaya zorlamak için bunu devre dışı bırakabilirsiniz. Bunu yapmak için en az bir şifrelenmiş DNS protokolünü etkinleştirmeniz gerekir",
-    "encryption_plain_dns_error": "Düz DNS'i devre dışı bırakmak için en az bir şifrelenmiş DNS protokolünü etkinleştirin",
     "topline_expiring_certificate": "SSL sertifikanızın süresi sona üzere. <0>Şifreleme ayarlarını</0> güncelleyin.",
     "topline_expired_certificate": "SSL sertifikanızın süresi sona erdi. <0>Şifreleme ayarlarını</0> güncelleyin.",
     "form_error_port_range": "80-65535 aralığında geçerli bir bağlantı noktası değeri girin",
@@ -452,7 +428,7 @@
     "settings_global": "Genel",
     "settings_custom": "Özel",
     "table_client": "İstemci",
-    "table_name": "AdAdı",
+    "table_name": "Ad",
     "save_btn": "Kaydet",
     "client_add": "İstemci Ekle",
     "client_new": "Yeni İstemci",
@@ -466,8 +442,7 @@
     "form_enter_id": "Tanımlayıcı girin",
     "form_add_id": "Tanımlayıcı ekle",
     "form_client_name": "İstemci ismi girin",
-    "name": "Adı",
-    "client_name": "İstemci {{id}}",
+    "name": "Ad",
     "client_global_settings": "Genel ayarları kullan",
     "client_deleted": "\"{{key}}\" istemcisi başarıyla silindi",
     "client_added": "\"{{key}}\" istemcisi başarıyla eklendi",
@@ -678,8 +653,8 @@
     "use_saved_key": "Önceden kaydedilmiş anahtarı kullan",
     "parental_control": "Ebeveyn Denetimi",
     "safe_browsing": "Güvenli Gezinti",
-    "served_from_cache_label": "Önbellekten kullanıldı",
-    "form_error_password_length": "Parola {{min}} ila {{max}} karakter uzunluğunda olmalıdır",
+    "served_from_cache": "{{value}} <i>(önbellekten kullanıldı)</i>",
+    "form_error_password_length": "Parola en az {{value}} karakter uzunluğunda olmalıdır",
     "anonymizer_notification": "<0>Not:</0> IP anonimleştirme etkinleştirildi. Bunu <1>Genel ayarlardan</1> devre dışı bırakabilirsiniz.",
     "confirm_dns_cache_clear": "DNS önbelleğini temizlemek istediğinizden emin misiniz?",
     "cache_cleared": "DNS önbelleği başarıyla temizlendi",
@@ -740,8 +715,5 @@
     "wednesday_short": "Çar",
     "thursday_short": "Per",
     "friday_short": "Cum",
-    "saturday_short": "Cmt",
-    "upstream_dns_cache_configuration": "Üst kaynak DNS önbellek yapılandırması",
-    "enable_upstream_dns_cache": "Bu istemcinin özel üst kaynak yapılandırması için DNS önbelleğe almayı etkinleştir",
-    "dns_cache_size": "DNS önbellek boyutu, bayt cinsinden"
+    "saturday_short": "Cmt"
 }

client/src/__locales/uk.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Налаштування клієнта",
     "example_upstream_reserved": "DNS-сервер <0>для певних доменів</0>;",
-    "example_multiple_upstreams_reserved": "кілька DNS-серверів <0>для конкретних доменів</0>;",
     "example_upstream_comment": "коментар.",
     "upstream_parallel": "Використовувати паралельні запити, щоб пришвидшити вирішення одночасною чергою всіх оригінальних серверів.",
     "parallel_requests": "Паралельні запити",
@@ -74,9 +73,7 @@
     "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_lease_updated": "Статичну оренду \"{{key}}\" успішно оновлено",
     "dhcp_new_static_lease": "Нова статична оренда",
-    "dhcp_edit_static_lease": "Редагувати статичну оренду",
     "dhcp_static_leases_not_found": "Не знайдено статичних оренд DHCP",
     "dhcp_add_static_lease": "Додати статичну оренду",
     "dhcp_reset_leases": "Скинути всі аренди",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Заблоковано зловмисних/шахрайських програм",
     "stats_adult": "Заблоковано вебсайтів для дорослих",
     "stats_query_domain": "Найчастіші запити доменів",
-    "for_last_hours": "за останню {{count}} годину",
-    "for_last_hours_plural": "за останні {{count}} годин",
+    "for_last_24_hours": "за останні 24 години",
     "for_last_days": "за останній {{count}} день",
     "for_last_days_plural": "за останні {{count}} днів",
     "stats_disabled": "Статистику вимкнено. Ви можете увімкнути її на <0>сторінці налаштувань</0>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Немає даних про upstream-сервери",
     "number_of_dns_query_days": "Кількість DNS-запитів, оброблених за останні {{count}} дні",
     "number_of_dns_query_days_plural": "Кількість DNS-запитів, оброблених за останні {{count}} днів",
-    "number_of_dns_query_hours": "Кількість DNS-запитів, оброблених за останню {{count}} годину",
-    "number_of_dns_query_hours_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_upstream_response_time": "Середній час відгуку upstream-сервера",
-    "response_time": "Час відгуку",
+    "processing_time": "Час обробки",
     "average_processing_time_hint": "Середній час обробки DNS запиту в мілісекундах",
     "block_domain_use_filters_and_hosts": "Блокування доменів за допомогою фільтрів та hosts-файлів",
     "filters_block_toggle_hint": "Ви можете налаштувати правила блокування в розділі <a>Фільтри</a>.",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "DNS-сервери успішно збережено",
     "dns_test_ok_toast": "Вказані DNS сервери працюють правильно",
     "dns_test_not_ok_toast": "Сервер «{{key}}»: неможливо використати. Перевірте правильність введення",
-    "dns_test_parsing_error_toast": "Розділ {{section}}: рядок {{line}}: неможливо використати. Перевірте правильність введення",
     "dns_test_warning_toast": "Upstream «{{key}}» не відповідає на тестові запити та може працювати не правильно",
     "unblock": "Дозволити",
     "block": "Заборонити",
@@ -244,7 +237,6 @@
     "allow_this_client": "Дозволити цей клієнт",
     "block_for_this_client_only": "Заборонити тільки цей клієнт",
     "unblock_for_this_client_only": "Дозволити тільки цей клієнт",
-    "add_persistent_client": "Додати в збережені клієнти",
     "time_table_header": "Час",
     "date": "Дата",
     "domain_name_table_header": "Назва домену",
@@ -291,9 +283,6 @@
     "custom_ip": "Власний IP",
     "blocking_ipv4": "Блокування IPv4",
     "blocking_ipv6": "Блокування IPv6",
-    "blocked_response_ttl": "TTL заблокованої відповіді",
-    "blocked_response_ttl_desc": "Вказує, скільки секунд клієнти повинні кешувати відфільтровану відповідь",
-    "form_enter_blocked_response_ttl": "Введіть TTL заблокованої відповіді (секунди)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Використання користувацької IP-адреси для EDNS",
     "edns_use_custom_ip_desc": "Дозволити використовувати користувацьку IP-адресу для EDNS",
     "rate_limit_desc": "Кількість запитів в секунду, які може робити один клієнт. Встановлене значення «0» означатиме необмежену кількість.",
-    "rate_limit_subnet_len_ipv4": "Довжина префікса підмережі для адрес IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Довжина префікса підмережі для адрес IPv4, які використовуються для обмеження швидкості. Типовим значенням є 24",
-    "rate_limit_subnet_len_ipv4_error": "Довжина префікса підмережі IPv4 має бути від 0 до 32",
-    "rate_limit_subnet_len_ipv6": "Довжина префікса підмережі для адрес IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Довжина префікса підмережі для адрес IPv6, які використовуються для обмеження швидкості. Типовим значенням є 56",
-    "rate_limit_subnet_len_ipv6_error": "Довжина префікса підмережі IPv6 має бути від 0 до 128",
-    "form_enter_rate_limit_subnet_len": "Введіть довжину префікса підмережі для обмеження швидкості",
-    "rate_limit_whitelist": "Список дозволених обмежень швидкості",
-    "rate_limit_whitelist_desc": "IP-адреси, на які не поширюється обмеження швидкості",
-    "rate_limit_whitelist_placeholder": "Вводьте одну адресу на рядок",
     "blocking_ipv4_desc": "IP-адреса, яку потрібно видати для заблокованого A запиту",
     "blocking_ipv6_desc": "IP-адреса, яку потрібно видати для заблокованого АААА запиту",
     "blocking_mode_default": "Усталено: відповідь із нульовою IP-адресою (0.0.0.0 для A; :: для AAAA), якщо заблоковано правилом у Adblock-стилі; відповідь зазначеною у правилі IP-адресою, якщо заблокувано правилом у hosts-стилі",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "Назви вузлів",
     "encryption_reset": "Ви впевнені, що хочете скинути налаштування шифрування?",
     "encryption_warning": "Попередження",
-    "encryption_plain_dns_enable": "Увімкнути звичайний DNS",
-    "encryption_plain_dns_desc": "Звичайний DNS усталено увімкнений. Ви можете вимкнути його, щоб змусити всі пристрої використовувати зашифрований DNS. Для цього необхідно увімкнути хоча б один зашифрований протокол DNS",
-    "encryption_plain_dns_error": "Щоб вимкнути звичайний DNS, увімкніть принаймні один зашифрований протокол DNS",
     "topline_expiring_certificate": "Ваш сертифікат SSL скоро закінчиться. Оновіть <0>Налаштування шифрування</0>.",
     "topline_expired_certificate": "Термін дії вашого сертифіката SSL закінчився. Оновіть <0>Налаштування шифрування</0>.",
     "form_error_port_range": "Введіть значення порту в діапазоні 80−65535",
@@ -467,7 +443,6 @@
     "form_add_id": "Додати ідентифікатор",
     "form_client_name": "Введіть ім'я клієнта",
     "name": "Ім'я",
-    "client_name": "Клієнт {{id}}",
     "client_global_settings": "Використати загальні налаштування",
     "client_deleted": "Клієнта «{{key}}» успішно видалено",
     "client_added": "Клієнта «{{key}}» успішно додано",
@@ -678,8 +653,8 @@
     "use_saved_key": "Використати раніше збережений ключ",
     "parental_control": "Батьківський контроль",
     "safe_browsing": "Безпечний перегляд",
-    "served_from_cache_label": "Отримано з кешу",
-    "form_error_password_length": "Пароль має містити від {{min}} до {{max}} символів",
+    "served_from_cache": "{{value}} <i>(отримано з кешу)</i>",
+    "form_error_password_length": "Пароль мусить мати принаймні {{value}} символів",
     "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> .",
     "confirm_dns_cache_clear": "Ви впевнені, що бажаєте очистити кеш DNS?",
     "cache_cleared": "Кеш DNS успішно очищено",
@@ -701,7 +676,7 @@
     "disable_notify_for_minutes_plural": "Вимкнення захисту на {{count}} хвилин",
     "disable_notify_for_hours": "Вимкнення захисту на {{count}} годину",
     "disable_notify_for_hours_plural": "Вимкнення захисту на {{count}} годин",
-    "disable_notify_until_tomorrow": "Вимкнути захист до завтра",
+    "disable_notify_until_tomorrow": "Відключення захисту до завтра",
     "enable_protection_timer": "Захист буде ввімкнено о {{time}}",
     "custom_retention_input": "Введіть час в годинах",
     "custom_rotation_input": "Введіть час в годинах",
@@ -719,7 +694,7 @@
     "schedule_current_timezone": "Поточний часовий пояс: {{value}}",
     "schedule_time_all_day": "Увесь день",
     "schedule_modal_description": "Цей розклад замінить усі наявні розклади на той самий день тижня. Кожен день тижня може мати тільки один період бездіяльності.",
-    "schedule_modal_time_off": "Вимкнення блокування сервісів:",
+    "schedule_modal_time_off": "Блокування сервісів відключена:",
     "schedule_new": "Новий розклад",
     "schedule_edit": "Редагувати розклад",
     "schedule_save": "Зберегти розклад",
@@ -740,8 +715,5 @@
     "wednesday_short": "СР",
     "thursday_short": "ЧТ",
     "friday_short": "ПТ",
-    "saturday_short": "СБ",
-    "upstream_dns_cache_configuration": "Конфігурація кешу upstream DNS-серверів",
-    "enable_upstream_dns_cache": "Увімкнути кешування для користувацької конфігурації upstream-серверів цього клієнта",
-    "dns_cache_size": "Розмір кешу DNS, у байтах"
+    "saturday_short": "СБ"
 }

client/src/__locales/vi.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "Cài đặt thiết bị",
     "example_upstream_reserved": "ngược dòng <0>cho các miền cụ thể</0>;",
-    "example_multiple_upstreams_reserved": "nhiều máy chủ thượng nguồn <0>cho các miền cụ thể</0>;",
     "example_upstream_comment": "một lời bình luận.",
     "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
     "parallel_requests": "Yêu cầu song song",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "Hệ thống của bạn sử dụng cấu hình địa chỉ IP động cho giao diện <0>{{interfaceName}}</0>. Để sử dụng máy chủ DHCP, phải đặt địa chỉ IP tĩnh. Địa chỉ IP hiện tại của bạn là <0>{{ipAddress}}</0>. Chúng tôi sẽ tự động đặt địa chỉ IP này thành tĩnh nếu bạn nhấn nút Bật DHCP.",
     "dhcp_lease_added": "Cho thuê tĩnh \"{{key}}\" đã được thêm thành công",
     "dhcp_lease_deleted": "Cho thuê tĩnh \"{{key}}\" đã xóa thành công",
-    "dhcp_lease_updated": "Cho thuê tĩnh \"{{key}}\" được cập nhật thành công",
     "dhcp_new_static_lease": "Cho thuê tĩnh mới",
-    "dhcp_edit_static_lease": "Chỉnh sửa hợp đồng thuê tĩnh",
     "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ê",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "Mã độc/lừa đảo đã chặn",
     "stats_adult": "Website người lớn đã chặn",
     "stats_query_domain": "Tên miền truy vấn nhiều",
-    "for_last_hours": "trong {{count}} giờ qua",
-    "for_last_hours_plural": "trong {{count}} giờ qua",
+    "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>.",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "Không tìm thấy dữ liệu máy chủ ngược dòng",
     "number_of_dns_query_days": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
     "number_of_dns_query_days_plural": "Một số truy vấn DNS được xử lý trong {{count}} ngày qua",
-    "number_of_dns_query_hours": "Một số truy vấn DNS được xử lý trong {{count}} giờ qua",
-    "number_of_dns_query_hours_plural": "Một số truy vấn DNS được xử lý trong {{count}} giờ qua",
+    "number_of_dns_query_24_hours": "Số yêu cầu DNS đã xử lý trong 24 giờ qua",
     "number_of_dns_query_blocked_24_hours": "Số yêu cầu DNS bị chặn bởi bộ lọc quảng cáo và danh sách chặn host",
     "number_of_dns_query_blocked_24_hours_by_sec": "Số yêu cầu DNS bị chặn bởi chế độ bảo vệ duyệt web AdGuard",
     "number_of_dns_query_blocked_24_hours_adult": "Số trang web người lớn đã chặn",
     "enforced_save_search": "Bắt buộc tìm kiếm an toàn",
     "number_of_dns_query_to_safe_search": "Số yêu cầu DNS tới công cụ tìm kiếm đã chuyển thành tìm kiếm an toàn",
     "average_processing_time": "Thời gian xử lý trung bình",
-    "average_upstream_response_time": "Thời gian phản hồi trung bình từ máy chủ thượng nguồn",
-    "response_time": "Thời gian đáp ứng",
+    "processing_time": "Thời gian xử lý",
     "average_processing_time_hint": "Thời gian trung bình cho một yêu cầu DNS tính bằng mili giây",
     "block_domain_use_filters_and_hosts": "Chặn tên miền sử dụng các bộ lọc và file hosts",
     "filters_block_toggle_hint": "Bạn có thể thiết lập quy tắc chặn tại cài đặt <a>Bộ lọc</a>.",
@@ -236,7 +230,6 @@
     "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ủ \"{{key}}\"': không thể sử dụng, vui lòng kiểm tra lại",
-    "dns_test_parsing_error_toast": "Phần {{section}}: dòng {{line}}: không thể sử dụng được, vui lòng kiểm tra xem bạn đã viết đúng chưa",
     "dns_test_warning_toast": "Ngược lại \"{{key}}\" không phản hồi các yêu cầu kiểm tra và có thể không hoạt động bình thường",
     "unblock": "Bỏ chặn",
     "block": "Chặn",
@@ -244,7 +237,6 @@
     "allow_this_client": "Cho phép ứng dụng khách này",
     "block_for_this_client_only": "Chỉ chặn ứng dụng khách này",
     "unblock_for_this_client_only": "Chỉ hủy chặn ứng dụng khách này",
-    "add_persistent_client": "Thêm làm ứng dụng khách liên tục",
     "time_table_header": "Thời gian",
     "date": "Ngày",
     "domain_name_table_header": "Tên miền",
@@ -291,9 +283,6 @@
     "custom_ip": "IP tuỳ chỉnh",
     "blocking_ipv4": "Chặn IPv4",
     "blocking_ipv6": "Chặn IPv6",
-    "blocked_response_ttl": "Chặn phản hồi TTL",
-    "blocked_response_ttl_desc": "Chỉ định trong bao nhiêu giây máy khách sẽ lưu vào bộ đệm một phản hồi đã được lọc",
-    "form_enter_blocked_response_ttl": "Nhập phản hồi bị chặn TTL (giây)",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "Sử dụng địa chỉ IP tùy chỉnh cho EDNS",
     "edns_use_custom_ip_desc": "Cho phép sử dụng địa chỉ IP tùy chỉnh cho EDNS",
     "rate_limit_desc": "Số lượng yêu cầu mỗi giây mà một khách hàng được phép thực hiện (0: không giới hạn)",
-    "rate_limit_subnet_len_ipv4": "Độ dài tiền tố mạng con cho địa chỉ IPv4",
-    "rate_limit_subnet_len_ipv4_desc": "Độ dài tiền tố mạng con cho các địa chỉ IPv4 được sử dụng để giới hạn tốc độ. Mặc định là 24",
-    "rate_limit_subnet_len_ipv4_error": "Độ dài tiền tố mạng con IPv4 phải nằm trong khoảng từ 0 đến 32",
-    "rate_limit_subnet_len_ipv6": "Độ dài tiền tố mạng con cho địa chỉ IPv6",
-    "rate_limit_subnet_len_ipv6_desc": "Độ dài tiền tố mạng con cho các địa chỉ IPv6 được sử dụng để giới hạn tốc độ. Mặc định là 56",
-    "rate_limit_subnet_len_ipv6_error": "Độ dài tiền tố mạng con IPv6 phải nằm trong khoảng từ 0 đến 128",
-    "form_enter_rate_limit_subnet_len": "Nhập độ dài tiền tố mạng con để giới hạn tốc độ",
-    "rate_limit_whitelist": "Danh sách cho phép giới hạn tỷ lệ",
-    "rate_limit_whitelist_desc": "Địa chỉ IP bị loại trừ khỏi giới hạn tốc độ",
-    "rate_limit_whitelist_placeholder": "Nhập một địa chỉ IP trên mỗi dòng",
     "blocking_ipv4_desc": "Địa chỉ IP được trả lại cho một yêu cầu A bị chặn",
     "blocking_ipv6_desc": "Địa chỉ IP được trả lại cho một yêu cầu AAA bị chặn",
     "blocking_mode_default": "Mặc định: Trả lời với NXDOMAIN khi bị chặn bởi quy tắc kiểu Adblock; phản hồi với địa chỉ IP được chỉ định trong quy tắc khi bị chặn bởi quy tắc / etc / hosts-style",
@@ -464,7 +443,6 @@
     "form_add_id": "Thêm định danh",
     "form_client_name": "Nhập tên máy khách",
     "name": "Tên",
-    "client_name": "Khách hàng {{id}}",
     "client_global_settings": "Sử dụng cài đặt toàn cầu",
     "client_deleted": "Máy khách \"{{key}}\" đã xóa thành công",
     "client_added": "Máy khách \"{{key}}\" đã thêm thành công",
@@ -676,7 +654,7 @@
     "parental_control": "Quản lý của phụ huynh",
     "safe_browsing": "Duyệt web an toàn",
     "served_from_cache": "{{value}} <i>(được phục vụ từ bộ nhớ cache)</i>",
-    "form_error_password_length": "Mật khẩu phải dài từ {{min}} đến {{max}} ký tự",
+    "form_error_password_length": "Mật khẩu phải có ít nhất {{value}} ký tự",
     "anonymizer_notification": "<0> Lưu ý:</0> Tính năng ẩn danh IP được bật. Bạn có thể tắt nó trong <1> Cài đặt chung</1>.",
     "confirm_dns_cache_clear": "Bạn có chắc chắn muốn xóa bộ đệm ẩn DNS không?",
     "cache_cleared": "Đã xóa thành công bộ đệm DNS",
@@ -737,8 +715,5 @@
     "wednesday_short": "Thứ 4",
     "thursday_short": "Thứ 5",
     "friday_short": "Thứ 6",
-    "saturday_short": "Thứ 7",
-    "upstream_dns_cache_configuration": "Cấu hình bộ nhớ đệm upstream của các máy chủ DNS",
-    "enable_upstream_dns_cache": "Bật bộ nhớ cache cho cấu hình ngược dòng của máy chủ upstream của khách hàng này",
-    "dns_cache_size": "Kích thước bộ nhớ cache DNS, tính bằng byte"
+    "saturday_short": "Thứ 7"
 }

client/src/__locales/zh-cn.json

@@ -1,16 +1,15 @@
 {
     "client_settings": "客户端设置",
     "example_upstream_reserved": "指定为<0>特定域名</0>的上游服务器；",
-    "example_multiple_upstreams_reserved": "<0>特定域名</0>的多个上游服务器；",
     "example_upstream_comment": "注释。",
     "upstream_parallel": "使用并行请求以同时查询所有上游服务器来加快解析速度。",
     "parallel_requests": "并行请求",
     "load_balancing": "负载均衡",
     "load_balancing_desc": "一次查询一台服务器。AdGuard Home 将使用加权随机算法来选择服务器，以便更常使用最快的服务器。",
     "bootstrap_dns": "Bootstrap DNS 服务器",
-    "bootstrap_dns_desc": "DNS 服务器的 IP 地址，用于解析指定为上游的 DoH/DoT 解析器的 IP 地址。不允许添加注释。",
+    "bootstrap_dns_desc": "DNS 服务器的 IP 地址，用于解析指定为上游的 DoH/DoT 解析器的 IP 地址。不允许评论。",
     "fallback_dns_title": "后备 DNS 服务器",
-    "fallback_dns_desc": "当上游 DNS 服务器没有响应时使用的后备 DNS 服务器列表。语法与上面的「主要上游」字段相同。",
+    "fallback_dns_desc": "当上游 DNS 服务器没有响应时使用的后备 DNS 服务器列表。语法与上面的主要上游字段相同。",
     "fallback_dns_placeholder": "每行输入一个后备 DNS 服务器",
     "local_ptr_title": "私人反向 DNS 服务器",
     "local_ptr_desc": "AdGuard Home 用于本地 PTR 查询的 DNS 服务器。这些服务器将使用反向 DNS 解析具有私人 IP 地址的客户机的主机名，比如 \"192.168.12.34\"。如果没有设置，除非是 AdGuard Home 里设置的地址，AdGuard Home 都将自动使用您的操作系统的默认 DNS 解析器。",
@@ -59,7 +58,7 @@
     "dhcp_form_subnet_input": "子网掩码",
     "dhcp_form_range_title": "IP 地址范围",
     "dhcp_form_range_start": "起始 IP 地址",
-    "dhcp_form_range_end": "结束 IP 地址",
+    "dhcp_form_range_end": "末尾 IP 地址",
     "dhcp_form_lease_title": "DHCP 租约时间（秒）",
     "dhcp_form_lease_input": "租期",
     "dhcp_interface_select": "选择 DHCP 接口",
@@ -68,15 +67,13 @@
     "ip": "IP 地址",
     "dhcp_table_hostname": "主机名",
     "dhcp_table_expires": "到期",
-    "dhcp_warning": "如果用户想要启用内置的 DHCP 服务器，请确保在当前网络中没有其它起作用的 DHCP 服务器。否则，此操作可能会中断已连接设备的网络连接！",
+    "dhcp_warning": "如果你想要启用内置的 DHCP 服务器，请确保在当前网络中没有其它起作用的 DHCP 服务器。否则，此操作可能会破坏已连接设备的网络连接！",
     "dhcp_error": "AdGuard Home 无法确定在当前网络中是否存在其它 DHCP 服务器",
     "dhcp_static_ip_error": "要使用 DHCP 服务器，则必须设置静态 IP 地址。AdGuard Home 无法确定此网络接口是否已被配置为使用静态 IP 地址。请手动为此网络接口设置静态 IP 地址。",
     "dhcp_dynamic_ip_found": "您的系统对网络接口 <0>{{interfaceName}}</0> 使用了动态 IP 地址配置。要使用 DHCP 服务器，则必须对此网络接口使用静态 IP 地址配置。此网络接口当前的 IP 地址为 <0>{{ipAddress}}</0>。如您点击「启用 DHCP 服务器」按钮，AdGuard Home 将自动修改此网络接口以使用静态 IP 地址。",
     "dhcp_lease_added": "静态租约 \"{{key}}\" 已成功添加",
     "dhcp_lease_deleted": "静态租约 \"{{key}}\" 已成功删除",
-    "dhcp_lease_updated": "静态租约 “{{key}}” 已成功更新",
     "dhcp_new_static_lease": "新建静态租约",
-    "dhcp_edit_static_lease": "编辑静态租约",
     "dhcp_static_leases_not_found": "未找到 DHCP 静态租约",
     "dhcp_add_static_lease": "添加静态租约",
     "dhcp_reset_leases": "重置所有租约",
@@ -115,13 +112,12 @@
     "disable_protection": "禁用保护",
     "disabled_protection": "保护已禁用",
     "refresh_statics": "刷新统计数据",
-    "dns_query": "DNS 查询",
+    "dns_query": "DNS查询",
     "blocked_by": "<0>已被过滤器拦截</0>",
     "stats_malware_phishing": "被拦截的恶意/钓鱼网站",
     "stats_adult": "被拦截的成人网站",
     "stats_query_domain": "请求域名排行",
-    "for_last_hours": "最近 {{count}} 小时",
-    "for_last_hours_plural": "最近 {{count}} 小时",
+    "for_last_24_hours": "在过去 24 小时",
     "for_last_days": "最近 {{count}} 天",
     "for_last_days_plural": "最近 {{count}} 天",
     "stats_disabled": "已禁用统计数据。您可以从<0>设置页面</0>打开它。",
@@ -136,16 +132,14 @@
     "no_upstreams_data_found": "未找到上游服务器数据",
     "number_of_dns_query_days": "过去 {{count}} 天内处理的 DNS 查询总数",
     "number_of_dns_query_days_plural": "在过去的 {{count}} 天内处理了多少个 DNS 查询",
-    "number_of_dns_query_hours": "最近 {{count}} 小时内处理的 DNS 查询次数",
-    "number_of_dns_query_hours_plural": "最近 {{count}} 小时内处理的 DNS 查询次数",
+    "number_of_dns_query_24_hours": "过去 24 小时内处理的 DNS 请求总数",
     "number_of_dns_query_blocked_24_hours": "被广告过滤器和 Hosts 黑名单阻止的 DNS 请求总数",
     "number_of_dns_query_blocked_24_hours_by_sec": "被 AdGuard 安全浏览模块阻止的 DNS 请求总数",
     "number_of_dns_query_blocked_24_hours_adult": "被阻止的成人网站总数",
     "enforced_save_search": "强制安全搜索",
     "number_of_dns_query_to_safe_search": "启用强制安全搜索后对搜索引擎的 DNS 请求总数",
     "average_processing_time": "平均处理时间",
-    "average_upstream_response_time": "上游服务器的平均响应时间",
-    "response_time": "响应时间",
+    "processing_time": "处理时间",
     "average_processing_time_hint": "处理 DNS 请求的平均时间（毫秒）",
     "block_domain_use_filters_and_hosts": "使用过滤器和 Hosts 文件以拦截指定域名",
     "filters_block_toggle_hint": "你可以在 <a>过滤器</a> 设置中添加过滤规则。",
@@ -160,7 +154,7 @@
     "dns_settings": "DNS 设置",
     "dns_blocklists": "DNS 黑名单",
     "dns_allowlists": "DNS 白名单",
-    "dns_blocklists_desc": "AdGuard Home 将阻止 DNS 黑名单里的域名",
+    "dns_blocklists_desc": "AdGuard Home将阻止匹配DNS拦截清单的域名",
     "dns_allowlists_desc": "来自 DNS 白名单的域名将被允许，即使它们位于任意黑名单中也是如此。",
     "custom_filtering_rules": "自定义过滤规则",
     "encryption_settings": "加密设置",
@@ -168,7 +162,7 @@
     "upstream_dns": "上游 DNS 服务器",
     "upstream_dns_help": "每行输入一个服务器地址。<a>了解更多</a>关于配置上游 DNS 服务器的内容",
     "upstream_dns_configured_in_file": "配置路径{{path}}",
-    "test_upstream_btn": "测试上游",
+    "test_upstream_btn": "测试上游 DNS",
     "upstreams": "上游服务器",
     "upstream": "上游服务器",
     "apply_btn": "应用",
@@ -213,9 +207,9 @@
     "custom_filter_rules": "自定义过滤器规则",
     "custom_filter_rules_hint": "请确保每行只输入一条规则。你可以输入符合 adblock 语法或 Hosts 语法的规则。",
     "system_host_files": "系统主机文件",
-    "examples_title": "示例",
+    "examples_title": "范例",
     "example_meaning_filter_block": "阻止 example.org 域名及其所有子域名；",
-    "example_meaning_filter_whitelist": "解除对 example.org 及其所有子域名的拦截；",
+    "example_meaning_filter_whitelist": "解除 example.org 及其所有子域名的封锁；",
     "example_meaning_host_block": "对 example.org（不包括它的子域名）以 127.0.0.1 作为响应；",
     "example_comment": "! 这是一行注释。",
     "example_comment_meaning": "只是一条注释；",
@@ -226,7 +220,7 @@
     "example_upstream_udp": "常规 DNS（通过 UDP、主机名）；",
     "example_upstream_dot": "加密 <0>DNS-over-TLS</0>；",
     "example_upstream_doh": "加密 <0>DNS-over-HTTPS</0>；",
-    "example_upstream_doh3": "带有强制 <0>HTTP/3</0> 的加密 DNS-over-HTTPS，不会回退到 HTTP/2 或更低版本;",
+    "example_upstream_doh3": "带有强制 <0>HTTP/3</0> 的加密 DNS-over-HTTPS，并且没有回退到 HTTP/2 或更低版本;",
     "example_upstream_doq": "加密 <0>DNS-over-QUIC</0>",
     "example_upstream_sdns": "<1>DNSCrypt</1> 的 <0>DNS Stamps</0> 或者 <2>DNS-over-HTTPS</2> 解析器；",
     "example_upstream_tcp": "常规 DNS（基于 TCP ）；",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "上游服务器保存成功",
     "dns_test_ok_toast": "指定的 DNS 服务器现已正常运行",
     "dns_test_not_ok_toast": "服务器 \"{{key}}\"：无法使用，请检查你输入的是否正确",
-    "dns_test_parsing_error_toast": "第 {{section}} 节：第 {{line}} 行：无法使用，请检查您输入的是否正确",
     "dns_test_warning_toast": "上游 “{{key}}” 不响应测试请求，可能无法正常工作",
     "unblock": "放行",
     "block": "拦截",
@@ -244,7 +237,6 @@
     "allow_this_client": "允许这个客户端",
     "block_for_this_client_only": "仅对此客户端拦截",
     "unblock_for_this_client_only": "仅解除对此客户端的拦截",
-    "add_persistent_client": "添加为持久客户端",
     "time_table_header": "时间",
     "date": "日期",
     "domain_name_table_header": "域名",
@@ -268,7 +260,7 @@
     "rule_added_to_custom_filtering_toast": "规则已添加到自定义过滤规则列表中 {{rule}}",
     "query_log_response_status": "状态： {{value}}",
     "query_log_filtered": "被 {{filter}} 过滤",
-    "query_log_confirm_clear": "确定想要清除全部查询日志吗？",
+    "query_log_confirm_clear": "你确定想要清除全部查询日志吗？",
     "query_log_cleared": "查询日志已成功清除",
     "query_log_updated": "已成功更新查询日志",
     "query_log_clear": "清除查询日志",
@@ -276,12 +268,12 @@
     "query_log_enable": "启用日志",
     "query_log_configuration": "日志配置",
     "query_log_disabled": "查询日志已禁用，在<0>这些设置</0>中能配置它们",
-    "query_log_strict_search": "使用双引号进行精确搜索",
-    "query_log_retention_confirm": "确定要更改查询记录保留时间吗？如果减少时间间隔数值，可能会丢失某些数据",
-    "anonymize_client_ip": "匿名化客户端 IP",
+    "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": "DNS缓存配置",
     "dns_cache_config_desc": "您可以在此处配置 DNS 缓存",
     "blocking_mode": "拦截模式",
     "default": "默认",
@@ -291,9 +283,6 @@
     "custom_ip": "自定义 IP",
     "blocking_ipv4": "拦截 IPv4",
     "blocking_ipv6": "拦截 IPv6",
-    "blocked_response_ttl": "屏蔽的 TTL 应答",
-    "blocked_response_ttl_desc": "指定客户端应缓存已过滤响应的秒数",
-    "form_enter_blocked_response_ttl": "输入拦截的 TTL 应答（秒）",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -304,7 +293,7 @@
     "download_mobileconfig_doh": "下载适用于 DNS-over-HTTPS 的 .mobileconfig",
     "download_mobileconfig_dot": "下载适用于 DNS-over-TLS 的 .mobileconfig",
     "download_mobileconfig": "下载配置文件",
-    "plain_dns": "无加密 DNS",
+    "plain_dns": "无加密DNS",
     "form_enter_rate_limit": "输入限制速率",
     "rate_limit": "速度限制",
     "edns_enable": "启用 EDNS 客户端子网",
@@ -312,23 +301,13 @@
     "edns_use_custom_ip": "为 EDNS 使用自定义 IP",
     "edns_use_custom_ip_desc": "允许为 EDNS 使用自定义 IP",
     "rate_limit_desc": "每个客户端每秒钟查询次数的限制。设置为 0 意味着不限制。",
-    "rate_limit_subnet_len_ipv4": "IPv4 地址子网前缀长度",
-    "rate_limit_subnet_len_ipv4_desc": "用于速率限制的 IPv4 地址子网前缀长度。默认为 24",
-    "rate_limit_subnet_len_ipv4_error": "IPv4 子网前缀长度应介于 0 到 32 之间",
-    "rate_limit_subnet_len_ipv6": "IPv6 地址子网前缀长度",
-    "rate_limit_subnet_len_ipv6_desc": "用于速率限制的 IPv6 地址子网前缀长度。默认为 56",
-    "rate_limit_subnet_len_ipv6_error": "IPv6 子网前缀长度应介于 0 到 128 之间",
-    "form_enter_rate_limit_subnet_len": "输入用于速率限制的子网前缀长度",
-    "rate_limit_whitelist": "速率限制白名单",
-    "rate_limit_whitelist_desc": "排除在速率限制之外的 IP 地址",
-    "rate_limit_whitelist_placeholder": "每行输入一个 IP 地址",
     "blocking_ipv4_desc": "拦截 A 记录请求返回的 IP 地址",
     "blocking_ipv6_desc": "拦截 AAAA 记录请求返回的 IP 地址",
-    "blocking_mode_default": "默认：被 Adblock 规则拦截时反应为零 IP 地址（A记录：0.0.0.0；AAAA记录：::）；被 /etc/hosts 规则拦截时反应为规则中指定 IP 地址",
+    "blocking_mode_default": "默认：被 Adblock 规则拦截时反应为零 IP 地址（A记录：0.0.0.0；AAAA记录：::）；被/etc/hosts 规则拦截时反应为规则中指定 IP 地址",
     "blocking_mode_refused": "REFUSED：以 REFUSED 码响应请求",
-    "blocking_mode_nxdomain": "NXDOMAIN：以 NXDOMAIN 码响应",
+    "blocking_mode_nxdomain": "NXDOMAIN：以NXDOMAIN码响应",
     "blocking_mode_null_ip": "空 IP：以零 IP 地址响应（A 记录 0.0.0.0；AAAA 记录 ::）",
-    "blocking_mode_custom_ip": "自定义 IP：以手动设置的 IP 地址响应",
+    "blocking_mode_custom_ip": "自定IP：以手动设置的IP地址响应",
     "theme_auto": "自动",
     "theme_light": "浅色主题",
     "theme_dark": "深色主题",
@@ -352,7 +331,7 @@
     "install_settings_dns_desc": "您将需要使用以下地址来设置您的设备或路由器的 DNS 服务器：",
     "install_settings_all_interfaces": "所有接口",
     "install_auth_title": "身份认证",
-    "install_auth_desc": "需要对 AdGuard Home 的网页管理界面配置密码认证。即使 AdGuard Home 只能通过本地网络访问，为它添加访问限制依旧十分重要。",
+    "install_auth_desc": "您需要对 AdGuard Home 的网页管理界面配置密码认证。即使该 AdGuard Home 只能通过您的本地网络访问，避免 AdGuard Home 被不受限制地访问依旧十分重要。",
     "install_auth_username": "用户名",
     "install_auth_password": "密码",
     "install_auth_confirm": "确认密码",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "主机名",
     "encryption_reset": "您确定想要重置加密设置？",
     "encryption_warning": "警告",
-    "encryption_plain_dns_enable": "启用无加密 DNS",
-    "encryption_plain_dns_desc": "默认情况下启用无加密 DNS。用户可以禁用它，强制所有设备使用加密 DNS。为此，必须至少启用一个加密 DNS 协议",
-    "encryption_plain_dns_error": "要禁用无加密 DNS，请至少启用一个加密 DNS 协议",
     "topline_expiring_certificate": "您的 SSL 证书即将过期。请更新 <0>加密设置</0> 。",
     "topline_expired_certificate": "您的 SSL 证书已过期。请更新 <0>加密设置</0> 。",
     "form_error_port_range": "输入 80 - 65535 范围内的端口值",
@@ -467,7 +443,6 @@
     "form_add_id": "添加标识符",
     "form_client_name": "输入客户端名称",
     "name": "名称",
-    "client_name": "客户端 {{id}}",
     "client_global_settings": "使用全局设置",
     "client_deleted": "客户端 \"{{key}}\" 删除成功",
     "client_added": "客户端 \"{{key}}\" 添加成功",
@@ -484,12 +459,12 @@
     "access_disallowed_title": "不允许的客户端",
     "access_disallowed_desc": "CIDR、IP 地址或<a>客户端 ID</a> 的列表。如果已配置，则 AdGuard Home 将丢弃来自这些客户端的请求。如果允许的客户端已配置，此字段将会被忽略。",
     "access_blocked_title": "不允许的域名",
-    "access_blocked_desc": "不要将此功能与过滤器混淆。AdGuard Home 将排除匹配这些域名的 DNS 查询，并且这些查询将不会在查询日志中显示。在此可以明确指定域名、通配符（wildcard）和网址过滤的规则，例如 \"example.org\"、\"*.example.org\" 或 \"||example.org^\"。",
+    "access_blocked_desc": "不要将此功能与过滤器混淆。AdGuard Home 将排除匹配这些网域的 DNS 查询，并且这些查询将不会在查询日志中显示。在此可以明确指定域名、通配符（wildcard）和网址过滤的规则，例如 \"example.org\"、\"*.example.org\" 或 \"||example.org^\"。",
     "access_settings_saved": "访问设置保存成功",
     "updates_checked": "AdGuard Home 的新版本现在可用",
     "updates_version_equal": "AdGuard Home已经是最新版本",
     "check_updates_now": "立即检查更新",
-    "version_request_error": "检查更新失败。请检查互联网连接。",
+    "version_request_error": "检查更新失败。请检查您的因特网连接。",
     "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> 字符串。",
@@ -517,7 +492,7 @@
     "rewrite_confirm_delete": "您确定要删除 \"{{key}}\" 的 DNS 重写？",
     "rewrite_desc": "可以轻松地为特定域名配置自定义 DNS 响应。",
     "rewrite_applied": " 重定向规则已应用",
-    "rewrite_hosts_applied": "根据 hosts 文件规则已被重写",
+    "rewrite_hosts_applied": "根据hosts文件规则已被重写",
     "dns_rewrites": "DNS 重写",
     "form_domain": "输入域",
     "form_answer": "输入 IP 地址或域名",
@@ -556,12 +531,12 @@
     "statistics_retention": "统计保留",
     "statistics_retention_desc": "如果您减少该间隔的数值， 某些数据可能会丢失",
     "statistics_clear": " 清除统计数据",
-    "statistics_clear_confirm": "确定要清除统计数据？",
+    "statistics_clear_confirm": "您确定要清除统计数据？",
     "statistics_retention_confirm": "您确定要更改统计记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
     "statistics_cleared": "统计数据已成功清除",
     "statistics_enable": "启用统计数据",
-    "ignore_domains": "忽略的域名（以换行符分隔）",
-    "ignore_domains_title": "被忽略的域名",
+    "ignore_domains": "忽略的网域（以换行符分隔）",
+    "ignore_domains_title": "被忽略的网域",
     "ignore_domains_desc_stats": "匹配这些规则的查询不在统计信息",
     "ignore_domains_desc_query": "匹配这些规则的查询不在查询日志",
     "interval_hours": "{{count}} 小时",
@@ -584,24 +559,24 @@
     "network": "网络",
     "descr": "描述",
     "whois": "WHOIS",
-    "filtering_rules_learn_more": "<0>了解更多</0>关于创建自己的 hosts 清单。",
-    "blocked_by_response": "因响应的 CNAME 或 IP 被屏蔽",
-    "blocked_by_cname_or_ip": "按 CNAME 或 IP 拦截",
+    "filtering_rules_learn_more": "<0>了解更多</0>关于创建自己的hosts清单。",
+    "blocked_by_response": "因响应的CNAME或IP被屏蔽",
+    "blocked_by_cname_or_ip": "按CNAME或IP拦截",
     "try_again": "重试",
     "domain_desc": "输入您要重写的域名或通配符。",
     "example_rewrite_domain": "仅重写此域名的响应。",
     "example_rewrite_wildcard": "重写所有<0>example.org</0> 子域的响应。",
-    "rewrite_ip_address": "IP 地址：在 A 或 AAAA 响应中使用这个 IP",
-    "rewrite_domain_name": "域名：添加一个 CNAME 记录",
+    "rewrite_ip_address": "IP地址：在 A或AAAA响应中使用这个IP",
+    "rewrite_domain_name": "域名 ：添加一个CNAME记录",
     "rewrite_A": "<0>A</0>：特殊值，保持来自上游的<0>A</0>记录",
     "rewrite_AAAA": "<0>AAAA</0>：特殊值，保持来自上游的<0>AAAA</0>记录",
     "disable_ipv6": "禁用 IPv6 地址的解析",
-    "disable_ipv6_desc": "丢弃对 IPv6 地址（类型 AAAA）的所有 DNS 查询，并从 HTTPS 响应中删除 IPv6 相关的信息。",
+    "disable_ipv6_desc": "删除对 IPv6 地址（类型 AAAA）的所有 DNS 查询，并从 HTTPS 响应中删除 IPv6 提示。",
     "fastest_addr": "最快的 IP 地址",
-    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器响应，这会降低 DNS 查询的速度，但此举将会在总体上改善连接速度。",
-    "autofix_warning_text": "若您单击「修复」，AdGuard Home 将会配置您的系统以使用 AdGuard Home 的 DNS 服务器。",
+    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器均有所回应，因而会降低 DNS 查询的速度，但同时，此举将会改善总体的连接。",
+    "autofix_warning_text": "若您单击「修复」，AdGuardHome 将会配置您的系统以使用 AdGuardHome 的 DNS 服务器。",
     "autofix_warning_list": "其将会进行如下工作：<0>停用系统DNSStubListener</0><0>设置DNS服务器地址为127.0.0.1</0><0>将/etc/resolv.conf的符号链接目标替换为/run/systemd/resolv/resolv.conf</0><0>停止DNSStubListener（重新加载系统解析服务）</0>",
-    "autofix_warning_result": "因此，默认情况下所有来自系统的 DNS 请求都将由 AdGuard Home 处理。",
+    "autofix_warning_result": "因此，默认情况下所有来自系统的DNS请求都将由AdGuardHome处理。",
     "tags_title": "标签",
     "tags_desc": "您可以选择与客户端对应的标记。标签可以包含在过滤规则中，并允许您更准确地应用它们。<0>了解更多</0>。",
     "form_select_tags": "选择客户端标签",
@@ -619,22 +594,22 @@
     "check_service": "服务名称：{{service}}",
     "service_name": "服务名称",
     "check_not_found": "未在您的筛选列表中找到",
-    "client_confirm_block": "确定要阻止客户端 \"{{ip}}\"?",
+    "client_confirm_block": "您确定要阻止客户端 \"{{ip}}\"?",
     "client_confirm_unblock": "您确定要解除对客户端 \"{{ip}}\" 的封锁吗？",
     "client_blocked": "客户端 \"{{ip}}\" 被成功拦截",
-    "client_unblocked": "成功解除对 \"{{ip}}\" 客户端的封锁",
+    "client_unblocked": "成功解锁客户端 \"{{ip}}\"",
     "static_ip": "静态IP地址",
-    "static_ip_desc": "AdGuard Home 是一个服务器，所以它需要一个静态 IP 地址才能正常工作。否则，在某些情况下，路由器可能会给这个设备分配一个不同的 IP 地址。",
-    "set_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 地址。您想要继续吗？",
+    "confirm_static_ip": "AdGuard Home 将把{{ip}} 配置为您的静态IP地址。您想要继续吗？",
     "list_updated": "{{count}} 列表已更新",
     "list_updated_plural": "{{count}} 条列表已更新",
-    "dnssec_enable": "启用 DNSSEC",
+    "dnssec_enable": "启用DNSSEC",
     "dnssec_enable_desc": "在发出 DNS 查询中设置 DNSSEC 标志并检查结果（需要启用 DNSSEC 的解析器）。",
-    "validated_with_dnssec": "通过 DNSSEC 验证",
+    "validated_with_dnssec": "通过DNSSEC验证",
     "all_queries": "所有查询记录",
     "show_blocked_responses": "已拦截",
     "show_whitelisted_responses": "已列入白名单",
@@ -649,9 +624,9 @@
     "blocklist": "黑名单",
     "milliseconds_abbreviation": "毫秒",
     "cache_size": "缓存大小",
-    "cache_size_desc": "DNS 缓存大小（单位：字节）。若要关闭缓存，请留空。",
-    "cache_ttl_min_override": "覆盖最小 TTL 值",
-    "cache_ttl_max_override": "覆盖最大 TTL 值",
+    "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 值（秒）",
@@ -678,8 +653,8 @@
     "use_saved_key": "使用之前保存的密钥",
     "parental_control": "家长控制",
     "safe_browsing": "安全浏览",
-    "served_from_cache_label": "从缓存中",
-    "form_error_password_length": "密码长度必须为 {{min}} 到 {{max}} 个字符",
+    "served_from_cache": "{{value}}<i>(由缓存提供)</i>",
+    "form_error_password_length": "密码必须至少有 {{value}} 个字符",
     "anonymizer_notification": "<0>注意：</0> IP 匿名化已启用。您可以在<1>常规设置</1>中禁用它。",
     "confirm_dns_cache_clear": "您确定要清除 DNS 缓存吗？",
     "cache_cleared": "已成功清除 DNS 缓存",
@@ -710,9 +685,9 @@
     "ignore_query_log": "在查询日志中忽略此客户端",
     "ignore_statistics": "在统计数据中忽略此客户端",
     "schedule_services": "暂停服务拦截",
-    "schedule_services_desc": "配置「服务拦截过滤器」的暂停计划",
-    "schedule_services_desc_client": "为此客户端配置「服务拦截过滤器」的暂停计划",
-    "schedule_desc": "安排暂停拦截服务的时间段",
+    "schedule_services_desc": "配置服务拦截过滤器的暂停计划",
+    "schedule_services_desc_client": "为此客户端配置服务拦截过滤器的暂停计划",
+    "schedule_desc": "安排已拦截服务禁用的时间",
     "schedule_invalid_select": "开始时间必须在结束时间之前",
     "schedule_select_days": "选择日",
     "schedule_timezone": "选择时区",
@@ -740,8 +715,5 @@
     "wednesday_short": "周三",
     "thursday_short": "周四",
     "friday_short": "周五",
-    "saturday_short": "周六",
-    "upstream_dns_cache_configuration": "上游 DNS 缓存配置",
-    "enable_upstream_dns_cache": "为该客户端的自定义上游配置启用 DNS 缓存",
-    "dns_cache_size": "DNS 缓存大小，单位：字节"
+    "saturday_short": "周六"
 }

client/src/__locales/zh-hk.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "用戶端設定",
     "example_upstream_reserved": "您可以<0>指定網域</0>使用特定 DNS 查詢",
-    "example_multiple_upstreams_reserved": "多個上游 <0>for 特定網域</0>;",
     "example_upstream_comment": "您可以指定註解",
     "upstream_parallel": "使用平行查詢，同時查詢所有上游伺服器來加速解析結果",
     "parallel_requests": "平行處理",
@@ -9,9 +8,6 @@
     "load_balancing_desc": "一次只查詢一個伺服器。AdGuard Home 會使用加權隨機取樣來選擇使用的查詢結果，以確保速度最快的伺服器能被充分運用。",
     "bootstrap_dns": "引導（Boostrap） DNS 伺服器",
     "bootstrap_dns_desc": "Bootstrap DNS 伺服器用於解析您所設定的上游 DoH/DoT 解析器的 IP 地址",
-    "fallback_dns_title": "備用 DNS 伺服器",
-    "fallback_dns_desc": "備用 DNS 伺服器列表：於主要 DNS 伺服器沒有回應時使用。語法與主要 DNS 伺服器設定欄位相同。",
-    "fallback_dns_placeholder": "每行輸入一個備用 DNS 伺服器",
     "local_ptr_title": "私人 DNS 伺服器",
     "local_ptr_desc": "AdGuard Home 用於區域 PTR 查詢的 DNS 伺服器。這些伺服器將用於解析具有私人 IP 位址的用戶端的主機名稱，例如  \"192.168.12.34\"，使用 rDNS。如果沒有設定，AdGuard Home 將自動使用您的系統預設 DNS 解析。",
     "local_ptr_default_resolver": "AdGuard Home 預設使用以下作為 DNS 反解器：{{ip}}",
@@ -41,19 +37,17 @@
     "dhcp_ipv6_settings": "DHCP IPv6 設定",
     "form_error_required": "必要欄位",
     "form_error_ip4_format": "無效的 IPv4 格式",
-    "form_error_ip4_gateway_format": "閘道的 IPv4 位址無效",
     "form_error_ip6_format": "無效的 IPv6 格式",
-    "form_error_ip_format": "無效的 IP 格式",
+    "form_error_ip4_gateway_format": "閘道的 IPv4 位址無效",
+    "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_gateway_ip": "租約不能使用閘道器的 IP 位址",
     "out_of_range_error": "必須介於 \"{{start}}\" - \"{{end}}\" 範圍之外",
     "lower_range_start_error": "必須小於起始值",
     "greater_range_start_error": "必須大於起始值",
-    "subnet_error": "地址必須在同一個子網路中",
     "gateway_or_subnet_invalid": "無效子網路",
     "dhcp_form_gateway_input": "閘道 IP 位址",
     "dhcp_form_subnet_input": "子網路遮罩",
@@ -74,9 +68,7 @@
     "dhcp_dynamic_ip_found": "您的網路介面  <0>{{interfaceName}}</0> 正在使用動態 IP，要使用 DHCP 伺服器必須指定靜態 IP 給 AdGuard。\n目前您的 IP 位址  <0>{{ipAddress}}</0>，啟用 DHCP 後此 IP 將自動設定為靜態 IP 位址。",
     "dhcp_lease_added": "靜態租用 \"{{key}}\" 已新增成功",
     "dhcp_lease_deleted": "靜態租用 \"{{key}}\" 已刪除成功",
-    "dhcp_lease_updated": "靜態租約 \"{{key}}\" 已成功更新",
     "dhcp_new_static_lease": "新增靜態租用",
-    "dhcp_edit_static_lease": "編輯靜態租約",
     "dhcp_static_leases_not_found": "找不到 DHCP 靜態租用",
     "dhcp_add_static_lease": "新增靜態租用",
     "dhcp_reset_leases": "重置所有 DHCP 租約",
@@ -120,8 +112,7 @@
     "stats_malware_phishing": "已封鎖惡意軟體/網路釣魚",
     "stats_adult": "已封鎖成人網站",
     "stats_query_domain": "熱門查詢網域排行",
-    "for_last_hours": "在過去 {{count}} 小時",
-    "for_last_hours_plural": "在過去 {{count}} 小時裡",
+    "for_last_24_hours": "過去 24 小時",
     "for_last_days": "最近 {{count}} 天內",
     "for_last_days_plural": "最近 {{count}} 天內",
     "stats_disabled": "已禁用統計資料。您可以從<0>設定頁面</0>打開它。",
@@ -132,20 +123,15 @@
     "top_clients": "熱門用戶端排行",
     "no_clients_found": "找不到用戶端",
     "general_statistics": "一般統計資料",
-    "top_upstreams": "熱門上游伺服器",
-    "no_upstreams_data_found": "找不到上游數據",
     "number_of_dns_query_days": "過去 {{count}} 天內 DNS 查詢總數",
     "number_of_dns_query_days_plural": "過去 {{count}} 天內 DNS 查詢總數",
-    "number_of_dns_query_hours": "過去 {{count}} 小時處理的 DNS 查詢數量",
-    "number_of_dns_query_hours_plural": "過去 {{count}} 小時處理的 DNS 查詢數量",
+    "number_of_dns_query_24_hours": "過去 24小時內 DNS 查詢總數",
     "number_of_dns_query_blocked_24_hours": "已被廣告過濾器與主機黑名單封鎖 DNS 查詢總數",
     "number_of_dns_query_blocked_24_hours_by_sec": "已被 AdGuard 瀏覽安全模組封鎖的 DNS 查詢總數",
     "number_of_dns_query_blocked_24_hours_adult": "已封鎖成人網站總數",
     "enforced_save_search": "強制使用安全搜尋",
     "number_of_dns_query_to_safe_search": "已強制使用安全搜尋總數",
     "average_processing_time": "平均的處理時間",
-    "average_upstream_response_time": "平均上游伺服器回應時間",
-    "response_time": "回應時間",
     "average_processing_time_hint": "處理 DNS 請求的平均時間(毫秒)",
     "block_domain_use_filters_and_hosts": "使用過濾器與 hosts 檔案阻擋網域查詢",
     "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設定封鎖規則。",
@@ -170,7 +156,6 @@
     "upstream_dns_configured_in_file": "設定在 {{path}}",
     "test_upstream_btn": "測試上游 DNS",
     "upstreams": "上游",
-    "upstream": "上游伺服器",
     "apply_btn": "套用",
     "disabled_filtering_toast": "已停用過濾",
     "enabled_filtering_toast": "已啟用過濾",
@@ -179,7 +164,6 @@
     "disabled_parental_toast": "已停用家長監護",
     "enabled_parental_toast": "已啟用家長監護",
     "disabled_safe_search_toast": "已停用安全搜尋",
-    "enabled_save_search_toast": "已啟用安全搜尋",
     "updated_save_search_toast": "已更新安全搜尋設定",
     "enabled_table_header": "啟用",
     "name_table_header": "名稱",
@@ -222,29 +206,24 @@
     "example_comment_hash": "# Also a comment",
     "example_regex_meaning": "使用正規表示式（Regular Expression）來阻止對應的網域查詢",
     "example_upstream_regular": "一般 DNS（透過 UDP）",
-    "example_upstream_regular_port": "一般 DNS（透過 UDP，連接埠）",
-    "example_upstream_udp": "一般 DNS（透過 UDP，主機名稱）",
     "example_upstream_dot": "<0>DNS-over-TLS</0>（流量加密）",
     "example_upstream_doh": "<0>DNS-over-HTTPS</0>（流量加密）",
-    "example_upstream_doh3": "使 DNS-over-HTTPS 強制使用 <0>HTTP/3</0> ，並禁止使用後備 HTTP/2 或更低版本；",
     "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）",
+    "example_upstream_regular_port": "一般 DNS（透過 UDP，連接埠）",
+    "example_upstream_udp": "一般 DNS（透過 UDP，主機名稱）",
     "example_upstream_tcp_port": "一般 DNS（透過 TCP，連接埠）",
     "example_upstream_tcp_hostname": "一般 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}}\" 出現錯誤，請確認是否正確輸入",
-    "dns_test_parsing_error_toast": "在 {{section}} 部分中：第 {{line}} 行：無法使用，請檢查您是否有正確地填寫",
-    "dns_test_warning_toast": "上游伺服器 \"{{key}}\" 沒有回應測試請求，可能無法正常運作",
     "unblock": "解除封鎖",
     "block": "封鎖",
     "disallow_this_client": "不允許此用戶端",
     "allow_this_client": "允許此用戶端",
     "block_for_this_client_only": "僅封鎖此用戶端",
     "unblock_for_this_client_only": "僅解除封鎖此用戶端",
-    "add_persistent_client": "加入到用戶端",
     "time_table_header": "時間",
     "date": "日期",
     "domain_name_table_header": "域名",
@@ -291,9 +270,6 @@
     "custom_ip": "自訂 IP 位址",
     "blocking_ipv4": "封鎖 IPv4",
     "blocking_ipv6": "封鎖 IPv6",
-    "blocked_response_ttl": "阻塞響應 TTL",
-    "blocked_response_ttl_desc": "指定客戶端應快取過濾回應的秒數",
-    "form_enter_blocked_response_ttl": "輸入已封鎖的回應 TTL（秒）",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +288,6 @@
     "edns_use_custom_ip": "使用自訂 EDNS IP",
     "edns_use_custom_ip_desc": "允許使用自訂 EDNS IP",
     "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
-    "rate_limit_subnet_len_ipv4": "IPv4 位址的子網路前綴長度",
-    "rate_limit_subnet_len_ipv4_desc": "用於速率限制的 IPv4 位址的子網路前綴長度。 預設為 24",
-    "rate_limit_subnet_len_ipv4_error": "IPv4 子網路前綴長度應介於 0 到 32 之間",
-    "rate_limit_subnet_len_ipv6": "IPv6 位址的子網路前綴長度",
-    "rate_limit_subnet_len_ipv6_desc": "用於速率限制的 IPv6 位址的子網路前綴長度。 預設為 56",
-    "rate_limit_subnet_len_ipv6_error": "IPv6 子網路前綴長度應介於 0 到 128 之間",
-    "form_enter_rate_limit_subnet_len": "輸入速率限制的子網路前綴長度",
-    "rate_limit_whitelist": "速率限制白名單",
-    "rate_limit_whitelist_desc": "排除在速率限制之外的 IP 位址",
-    "rate_limit_whitelist_placeholder": "每行輸入一個 IP 地址",
     "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
     "blocking_ipv6_desc": "回覆指定 IPv6 位址給被封鎖的網域的 AAAA 紀錄查詢",
     "blocking_mode_default": "預設：被 Adblock 規則封鎖時回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）；被 /etc/hosts 規則封鎖時回應規則中指定 IP 位址",
@@ -425,9 +391,6 @@
     "encryption_hostnames": "主機名稱",
     "encryption_reset": "您確定要重設加密設定嗎？",
     "encryption_warning": "警告",
-    "encryption_plain_dns_enable": "啟用一般 DNS",
-    "encryption_plain_dns_desc": "預設情況下已啟用一般 DNS。您可以將其停用以強制所有裝置使用加密 DNS。要執行此操作，您必須啟用至少一個加密的 DNS 協定。",
-    "encryption_plain_dns_error": "若要停用一般 DNS，請啟用至少一個加密的 DNS 協定",
     "topline_expiring_certificate": "您的 SSL 憑證即將到期。請前往<0>加密設定</0>更新。",
     "topline_expired_certificate": "您的 SSL 憑證已到期。請前往<0>加密設定</0>更新。",
     "form_error_port_range": "輸入範圍 80-65535 中的值",
@@ -467,7 +430,6 @@
     "form_add_id": "新增識別碼",
     "form_client_name": "輸入用戶端名稱",
     "name": "名稱",
-    "client_name": "客戶端 {{id}}",
     "client_global_settings": "使用全域設定",
     "client_deleted": "已刪除「{{key}}」",
     "client_added": "已新增「{{key}}」",
@@ -489,7 +451,6 @@
     "updates_checked": "檢查更新成功",
     "updates_version_equal": "AdGuard Home 是最新的版本",
     "check_updates_now": "立即檢查更新",
-    "version_request_error": "更新檢查失敗。請檢查您的網絡連線。",
     "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>。",
@@ -510,7 +471,6 @@
     "setup_dns_notice": "要使用  <1>DNS-over-HTTPS</1> 或 <1>DNS-over-TLS</1>，您必須先在 AdGuard Home 完成 <0>加密設定</0>。",
     "rewrite_added": "「{{key}}」的 DNS 覆寫新增成功",
     "rewrite_deleted": "「{{key}}」的 DNS 覆寫刪除成功",
-    "rewrite_updated": "已更新 DNS 覆寫",
     "rewrite_add": "新增 DNS 覆寫",
     "rewrite_edit": "編輯 DNS 覆寫",
     "rewrite_not_found": "找不到 DNS 覆寫",
@@ -562,8 +522,6 @@
     "statistics_enable": "啟用統計數據",
     "ignore_domains": "已忽略網域（每行一個）",
     "ignore_domains_title": "已忽略網域",
-    "ignore_domains_desc_stats": "符合這些規則的查詢不會被計入統計資料中",
-    "ignore_domains_desc_query": "符合這些規則的查詢不會被寫入查詢記錄中",
     "interval_hours": "{{count}} 小時",
     "interval_hours_plural": "{{count}} 小時",
     "filters_configuration": "過濾器設定",
@@ -673,19 +631,10 @@
     "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}}」會導致「允許的用戶端」清單停用。",
-    "use_saved_key": "使用先前儲存的鍵",
-    "parental_control": "家長監護",
     "safe_browsing": "安全瀏覽",
-    "served_from_cache_label": "由快取回應",
+    "served_from_cache": "{{value}} <i>(由快取回應)</i>",
     "form_error_password_length": "密碼必須至少 {{value}} 個字元長度",
-    "anonymizer_notification": "<0>注意</0>: 已啟用 IP 去識別化。您可以在<1>一般設定</1>中停用它。",
-    "confirm_dns_cache_clear": "您確定要清除 DNS 快取嗎？",
-    "cache_cleared": "DNS 快取成功清除",
-    "clear_cache": "清除快取",
     "make_static": "新增為靜態",
-    "theme_auto_desc": "自動（根據裝置調整）",
     "theme_dark_desc": "深色主題",
     "theme_light_desc": "淺色主題",
     "disable_for_seconds": "{{count}} 秒",
@@ -700,48 +649,11 @@
     "disable_notify_for_minutes": "暫停防護 {{count}} 分鐘",
     "disable_notify_for_minutes_plural": "暫停防護 {{count}} 分鐘",
     "disable_notify_for_hours": "暫停防護 {{count}} 小時",
-    "disable_notify_for_hours_plural": "停用保護 {{count}} 小時",
-    "disable_notify_until_tomorrow": "停用保護直至明天",
-    "enable_protection_timer": "保護功能將在 {{time}} 啟用",
-    "custom_retention_input": "輸入保存時長（單位：小時）",
-    "custom_rotation_input": "請輸入輪替週期（單位：小時）",
-    "protection_section_label": "保護",
-    "log_and_stats_section_label": "查詢日誌與統計資料",
-    "ignore_query_log": "在查詢日誌中忽略此客戶端",
-    "ignore_statistics": "在統計資料中忽略此客戶端",
-    "schedule_services": "暫停服務封鎖",
-    "schedule_services_desc": "設定服務封鎖過濾器的暫停排程",
-    "schedule_services_desc_client": "針對此用戶端，設定服務阻擋的暫停排程",
-    "schedule_desc": "設定已封鎖服務的閒置時段",
-    "schedule_invalid_select": "開始時間必須在結束時間之前",
-    "schedule_select_days": "選擇天數",
-    "schedule_timezone": "選擇時區",
-    "schedule_current_timezone": "目前時區：{{value}}",
-    "schedule_time_all_day": "全天",
-    "schedule_modal_description": "這個排程將會取代同一星期中所有現有的排程。每一天只能有一個閒置時段。",
-    "schedule_modal_time_off": "沒有封鎖服務：",
-    "schedule_new": "新排程",
-    "schedule_edit": "編輯排程",
-    "schedule_save": "儲存排程",
-    "schedule_add": "新增排程",
-    "schedule_remove": "移除排程",
-    "schedule_from": "從",
-    "schedule_to": "至",
-    "sunday": "星期日",
-    "monday": "星期一",
-    "tuesday": "星期二",
-    "wednesday": "星期三",
-    "thursday": "星期四",
-    "friday": "星期五",
-    "saturday": "星期六",
     "sunday_short": "週日",
     "monday_short": "週一",
     "tuesday_short": "週二",
     "wednesday_short": "週三",
     "thursday_short": "週四",
     "friday_short": "週五",
-    "saturday_short": "週六",
-    "upstream_dns_cache_configuration": "上游 DNS 快取設定",
-    "enable_upstream_dns_cache": "為此客戶端的自訂上游設定啟用 DNS 快取",
-    "dns_cache_size": "DNS 快取大小（bytes）"
+    "saturday_short": "週六"
 }

client/src/__locales/zh-tw.json

@@ -1,7 +1,6 @@
 {
     "client_settings": "用戶端設定",
     "example_upstream_reserved": "<0>供特定的網域</0>之上游；",
-    "example_multiple_upstreams_reserved": "<0>特定網域</0>的多個上游伺服器；",
     "example_upstream_comment": "註解。",
     "upstream_parallel": "透過同時地查詢所有上游的伺服器，使用並行的查詢以加速解析。",
     "parallel_requests": "並行的請求",
@@ -9,9 +8,9 @@
     "load_balancing_desc": "每次查詢一個上游伺服器。AdGuard Home 使用它的加權隨機的演算法來選擇伺服器，以便最快的伺服器被更常使用。",
     "bootstrap_dns": "自我啟動（Bootstrap）DNS 伺服器",
     "bootstrap_dns_desc": "DNS 伺服器的 IP 位址，用於解析您指定為上游伺服器的 DoH/DoT 解析器的 IP 位址。不允許註釋。",
-    "fallback_dns_title": "應變 DNS 伺服器",
-    "fallback_dns_desc": "當上游 DNS 伺服器未回覆時被使用的應變 DNS 伺服器之清單。此語法與在上面主要上游欄位中的相同。",
-    "fallback_dns_placeholder": "每行輸入一個應變 DNS 伺服器",
+    "fallback_dns_title": "備援 DNS 伺服器",
+    "fallback_dns_desc": "當上游 DNS 伺服器未回應時使用的備援 DNS 伺服器清單。語法與上面的主要上游欄位相同。",
+    "fallback_dns_placeholder": "每行輸入一個備援 DNS 伺服器",
     "local_ptr_title": "私人反向的 DNS 伺服器",
     "local_ptr_desc": "AdGuard Home 用於區域指標（PTR）查詢之 DNS 伺服器。這些伺服器被用於解析有關在私人 IP 範圍的位址之區域指標查詢，例如，\"192.168.12.34\"，使用反向的 DNS。如果未被設定，AdGuard Home 使用您的作業系統之預設 DNS 解析器的位址。",
     "local_ptr_default_resolver": "預設下，AdGuard Home 使用以下反向的 DNS 解析器：{{ip}}。",
@@ -74,9 +73,7 @@
     "dhcp_dynamic_ip_found": "您的系統使用動態 IP 位址配置供介面 <0>{{interfaceName}}</0>。為了使用動態主機設定協定（DHCP）伺服器，靜態 IP 位址必須被設定。您現行的 IP 位址為 <0>{{ipAddress}}</0>。如果您按\"啟用 DHCP 伺服器\" 按鈕，AdGuard Home 將自動地設定此 IP 位址作為靜態。",
     "dhcp_lease_added": "靜態租約 \"{{key}}\" 被成功地加入",
     "dhcp_lease_deleted": "靜態租約 \"{{key}}\" 被成功地刪除",
-    "dhcp_lease_updated": "「{{key}}」的靜態租約已成功更新",
     "dhcp_new_static_lease": "新的靜態租約",
-    "dhcp_edit_static_lease": "編輯靜態租約",
     "dhcp_static_leases_not_found": "無已發現之動態主機設定協定（DHCP）靜態租約",
     "dhcp_add_static_lease": "新增靜態租約",
     "dhcp_reset_leases": "重置所有的租約",
@@ -120,8 +117,7 @@
     "stats_malware_phishing": "已封鎖的惡意軟體/網路釣魚",
     "stats_adult": "已封鎖的成人網站",
     "stats_query_domain": "熱門已查詢的網域",
-    "for_last_hours": "在過去的 {{count}} 小時內",
-    "for_last_hours_plural": "在過去的 {{count}} 小時內",
+    "for_last_24_hours": "在最近的 24 小時內",
     "for_last_days": "在最近的 {{count}} 日內",
     "for_last_days_plural": "在最近的 {{count}} 日內",
     "stats_disabled": "該統計資料已被禁用。您可從<0>設定頁面</0>中打開它。",
@@ -132,20 +128,18 @@
     "top_clients": "熱門用戶端",
     "no_clients_found": "無已發現之用戶端",
     "general_statistics": "一般的統計資料",
-    "top_upstreams": "熱門上游",
+    "top_upstreams": "經常請求的上游伺服器",
     "no_upstreams_data_found": "找不到上游伺服器資料",
     "number_of_dns_query_days": "在最近的 {{count}} 日內已處理的 DNS 查詢之數量",
     "number_of_dns_query_days_plural": "在最近的 {{count}} 日內已處理的 DNS 查詢之數量",
-    "number_of_dns_query_hours": "過去 {{count}} 小時內處理的 DNS 查詢次數",
-    "number_of_dns_query_hours_plural": "過去 {{count}} 小時內處理的 DNS 查詢次數",
+    "number_of_dns_query_24_hours": "在最近的 24 小時內已處理的 DNS 查詢之數量",
     "number_of_dns_query_blocked_24_hours": "被廣告封鎖過濾器和主機封鎖清單阻擋的 DNS 請求之數量",
     "number_of_dns_query_blocked_24_hours_by_sec": "被 AdGuard 瀏覽安全模組封鎖的 DNS 請求之數量",
     "number_of_dns_query_blocked_24_hours_adult": "已封鎖的成人網站之數量",
     "enforced_save_search": "已強制執行的安全搜尋",
     "number_of_dns_query_to_safe_search": "安全搜尋已被強制執行之屬於搜尋引擎的 DNS 請求之數量",
     "average_processing_time": "平均的處理時間",
-    "average_upstream_response_time": "平均的上游回應時間",
-    "response_time": "回應時間",
+    "processing_time": "處理時間",
     "average_processing_time_hint": "在處理一項 DNS 請求時以毫秒（ms）計的平均時間",
     "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域",
     "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設置封鎖規則。",
@@ -236,7 +230,6 @@
     "updated_upstream_dns_toast": "上游的伺服器被成功地儲存",
     "dns_test_ok_toast": "已明確指定的 DNS 伺服器正在正確地運作",
     "dns_test_not_ok_toast": "伺服器 \"{{key}}\"：無法被使用，請檢查您已正確地填寫它",
-    "dns_test_parsing_error_toast": "第 {{section}} 節：第 {{line}} 行：無法使用，請檢查您輸入的是否正確",
     "dns_test_warning_toast": "上游 “{{key}}” 不回應測試請求，可能無法正常工作",
     "unblock": "解除封鎖",
     "block": "封鎖",
@@ -244,7 +237,6 @@
     "allow_this_client": "允許此用戶端",
     "block_for_this_client_only": "僅對此用戶端封鎖",
     "unblock_for_this_client_only": "僅對此用戶端解除封鎖",
-    "add_persistent_client": "新增為永久性客戶端",
     "time_table_header": "時間",
     "date": "日期",
     "domain_name_table_header": "域名",
@@ -291,9 +283,6 @@
     "custom_ip": "自訂的 IP",
     "blocking_ipv4": "封鎖 IPv4",
     "blocking_ipv6": "封鎖 IPv6",
-    "blocked_response_ttl": "已封鎖的回應之存活時間（TTL）",
-    "blocked_response_ttl_desc": "對用戶端應快取受過濾的回應，指定多少秒數",
-    "form_enter_blocked_response_ttl": "請輸入已封鎖回應的存活時間（秒）",
     "dnscrypt": "DNSCrypt",
     "dns_over_https": "DNS-over-HTTPS",
     "dns_over_tls": "DNS-over-TLS",
@@ -312,16 +301,6 @@
     "edns_use_custom_ip": "為 EDNS 使用自訂的 IP",
     "edns_use_custom_ip_desc": "允許為 EDNS 使用自訂的 IP",
     "rate_limit_desc": "每個用戶端被允許的每秒請求之數量。設定它為 0 表示無限制。",
-    "rate_limit_subnet_len_ipv4": "用於 IPv4 位址的子網路前綴長度",
-    "rate_limit_subnet_len_ipv4_desc": "用於速率限制的 IPv4 位址的子網路前綴長度。預設值為 24",
-    "rate_limit_subnet_len_ipv4_error": "IPv4 子網路前綴長度應在 0 至 32 之間",
-    "rate_limit_subnet_len_ipv6": "用於 IPv6 位址的子網路前綴長度",
-    "rate_limit_subnet_len_ipv6_desc": "用於速率限制的 IPv6 位址的子網路前綴長度。預設值為 56",
-    "rate_limit_subnet_len_ipv6_error": "IPv6 子網路前綴長度應在 0 至 128 之間",
-    "form_enter_rate_limit_subnet_len": "輸入用於速率限制的子網路前綴長度",
-    "rate_limit_whitelist": "速率限制允許清單",
-    "rate_limit_whitelist_desc": "從速率限制被排除的 IP 位址",
-    "rate_limit_whitelist_placeholder": "每行輸入一個 IP 位址",
     "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
     "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
     "blocking_mode_default": "預設：當被 AdBlock 樣式的規則封鎖時，以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆；當被 /etc/hosts 樣式的規則封鎖時，以在該規則中之已明確指定的 IP 位址回覆",
@@ -425,9 +404,6 @@
     "encryption_hostnames": "主機名稱",
     "encryption_reset": "您確定您想要重置加密設定嗎？",
     "encryption_warning": "警告",
-    "encryption_plain_dns_enable": "啟用一般的 DNS",
-    "encryption_plain_dns_desc": "預設情況下啟用一般的 DNS。使用者可以禁用它，強制所有裝置使用一般的 DNS。為此，必須至少啟用一個一般的 DNS 協定。",
-    "encryption_plain_dns_error": "要禁用一般的 DNS，請至少啟用一個一般的 DNS 協定",
     "topline_expiring_certificate": "您的安全通訊端層（SSL）憑證即將到期。更新<0>加密設定</0>。",
     "topline_expired_certificate": "您的安全通訊端層（SSL）憑證為已到期的。更新<0>加密設定</0>。",
     "form_error_port_range": "輸入在 80-65535 之範圍內的連接埠號碼",
@@ -467,7 +443,6 @@
     "form_add_id": "新增識別碼",
     "form_client_name": "輸入用戶端名稱",
     "name": "名稱",
-    "client_name": "用戶端 {{id}}",
     "client_global_settings": "使用全域的設定",
     "client_deleted": "用戶端 \"{{key}}\" 被成功地刪除",
     "client_added": "用戶端 \"{{key}}\" 被成功地加入",
@@ -678,8 +653,8 @@
     "use_saved_key": "使用該先前已儲存的金鑰",
     "parental_control": "家長控制",
     "safe_browsing": "安全瀏覽",
-    "served_from_cache_label": "從快取中",
-    "form_error_password_length": "密碼長度必須為 {{min}} 到 {{max}} 個字符",
+    "served_from_cache": "{{value}} <i>(由快取提供)</i>",
+    "form_error_password_length": "密碼必須為至少長 {{value}} 個字元",
     "anonymizer_notification": "<0>注意：</0>IP 匿名化被啟用。您可在<1>一般設定</1>中禁用它。",
     "confirm_dns_cache_clear": "您確定您想要清除 DNS 快取嗎？",
     "cache_cleared": "DNS 快取被成功地清除",
@@ -740,8 +715,5 @@
     "wednesday_short": "週三",
     "thursday_short": "週四",
     "friday_short": "週五",
-    "saturday_short": "週六",
-    "upstream_dns_cache_configuration": "上游 DNS 快取設定",
-    "enable_upstream_dns_cache": "啟用本用戶端自訂上游配置的 DNS 快取",
-    "dns_cache_size": "DNS 快取大小，單位：位元"
+    "saturday_short": "週六"
 }

client/src/actions/dnsConfig.js

@@ -62,10 +62,6 @@ export const setDnsConfig = (config) => async (dispatch) => {
             data.upstream_dns = splitByNewLine(config.upstream_dns);
             hasDnsSettings = true;
         }
-        if (Object.prototype.hasOwnProperty.call(data, 'ratelimit_whitelist')) {
-            data.ratelimit_whitelist = splitByNewLine(config.ratelimit_whitelist);
-            hasDnsSettings = true;
-        }
 
         await apiClient.setDnsConfig(data);
 

client/src/actions/index.js

@@ -338,40 +338,6 @@ export const getDnsStatus = () => async (dispatch) => {
     }
 };
 
-export const timerStatusRequest = createAction('TIMER_STATUS_REQUEST');
-export const timerStatusFailure = createAction('TIMER_STATUS_FAILURE');
-export const timerStatusSuccess = createAction('TIMER_STATUS_SUCCESS');
-
-export const getTimerStatus = () => async (dispatch) => {
-    dispatch(timerStatusRequest());
-
-    const handleRequestError = () => {
-        dispatch(addErrorToast({ error: 'dns_status_error' }));
-        dispatch(dnsStatusFailure());
-        window.location.reload(true);
-    };
-
-    const handleRequestSuccess = (response) => {
-        const dnsStatus = response.data;
-        if (dnsStatus.protection_disabled_duration === 0) {
-            dnsStatus.protection_disabled_duration = null;
-        }
-        const { running } = dnsStatus;
-        const runningStatus = dnsStatus && running;
-        if (runningStatus === true) {
-            dispatch(timerStatusSuccess(dnsStatus));
-        } else {
-            dispatch(setDnsRunningStatus(running));
-        }
-    };
-
-    try {
-        checkStatus(handleRequestSuccess, handleRequestError);
-    } catch (error) {
-        handleRequestError();
-    }
-};
-
 export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
 export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
 export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');
@@ -403,11 +369,6 @@ export const testUpstream = (
                 const message = upstreamResponse[key];
                 if (message.startsWith('WARNING:')) {
                     dispatch(addErrorToast({ error: i18next.t('dns_test_warning_toast', { key }) }));
-                } else if (message.endsWith(': parsing error')) {
-                    const info = message.substring(0, message.indexOf(':'));
-                    const [sectionKey, line] = info.split(' ');
-                    const section = i18next.t(sectionKey);
-                    dispatch(addErrorToast({ error: i18next.t('dns_test_parsing_error_toast', { section, line }) }));
                 } else if (message !== 'OK') {
                     dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
                 }
@@ -699,24 +660,6 @@ export const removeStaticLease = (config) => async (dispatch) => {
     }
 };
 
-export const updateStaticLeaseRequest = createAction('UPDATE_STATIC_LEASE_REQUEST');
-export const updateStaticLeaseFailure = createAction('UPDATE_STATIC_LEASE_FAILURE');
-export const updateStaticLeaseSuccess = createAction('UPDATE_STATIC_LEASE_SUCCESS');
-
-export const updateStaticLease = (config) => async (dispatch) => {
-    dispatch(updateStaticLeaseRequest());
-    try {
-        await apiClient.updateStaticLease(config);
-        dispatch(updateStaticLeaseSuccess(config));
-        dispatch(addSuccessToast(i18next.t('dhcp_lease_updated', { key: config.hostname || config.ip })));
-        dispatch(toggleLeaseModal());
-        dispatch(getDhcpStatus());
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(updateStaticLeaseFailure());
-    }
-};
-
 export const removeToast = createAction('REMOVE_TOAST');
 
 export const toggleBlocking = (

client/src/api/Api.js

@@ -274,8 +274,6 @@ class Api {
 
     DHCP_REMOVE_STATIC_LEASE = { path: 'dhcp/remove_static_lease', method: 'POST' };
 
-    DHCP_UPDATE_STATIC_LEASE = { path: 'dhcp/update_static_lease', method: 'POST' };
-
     DHCP_RESET = { path: 'dhcp/reset', method: 'POST' };
 
     DHCP_LEASES_RESET = { path: 'dhcp/reset_leases', method: 'POST' };
@@ -322,14 +320,6 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    updateStaticLease(config) {
-        const { path, method } = this.DHCP_UPDATE_STATIC_LEASE;
-        const parameters = {
-            data: config,
-        };
-        return this.makeRequest(path, method, parameters);
-    }
-
     resetDhcp() {
         const { path, method } = this.DHCP_RESET;
         return this.makeRequest(path, method);

client/src/components/App/index.css

@@ -118,11 +118,6 @@ body {
     overflow-y: auto;
 }
 
-.modal-body--filters {
-    max-height: 600px;
-    overflow-y: auto;
-}
-
 .modal-body__item:not(:first-child) {
     padding-top: 1.5rem;
 }
@@ -139,6 +134,15 @@ body {
     cursor: not-allowed;
 }
 
+.button-action {
+    visibility: hidden;
+}
+
+.logs__row:hover .button-action,
+.button-action--active {
+    visibility: visible;
+}
+
 .ReactModal__Body--open {
     overflow: hidden;
 }

client/src/components/App/index.js

@@ -28,7 +28,7 @@ import {
 } from '../../helpers/constants';
 import { getLogsUrlParams, setHtmlLangAttr, setUITheme } from '../../helpers/helpers';
 import Header from '../Header';
-import { changeLanguage, getDnsStatus, getTimerStatus } from '../../actions';
+import { changeLanguage, getDnsStatus } from '../../actions';
 
 import Dashboard from '../../containers/Dashboard';
 import SetupGuide from '../../containers/SetupGuide';
@@ -126,18 +126,6 @@ const App = () => {
 
     useEffect(() => {
         dispatch(getDnsStatus());
-
-        const handleVisibilityChange = () => {
-            if (document.visibilityState === 'visible') {
-                dispatch(getTimerStatus());
-            }
-        };
-
-        document.addEventListener('visibilitychange', handleVisibilityChange);
-
-        return () => {
-            document.removeEventListener('visibilitychange', handleVisibilityChange);
-        };
     }, []);
 
     const setLanguage = () => {

client/src/components/Dashboard/BlockedDomains.js

@@ -8,7 +8,7 @@ import Cell from '../ui/Cell';
 import DomainCell from './DomainCell';
 
 import { getPercent } from '../../helpers/helpers';
-import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } from '../../helpers/constants';
+import { STATUS_COLORS } from '../../helpers/constants';
 
 const CountCell = (totalBlocked) => function cell(row) {
     const { value } = row;
@@ -62,8 +62,8 @@ const BlockedDomains = ({
                 ]}
                 showPagination={false}
                 noDataText={t('no_domains_found')}
-                minRows={TABLES_MIN_ROWS}
-                defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+                minRows={6}
+                defaultPageSize={100}
                 className="-highlight card-table-overflow--limited stats__table"
             />
         </Card>

client/src/components/Dashboard/Clients.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import ReactTable from 'react-table';
 import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
@@ -9,16 +9,10 @@ import Card from '../ui/Card';
 import Cell from '../ui/Cell';
 
 import { getPercent, sortIp } from '../../helpers/helpers';
-import {
-    BLOCK_ACTIONS,
-    DASHBOARD_TABLES_DEFAULT_PAGE_SIZE,
-    STATUS_COLORS,
-    TABLES_MIN_ROWS,
-} from '../../helpers/constants';
+import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
 import { toggleClientBlock } from '../../actions/access';
 import { renderFormattedClientCell } from '../../helpers/renderFormattedClientCell';
 import { getStats } from '../../actions/stats';
-import IconTooltip from '../Logs/Cells/IconTooltip';
 
 const getClientsPercentColor = (percent) => {
     if (percent > 50) {
@@ -46,7 +40,9 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
     const processingSet = useSelector((state) => state.access.processingSet);
     const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);
 
-    const [isOptionsOpened, setOptionsOpened] = useState(false);
+    const buttonClass = classNames('button-action button-action--main', {
+        'button-action--unblock': disallowed,
+    });
 
     const toggleClientStatus = async (ip, disallowed, disallowed_rule) => {
         let confirmMessage;
@@ -66,49 +62,23 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
         }
     };
 
-    const onClick = () => {
-        toggleClientStatus(ip, disallowed, disallowed_rule);
-        setOptionsOpened(false);
-    };
+    const onClick = () => toggleClientStatus(ip, disallowed, disallowed_rule);
 
     const text = disallowed ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
 
     const lastRuleInAllowlist = !disallowed && allowedСlients === disallowed_rule;
     const disabled = processingSet || lastRuleInAllowlist;
     return (
-        <div className="table__action">
+        <div className="table__action pl-4">
             <button
                 type="button"
-                className="btn btn-icon btn-sm px-0"
-                onClick={() => setOptionsOpened(true)}
+                className={buttonClass}
+                onClick={onClick}
+                disabled={disabled}
+                title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''}
             >
-                <svg className="icon24 icon--lightgray button-action__icon">
-                    <use xlinkHref="#bullets" />
-                </svg>
+                <Trans>{text}</Trans>
             </button>
-            {isOptionsOpened && (
-                <IconTooltip
-                    className="icon24"
-                    tooltipClass="button-action--arrow-option-container"
-                    xlinkHref="bullets"
-                    triggerClass="btn btn-icon btn-sm px-0 button-action__hidden-trigger"
-                    content={(
-                        <button
-                            className={classNames('button-action--arrow-option px-4 py-1', disallowed ? 'bg--green' : 'bg--danger')}
-                            onClick={onClick}
-                            disabled={disabled}
-                            title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''}
-                        >
-                            <Trans>{text}</Trans>
-                        </button>
-                    )}
-                    placement="bottom-end"
-                    trigger="click"
-                    onVisibilityChange={setOptionsOpened}
-                    defaultTooltipShown={true}
-                    delayHide={0}
-                />
-            )}
         </div>
     );
 };
@@ -164,8 +134,8 @@ const Clients = ({
                 ]}
                 showPagination={false}
                 noDataText={t('no_clients_found')}
-                minRows={TABLES_MIN_ROWS}
-                defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+                minRows={6}
+                defaultPageSize={100}
                 className="-highlight card-table-overflow--limited clients__table"
                 getTrProps={(_state, rowInfo) => {
                     if (!rowInfo) {

client/src/components/Dashboard/Counters.js

@@ -4,9 +4,9 @@ import { Trans, useTranslation } from 'react-i18next';
 import round from 'lodash/round';
 import { shallowEqual, useSelector } from 'react-redux';
 import Card from '../ui/Card';
-import { formatNumber, msToDays, msToHours } from '../../helpers/helpers';
+import { formatNumber } from '../../helpers/helpers';
 import LogsSearchLink from '../ui/LogsSearchLink';
-import { RESPONSE_FILTER, TIME_UNITS } from '../../helpers/constants';
+import { RESPONSE_FILTER, DAY } from '../../helpers/constants';
 import Tooltip from '../ui/Tooltip';
 
 const Row = ({
@@ -52,19 +52,14 @@ const Counters = ({ refreshButton, subtitle }) => {
         numReplacedParental,
         numReplacedSafesearch,
         avgProcessingTime,
-        timeUnits,
     } = useSelector((state) => state.stats, shallowEqual);
     const { t } = useTranslation();
-
-    const dnsQueryTooltip = timeUnits === TIME_UNITS.HOURS
-        ? t('number_of_dns_query_hours', { count: msToHours(interval) })
-        : t('number_of_dns_query_days', { count: msToDays(interval) });
-
+    const days = interval / DAY;
     const rows = [
         {
             label: 'dns_query',
             count: numDnsQueries,
-            tooltipTitle: dnsQueryTooltip,
+            tooltipTitle: days === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: days }),
             response_status: RESPONSE_FILTER.ALL.QUERY,
         },
         {

client/src/components/Dashboard/Dashboard.css

@@ -28,14 +28,11 @@
     border-bottom: 6px solid #585965;
 }
 
-.table__action {
-    position: relative;
-    margin-left: auto;
-}
-
-.table__action .btn-icon {
-    outline: 0;
-    box-shadow: none;
+@media (max-width: 1279.98px) {
+    .table__action {
+        position: absolute;
+        right: 0;
+    }
 }
 
 .page-title--dashboard {

client/src/components/Dashboard/QueriedDomains.js

@@ -7,7 +7,7 @@ import Card from '../ui/Card';
 import Cell from '../ui/Cell';
 import DomainCell from './DomainCell';
 
-import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } from '../../helpers/constants';
+import { STATUS_COLORS } from '../../helpers/constants';
 import { getPercent } from '../../helpers/helpers';
 
 const getQueriedPercentColor = (percent) => {
@@ -58,8 +58,8 @@ const QueriedDomains = ({
             ]}
             showPagination={false}
             noDataText={t('no_domains_found')}
-            minRows={TABLES_MIN_ROWS}
-            defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+            minRows={6}
+            defaultPageSize={100}
             className="-highlight card-table-overflow--limited stats__table"
         />
     </Card>

client/src/components/Dashboard/UpstreamAvgTime.js

@@ -6,7 +6,6 @@ import { withTranslation, Trans } from 'react-i18next';
 
 import Card from '../ui/Card';
 import DomainCell from './DomainCell';
-import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, TABLES_MIN_ROWS } from '../../helpers/constants';
 
 const TimeCell = ({ value }) => {
     if (!value) {
@@ -38,7 +37,7 @@ const UpstreamAvgTime = ({
     subtitle,
 }) => (
     <Card
-        title={t('average_upstream_response_time')}
+        title={t('average_processing_time')}
         subtitle={subtitle}
         bodyType="card-table"
         refresh={refreshButton}
@@ -55,7 +54,7 @@ const UpstreamAvgTime = ({
                     Cell: DomainCell,
                 },
                 {
-                    Header: <Trans>response_time</Trans>,
+                    Header: <Trans>processing_time</Trans>,
                     accessor: 'count',
                     maxWidth: 190,
                     Cell: TimeCell,
@@ -63,8 +62,8 @@ const UpstreamAvgTime = ({
             ]}
             showPagination={false}
             noDataText={t('no_upstreams_data_found')}
-            minRows={TABLES_MIN_ROWS}
-            defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+            minRows={6}
+            defaultPageSize={100}
             className="-highlight card-table-overflow--limited stats__table"
         />
     </Card>

client/src/components/Dashboard/UpstreamResponses.js

@@ -8,7 +8,7 @@ import Cell from '../ui/Cell';
 import DomainCell from './DomainCell';
 
 import { getPercent } from '../../helpers/helpers';
-import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } from '../../helpers/constants';
+import { STATUS_COLORS } from '../../helpers/constants';
 
 const CountCell = (totalBlocked) => (
     function cell(row) {
@@ -64,8 +64,8 @@ const UpstreamResponses = ({
             ]}
             showPagination={false}
             noDataText={t('no_upstreams_data_found')}
-            minRows={TABLES_MIN_ROWS}
-            defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+            minRows={6}
+            defaultPageSize={100}
             className="-highlight card-table-overflow--limited stats__table"
         />
     </Card>

client/src/components/Dashboard/index.js

@@ -9,12 +9,7 @@ import Counters from './Counters';
 import Clients from './Clients';
 import QueriedDomains from './QueriedDomains';
 import BlockedDomains from './BlockedDomains';
-import {
-    DISABLE_PROTECTION_TIMINGS,
-    ONE_SECOND_IN_MS,
-    SETTINGS_URLS,
-    TIME_UNITS,
-} from '../../helpers/constants';
+import { DISABLE_PROTECTION_TIMINGS, ONE_SECOND_IN_MS, SETTINGS_URLS } from '../../helpers/constants';
 import {
     msToSeconds,
     msToMinutes,
@@ -51,18 +46,15 @@ const Dashboard = ({
         getAllStats();
     }, []);
     const getSubtitle = () => {
-        if (!stats.enabled) {
+        const ONE_DAY = 1;
+        const intervalInDays = msToDays(stats.interval);
+
+        if (intervalInDays < ONE_DAY) {
             return t('stats_disabled_short');
         }
 
-        const msIn7Days = 604800000;
-
-        if (stats.timeUnits === TIME_UNITS.HOURS && stats.interval === msIn7Days) {
-            return t('for_last_days', { count: msToDays(stats.interval) });
-        }
-
-        return stats.timeUnits === TIME_UNITS.HOURS
-            ? t('for_last_hours', { count: msToHours(stats.interval) })
+        return intervalInDays === ONE_DAY
+            ? t('for_last_24_hours')
             : t('for_last_days', { count: msToDays(stats.interval) });
     };
 

client/src/components/Filters/Examples.js

@@ -36,7 +36,7 @@ const Examples = () => (
             <Trans
                 components={[
                     <a
-                        href="https://link.adtidy.org/forward.html?action=dns_kb_filtering_syntax&from=ui&app=home"
+                        href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists"
                         target="_blank"
                         rel="noopener noreferrer"
                         key="0"

client/src/components/Filters/Form.js

@@ -28,7 +28,7 @@ const renderIcons = (iconsData) => iconsData.map(({
 }) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
          className={classNames('d-flex align-items-center', className)}
 >
-    <svg className="icon icon--15 mr-1 icon--gray">
+    <svg className="nav-icon nav-icon--gray">
         <use xlinkHref={`#${iconName}`} />
     </svg>
 </a>);
@@ -110,7 +110,7 @@ const Form = (props) => {
     const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
 
     return <form onSubmit={handleSubmit}>
-        <div className="modal-body modal-body--filters">
+        <div className="modal-body modal-body--medium">
             {modalType === MODAL_TYPE.SELECT_MODAL_TYPE
             && <div className="d-flex justify-content-around">
                 <button onClick={openFilteringListModal}

client/src/components/Filters/Modal.js

@@ -13,8 +13,6 @@ ReactModal.setAppElement('#root');
 const MODAL_TYPE_TO_TITLE_TYPE_MAP = {
     [MODAL_TYPE.EDIT_FILTERS]: 'edit',
     [MODAL_TYPE.ADD_FILTERS]: 'new',
-    [MODAL_TYPE.EDIT_CLIENT]: 'edit',
-    [MODAL_TYPE.ADD_CLIENT]: 'new',
     [MODAL_TYPE.SELECT_MODAL_TYPE]: 'new',
     [MODAL_TYPE.CHOOSE_FILTERING_LIST]: 'choose',
 };

client/src/components/Filters/Rewrites/Table.js

@@ -3,8 +3,7 @@ import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { withTranslation } from 'react-i18next';
 import { sortIp } from '../../../helpers/helpers';
-import { MODAL_TYPE, TABLES_MIN_ROWS } from '../../../helpers/constants';
-import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../helpers/localStorageHelper';
+import { MODAL_TYPE } from '../../../helpers/constants';
 
 class Table extends Component {
     cellWrap = ({ value }) => (
@@ -86,9 +85,8 @@ class Table extends Component {
                 loading={processing || processingAdd || processingDelete}
                 className="-striped -highlight card-table-overflow"
                 showPagination
-                defaultPageSize={LocalStorageHelper.getItem(LOCAL_STORAGE_KEYS.REWRITES_PAGE_SIZE) || 10}
-                onPageSizeChange={(size) => LocalStorageHelper.setItem(LOCAL_STORAGE_KEYS.REWRITES_PAGE_SIZE, size)}
-                minRows={TABLES_MIN_ROWS}
+                defaultPageSize={10}
+                minRows={5}
                 ofText="/"
                 previousText={t('previous_btn')}
                 nextText={t('next_btn')}

client/src/components/Filters/Services/ScheduleForm/Modal.js

@@ -81,10 +81,6 @@ export const Modal = ({
             };
         });
 
-        if (timezone !== intialTimezone) {
-            newSchedule.time_zone = timezone;
-        }
-
         onSubmit(newSchedule);
     };
 

client/src/components/Filters/Services/ScheduleForm/Timezone.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import ct from 'countries-and-timezones';
+import timezones from 'timezones-list';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 
@@ -15,8 +15,6 @@ export const Timezone = ({
         setTimezone(event.target.value);
     };
 
-    const timezones = ct.getAllTimezones();
-
     return (
         <div className="schedule__timezone">
             <label className="form__label form__label--with-desc mb-2">
@@ -32,9 +30,9 @@ export const Timezone = ({
                     {t('schedule_timezone')}
                 </option>
                 {/* TODO: get timezones from backend method when the method is ready */}
-                {Object.keys(timezones).map((zone) => (
-                    <option key={zone} value={zone}>
-                        {zone} (GMT{timezones[zone].utcOffsetStr})
+                {timezones.map((zone) => (
+                    <option key={zone.name} value={zone.tzCode}>
+                        {zone.label}
                     </option>
                 ))}
             </select>

client/src/components/Filters/Services/ScheduleForm/index.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import cn from 'classnames';
@@ -21,7 +21,10 @@ export const ScheduleForm = ({
     const onModalOpen = () => setModalOpen(true);
     const onModalClose = () => setModalOpen(false);
 
-    const filteredScheduleKeys = schedule ? Object.keys(schedule).filter((v) => v !== 'time_zone') : [];
+    const filteredScheduleKeys = useMemo(() => (
+        schedule ? Object.keys(schedule).filter((v) => v !== 'time_zone') : []
+    ), [schedule]);
+
     const scheduleMap = new Map();
     filteredScheduleKeys.forEach((day) => scheduleMap.set(day, schedule[day]));
 

client/src/components/Filters/Table.js

@@ -6,7 +6,6 @@ import CellWrap from '../ui/CellWrap';
 import { MODAL_TYPE } from '../../helpers/constants';
 import { formatDetailedDateTime } from '../../helpers/helpers';
 import { isValidAbsolutePath } from '../../helpers/form';
-import { LOCAL_STORAGE_KEYS, LocalStorageHelper } from '../../helpers/localStorageHelper';
 
 class Table extends Component {
     getDateCell = (row) => CellWrap(row, formatDetailedDateTime);
@@ -127,17 +126,12 @@ class Table extends Component {
             loading, filters, t, whitelist,
         } = this.props;
 
-        const localStorageKey = whitelist
-            ? LOCAL_STORAGE_KEYS.ALLOWLIST_PAGE_SIZE
-            : LOCAL_STORAGE_KEYS.BLOCKLIST_PAGE_SIZE;
-
         return (
             <ReactTable
                 data={filters}
                 columns={this.columns}
                 showPagination
-                defaultPageSize={LocalStorageHelper.getItem(localStorageKey) || 10}
-                onPageSizeChange={(size) => LocalStorageHelper.setItem(localStorageKey, size)}
+                defaultPageSize={10}
                 loading={loading}
                 minRows={6}
                 ofText="/"

client/src/components/Logs/Cells/ClientCell.js

@@ -3,7 +3,7 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { nanoid } from 'nanoid';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
-import { Link, useHistory } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import propTypes from 'prop-types';
 
 import { checkFiltered, getBlockingClientName } from '../../../helpers/helpers';
@@ -25,14 +25,14 @@ const ClientCell = ({
 }) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
-    const history = useHistory();
     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);
-    const clients = useSelector((state) => state.dashboard.clients);
     const source = autoClient?.source;
     const whoisAvailable = client_info && Object.keys(client_info.whois).length > 0;
     const clientName = client_info?.name || client_id;
@@ -57,8 +57,6 @@ const ClientCell = ({
 
     const isFiltered = checkFiltered(reason);
 
-    const clientIds = clients.map((c) => c.ids).flat();
-
     const nameClass = classNames('w-90 o-hidden d-flex flex-column', {
         'mt-2': isDetailed && !client_info?.name && !whoisAvailable,
         'white-space--nowrap': isDetailed,
@@ -70,6 +68,7 @@ const ClientCell = ({
 
     const renderBlockingButton = (isFiltered, domain) => {
         const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
+        const clients = useSelector((state) => state.dashboard.clients);
 
         const {
             confirmMessage,
@@ -85,23 +84,11 @@ const ClientCell = ({
         const blockingForClientKey = isFiltered ? 'unblock_for_this_client_only' : 'block_for_this_client_only';
         const clientNameBlockingFor = getBlockingClientName(clients, client);
 
-        const onClick = async () => {
-            await dispatch(toggleBlocking(buttonType, domain));
-            await dispatch(getStats());
-            setOptionsOpened(false);
-        };
-
         const BUTTON_OPTIONS = [
-            {
-                name: buttonType,
-                onClick,
-                className: isFiltered ? 'bg--green' : 'bg--danger',
-            },
             {
                 name: blockingForClientKey,
                 onClick: () => {
                     dispatch(toggleBlockingForClient(buttonType, domain, clientNameBlockingFor));
-                    setOptionsOpened(false);
                 },
             },
             {
@@ -114,21 +101,16 @@ const ClientCell = ({
                             client_info?.disallowed_rule || '',
                         ));
                         await dispatch(updateLogs());
-                        setOptionsOpened(false);
                     }
                 },
-                disabled: lastRuleInAllowlist,
+                disabled: processingSet || lastRuleInAllowlist,
             },
         ];
 
-        if (!clientIds.includes(client)) {
-            BUTTON_OPTIONS.push({
-                name: 'add_persistent_client',
-                onClick: () => {
-                    history.push(`/#clients?clientId=${client}`);
-                },
-            });
-        }
+        const onClick = async () => {
+            await dispatch(toggleBlocking(buttonType, domain));
+            await dispatch(getStats());
+        };
 
         const getOptions = (options) => {
             if (options.length === 0) {
@@ -136,12 +118,10 @@ const ClientCell = ({
             }
             return (
                 <>
-                    {options.map(({
-                        name, onClick, disabled, className,
-                    }) => (
+                    {options.map(({ name, onClick, disabled }) => (
                         <button
                             key={name}
-                            className={classNames('button-action--arrow-option px-4 py-1', className)}
+                            className="button-action--arrow-option px-4 py-1"
                             onClick={onClick}
                             disabled={disabled}
                         >
@@ -154,6 +134,17 @@ const ClientCell = ({
 
         const content = getOptions(BUTTON_OPTIONS);
 
+        const buttonClass = classNames('button-action button-action--main', {
+            'button-action--unblock': isFiltered,
+            'button-action--with-options': content,
+            'button-action--active': isOptionsOpened,
+        });
+
+        const buttonArrowClass = classNames('button-action button-action--arrow', {
+            'button-action--unblock': isFiltered,
+            'button-action--active': isOptionsOpened,
+        });
+
         const containerClass = classNames('button-action__container', {
             'button-action__container--detailed': isDetailed,
         });
@@ -162,26 +153,25 @@ const ClientCell = ({
             <div className={containerClass}>
                 <button
                     type="button"
-                    className="btn btn-icon btn-sm px-0"
-                    onClick={() => setOptionsOpened(true)}
+                    className={buttonClass}
+                    onClick={onClick}
+                    disabled={processingRules}
                 >
-                    <svg className="icon24 icon--lightgray button-action__icon">
-                        <use xlinkHref="#bullets" />
-                    </svg>
+                    {t(buttonType)}
                 </button>
-                {isOptionsOpened && (
-                    <IconTooltip
-                        className="icon24"
-                        tooltipClass="button-action--arrow-option-container"
-                        xlinkHref="bullets"
-                        triggerClass="btn btn-icon btn-sm px-0 button-action__hidden-trigger"
-                        content={content}
-                        placement="bottom-end"
-                        trigger="click"
-                        onVisibilityChange={setOptionsOpened}
-                        defaultTooltipShown={true}
-                        delayHide={0}
-                    />
+                {content && (
+                    <button className={buttonArrowClass} disabled={processingRules}>
+                        <IconTooltip
+                            className="icon24"
+                            tooltipClass="button-action--arrow-option-container"
+                            xlinkHref="chevron-down"
+                            triggerClass="button-action--icon"
+                            content={content}
+                            placement="bottom-end"
+                            trigger="click"
+                            onVisibilityChange={setOptionsOpened}
+                        />
+                    </button>
                 )}
             </div>
         );
@@ -208,7 +198,7 @@ const ClientCell = ({
                 </div>
                 {isDetailed && clientName && !whoisAvailable && (
                     <Link
-                        className="detailed-info d-none d-sm-block logs__text logs__text--link logs__text--client"
+                        className="detailed-info d-none d-sm-block logs__text logs__text--link"
                         to={`logs?search="${encodeURIComponent(clientName)}"`}
                         title={clientName}
                     >

client/src/components/Logs/Cells/IconTooltip.css

@@ -1,5 +1,4 @@
 .tooltip-custom__container {
-    min-width: 150px;
     padding: 1rem 1.5rem 1.25rem 1.5rem;
     font-size: 16px !important;
     box-shadow: 2px 4px 8px rgba(0, 0, 0, 0.2);

client/src/components/Logs/Cells/IconTooltip.js

@@ -21,8 +21,6 @@ const IconTooltip = ({
     content,
     trigger,
     onVisibilityChange,
-    defaultTooltipShown,
-    delayHide,
     renderContent = content ? React.Children.map(
         processContent(content),
         (item, idx) => <div key={idx} className={contentItemClass}>
@@ -46,8 +44,6 @@ const IconTooltip = ({
         trigger={trigger}
         onVisibilityChange={onVisibilityChange}
         delayShow={trigger === 'click' ? 0 : SHOW_TOOLTIP_DELAY}
-        delayHide={delayHide}
-        defaultTooltipShown={defaultTooltipShown}
     >
         {xlinkHref && <svg className={className}>
             <use xlinkHref={`#${xlinkHref}`} />
@@ -69,8 +65,6 @@ IconTooltip.propTypes = {
     content: PropTypes.node,
     renderContent: PropTypes.arrayOf(PropTypes.element),
     onVisibilityChange: PropTypes.func,
-    defaultTooltipShown: PropTypes.bool,
-    delayHide: PropTypes.number,
 };
 
 export default IconTooltip;

client/src/components/Logs/Cells/ResponseCell.js

@@ -38,6 +38,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) {
@@ -55,16 +58,7 @@ const ResponseCell = ({
 
     const COMMON_CONTENT = {
         encryption_status: boldStatusLabel,
-        install_settings_dns: upstream,
-        ...(cached
-            && {
-                served_from_cache_label: (
-                    <svg className="icons icon--20 icon--green mb-1">
-                        <use xlinkHref="#check" />
-                    </svg>
-                ),
-            }
-        ),
+        install_settings_dns: upstreamString,
         elapsed: formattedElapsedMs,
         response_code: status,
         ...(service_name && services.allServices

client/src/components/Logs/Cells/index.js

@@ -118,6 +118,9 @@ const Row = memo(({
 
         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));
@@ -189,16 +192,7 @@ const Row = memo(({
                             className="link--green">{sourceData.name}
                     </a>,
             response_details: 'title',
-            install_settings_dns: upstream,
-            ...(cached
-                && {
-                    served_from_cache_label: (
-                        <svg className="icons icon--20 icon--green">
-                            <use xlinkHref="#check" />
-                        </svg>
-                    ),
-                }
-            ),
+            install_settings_dns: upstreamString,
             elapsed: formattedElapsedMs,
             ...(rules.length > 0
                     && { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }

client/src/components/Logs/Logs.css

@@ -80,10 +80,6 @@
     color: var(--gray-f3);
 }
 
-.logs__table .logs__text--client {
-    padding-right: 32px;
-}
-
 .icon--selected {
     background-color: var(--gray-f3);
     border: solid 1px var(--gray-d8);
@@ -265,8 +261,9 @@
 .button-action__container {
     display: flex;
     position: absolute;
-    right: 2px;
+    right: 0;
     bottom: 0.5rem;
+    height: 1.6rem;
 }
 
 @media screen and (max-width: 1024px) {
@@ -310,10 +307,45 @@
     border-bottom-right-radius: 0;
 }
 
+.button-action--arrow {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left: 1px solid var(--white);
+    width: 1.5625rem;
+    padding: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
 .button-action:hover {
     cursor: pointer;
 }
 
+.button-action--arrow .button-action--icon {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+}
+
+.button-action:active {
+    background: var(--btn-block-active);
+}
+
+.button-action--unblock:active {
+    background: var(--btn-unblock-active);
+}
+
+.button-action:disabled {
+    background: var(--btn-block-disabled);
+    cursor: default;
+}
+
+.button-action--unblock:disabled {
+    background: var(--btn-unblock-disabled);
+}
+
 .button-action--arrow-option {
     background: transparent;
     border: 0;
@@ -519,20 +551,3 @@
     padding: 1rem 1.5rem;
     background-color: var(--card-bgcolor);
 }
-
-.button-action__hidden-trigger {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 1px;
-    height: 33px;
-    margin: -1px;
-    padding: 0;
-    overflow: hidden;
-    border: 0;
-    clip: rect(0 0 0 0);
-}
-
-[data-theme="dark"] .button-action__icon {
-    color: var(--gray-f3);
-}

client/src/components/Settings/Clients/AutoClients.js

@@ -9,8 +9,6 @@ import CellWrap from '../../ui/CellWrap';
 import whoisCell from './whoisCell';
 import LogsSearchLink from '../../ui/LogsSearchLink';
 import { sortIp } from '../../../helpers/helpers';
-import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../helpers/localStorageHelper';
-import { TABLES_MIN_ROWS } from '../../../helpers/constants';
 
 const COLUMN_MIN_WIDTH = 200;
 
@@ -87,11 +85,8 @@ class AutoClients extends Component {
                     ]}
                     className="-striped -highlight card-table-overflow"
                     showPagination
-                    defaultPageSize={LocalStorageHelper.getItem(LOCAL_STORAGE_KEYS.AUTO_CLIENTS_PAGE_SIZE) || 10}
-                    onPageSizeChange={(size) => (
-                        LocalStorageHelper.setItem(LOCAL_STORAGE_KEYS.AUTO_CLIENTS_PAGE_SIZE, size)
-                    )}
-                    minRows={TABLES_MIN_ROWS}
+                    defaultPageSize={10}
+                    minRows={5}
                     ofText="/"
                     previousText={t('previous_btn')}
                     nextText={t('next_btn')}

client/src/components/Settings/Clients/ClientsTable/ClientsTable.js

@@ -4,7 +4,6 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
-import { useHistory, useLocation } from 'react-router-dom';
 import ReactTable from 'react-table';
 
 import { getAllBlockedServices, getBlockedServices } from '../../../../actions/services';
@@ -15,12 +14,11 @@ import {
     sortIp,
     getService,
 } from '../../../../helpers/helpers';
-import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE, TABLES_MIN_ROWS } from '../../../../helpers/constants';
+import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE } from '../../../../helpers/constants';
 import Card from '../../../ui/Card';
 import CellWrap from '../../../ui/CellWrap';
 import LogsSearchLink from '../../../ui/LogsSearchLink';
 import Modal from '../Modal';
-import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../../helpers/localStorageHelper';
 
 const ClientsTable = ({
     clients,
@@ -40,12 +38,8 @@ const ClientsTable = ({
 }) => {
     const [t] = useTranslation();
     const dispatch = useDispatch();
-    const location = useLocation();
-    const history = useHistory();
     const services = useSelector((store) => store?.services);
     const globalSettings = useSelector((store) => store?.settings.settingsList) || {};
-    const params = new URLSearchParams(location.search);
-    const clientId = params.get('clientId');
 
     const { safesearch } = globalSettings;
 
@@ -53,12 +47,6 @@ const ClientsTable = ({
         dispatch(getAllBlockedServices());
         dispatch(getBlockedServices());
         dispatch(initSettings());
-
-        if (clientId) {
-            toggleClientModal({
-                type: MODAL_TYPE.ADD_CLIENT,
-            });
-        }
     }, []);
 
     const handleFormAdd = (values) => {
@@ -90,21 +78,13 @@ const ClientsTable = ({
             } else {
                 config.tags = [];
             }
-
-            if (typeof values.upstreams_cache_size === 'string') {
-                config.upstreams_cache_size = 0;
-            }
         }
 
-        if (modalType === MODAL_TYPE.EDIT_CLIENT) {
+        if (modalType === MODAL_TYPE.EDIT_FILTERS) {
             handleFormUpdate(config, modalClientName);
         } else {
             handleFormAdd(config);
         }
-
-        if (clientId) {
-            history.push('/#clients');
-        }
     };
 
     const getOptionsWithLabels = (options) => (
@@ -148,14 +128,6 @@ const ClientsTable = ({
         }
     };
 
-    const handleClose = () => {
-        toggleClientModal();
-
-        if (clientId) {
-            history.push('/#clients');
-        }
-    };
-
     const columns = [
         {
             Header: t('table_client'),
@@ -321,7 +293,7 @@ const ClientsTable = ({
                             type="button"
                             className="btn btn-icon btn-outline-primary btn-sm mr-2"
                             onClick={() => toggleClientModal({
-                                type: MODAL_TYPE.EDIT_CLIENT,
+                                type: MODAL_TYPE.EDIT_FILTERS,
                                 name: clientName,
                             })
                             }
@@ -370,11 +342,8 @@ const ClientsTable = ({
                     ]}
                     className="-striped -highlight card-table-overflow"
                     showPagination
-                    defaultPageSize={LocalStorageHelper.getItem(LOCAL_STORAGE_KEYS.CLIENTS_PAGE_SIZE) || 10}
-                    onPageSizeChange={(size) => (
-                        LocalStorageHelper.setItem(LOCAL_STORAGE_KEYS.CLIENTS_PAGE_SIZE, size)
-                    )}
-                    minRows={TABLES_MIN_ROWS}
+                    defaultPageSize={10}
+                    minRows={5}
                     ofText="/"
                     previousText={t('previous_btn')}
                     nextText={t('next_btn')}
@@ -394,13 +363,12 @@ const ClientsTable = ({
                 <Modal
                     isModalOpen={isModalOpen}
                     modalType={modalType}
-                    handleClose={handleClose}
+                    toggleClientModal={toggleClientModal}
                     currentClientData={currentClientData}
                     handleSubmit={handleSubmit}
                     processingAdding={processingAdding}
                     processingUpdating={processingUpdating}
                     tagsOptions={tagsOptions}
-                    clientId={clientId}
                 />
             </>
         </Card>

client/src/components/Settings/Clients/Form.js

@@ -12,13 +12,8 @@ import i18n from '../../../i18n';
 import Tabs from '../../ui/Tabs';
 import Examples from '../Dns/Upstream/Examples';
 import { ScheduleForm } from '../../Filters/Services/ScheduleForm';
+import { toggleAllServices, trimLinesAndRemoveEmpty, captitalizeWords } from '../../../helpers/helpers';
 import {
-    toggleAllServices,
-    trimLinesAndRemoveEmpty,
-    captitalizeWords,
-} from '../../../helpers/helpers';
-import {
-    toNumber,
     renderInputField,
     renderGroupField,
     CheckboxField,
@@ -26,7 +21,7 @@ import {
     renderTextareaField,
 } from '../../../helpers/form';
 import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
-import { CLIENT_ID_LINK, FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
+import { CLIENT_ID_LINK, FORM_NAME } from '../../../helpers/constants';
 import './Service.css';
 
 const settingsCheckboxes = [
@@ -147,7 +142,7 @@ let Form = (props) => {
         useGlobalSettings,
         useGlobalServices,
         blockedServicesSchedule,
-        handleClose,
+        toggleClientModal,
         processingAdding,
         processingUpdating,
         invalid,
@@ -162,7 +157,7 @@ let Form = (props) => {
     const [activeTabLabel, setActiveTabLabel] = useState('settings');
 
     const handleScheduleSubmit = (values) => {
-        change('blocked_services_schedule', { ...values });
+        change('blocked_services_schedule', values);
     };
 
     const tabs = {
@@ -312,35 +307,6 @@ let Form = (props) => {
                     normalizeOnBlur={trimLinesAndRemoveEmpty}
                 />
                 <Examples />
-                <div className="form__label--bold mt-5 mb-3">
-                    {t('upstream_dns_cache_configuration')}
-                </div>
-                <div className="form__group mb-2">
-                    <Field
-                        name="upstreams_cache_enabled"
-                        type="checkbox"
-                        component={CheckboxField}
-                        placeholder={t('enable_upstream_dns_cache')}
-                    />
-                </div>
-                <div className="form__group form__group--settings">
-                    <label
-                        htmlFor="upstreams_cache_size"
-                        className="form__label"
-                    >
-                        {t('dns_cache_size')}
-                    </label>
-                    <Field
-                        name="upstreams_cache_size"
-                        type="number"
-                        component={renderInputField}
-                        placeholder={t('enter_cache_size')}
-                        className="form-control"
-                        normalize={toNumber}
-                        min={0}
-                        max={UINT32_RANGE.MAX}
-                    />
-                </div>
             </div>,
         },
     };
@@ -371,7 +337,7 @@ let Form = (props) => {
                         </div>
                         <div className="form__desc mt-0 mb-2">
                             <Trans components={[
-                                <a target="_blank" rel="noopener noreferrer" href="https://link.adtidy.org/forward.html?action=dns_kb_filtering_syntax_ctag&from=ui&app=home"
+                                <a target="_blank" rel="noopener noreferrer" href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
                                    key="0">link</a>,
                             ]}>
                                 tags_desc
@@ -427,7 +393,7 @@ let Form = (props) => {
                         disabled={submitting}
                         onClick={() => {
                             reset();
-                            handleClose();
+                            toggleClientModal();
                         }}
                     >
                         <Trans>cancel_btn</Trans>
@@ -456,7 +422,7 @@ Form.propTypes = {
     reset: PropTypes.func.isRequired,
     change: PropTypes.func.isRequired,
     submitting: PropTypes.bool.isRequired,
-    handleClose: PropTypes.func.isRequired,
+    toggleClientModal: PropTypes.func.isRequired,
     useGlobalSettings: PropTypes.bool,
     useGlobalServices: PropTypes.bool,
     blockedServicesSchedule: PropTypes.object,

client/src/components/Settings/Clients/Modal.js

@@ -6,9 +6,7 @@ import ReactModal from 'react-modal';
 import { MODAL_TYPE } from '../../../helpers/constants';
 import Form from './Form';
 
-const getInitialData = ({
-    initial, modalType, clientId, clientName,
-}) => {
+const getInitialData = (initial) => {
     if (initial && initial.blocked_services) {
         const { blocked_services } = initial;
         const blocked = {};
@@ -23,60 +21,46 @@ const getInitialData = ({
         };
     }
 
-    if (modalType !== MODAL_TYPE.EDIT_CLIENT && clientId) {
-        return {
-            ...initial,
-            name: clientName,
-            ids: [clientId],
-        };
-    }
-
     return initial;
 };
 
-const Modal = ({
-    isModalOpen,
-    modalType,
-    currentClientData,
-    handleSubmit,
-    handleClose,
-    processingAdding,
-    processingUpdating,
-    tagsOptions,
-    clientId,
-    t,
-}) => {
-    const initialData = getInitialData({
-        initial: currentClientData,
+const Modal = (props) => {
+    const {
+        isModalOpen,
         modalType,
-        clientId,
-        clientName: t('client_name', { id: clientId }),
-    });
+        currentClientData,
+        handleSubmit,
+        toggleClientModal,
+        processingAdding,
+        processingUpdating,
+        tagsOptions,
+    } = props;
+    const initialData = getInitialData(currentClientData);
 
     return (
         <ReactModal
             className="Modal__Bootstrap modal-dialog modal-dialog-centered modal-dialog--clients"
             closeTimeoutMS={0}
             isOpen={isModalOpen}
-            onRequestClose={handleClose}
+            onRequestClose={() => toggleClientModal()}
         >
             <div className="modal-content">
                 <div className="modal-header">
                     <h4 className="modal-title">
-                        {modalType === MODAL_TYPE.EDIT_CLIENT ? (
+                        {modalType === MODAL_TYPE.EDIT_FILTERS ? (
                             <Trans>client_edit</Trans>
                         ) : (
                             <Trans>client_new</Trans>
                         )}
                     </h4>
-                    <button type="button" className="close" onClick={handleClose}>
+                    <button type="button" className="close" onClick={() => toggleClientModal()}>
                         <span className="sr-only">Close</span>
                     </button>
                 </div>
                 <Form
                     initialValues={{ ...initialData }}
                     onSubmit={handleSubmit}
-                    handleClose={handleClose}
+                    toggleClientModal={toggleClientModal}
                     processingAdding={processingAdding}
                     processingUpdating={processingUpdating}
                     tagsOptions={tagsOptions}
@@ -91,12 +75,10 @@ Modal.propTypes = {
     modalType: PropTypes.string.isRequired,
     currentClientData: PropTypes.object.isRequired,
     handleSubmit: PropTypes.func.isRequired,
-    handleClose: PropTypes.func.isRequired,
+    toggleClientModal: PropTypes.func.isRequired,
     processingAdding: PropTypes.bool.isRequired,
     processingUpdating: PropTypes.bool.isRequired,
     tagsOptions: PropTypes.array.isRequired,
-    t: PropTypes.func.isRequired,
-    clientId: PropTypes.string,
 };
 
 export default withTranslation()(Modal);

client/src/components/Settings/Dhcp/Leases.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { Trans, withTranslation } from 'react-i18next';
-import { LEASES_TABLE_DEFAULT_PAGE_SIZE, MODAL_TYPE } from '../../../helpers/constants';
+import { LEASES_TABLE_DEFAULT_PAGE_SIZE } from '../../../helpers/constants';
 import { sortIp } from '../../../helpers/helpers';
 import { toggleLeaseModal } from '../../../actions';
 
@@ -18,10 +18,7 @@ class Leases extends Component {
 
     convertToStatic = (data) => () => {
         const { dispatch } = this.props;
-        dispatch(toggleLeaseModal({
-            type: MODAL_TYPE.ADD_LEASE,
-            config: data,
-        }));
+        dispatch(toggleLeaseModal(data));
     }
 
     makeStatic = ({ row }) => {
@@ -30,7 +27,7 @@ class Leases extends Component {
             <div className="logs__row logs__row--center">
                 <button
                     type="button"
-                    className="btn btn-icon btn-icon--green btn-outline-success btn-sm"
+                    className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
                     title={t('make_static')}
                     onClick={this.convertToStatic(row)}
                     disabled={disabledLeasesButton}

client/src/components/Settings/Dhcp/StaticLeases/Form.js

@@ -22,7 +22,6 @@ const Form = ({
     submitting,
     processingAdding,
     cidr,
-    isEdit,
 }) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
@@ -46,7 +45,6 @@ const Form = ({
                         placeholder={t('form_enter_mac')}
                         normalize={normalizeMac}
                         validate={[validateRequiredValue, validateMac]}
-                        disabled={isEdit}
                     />
                 </div>
                 <div className="form__group">
@@ -114,7 +112,6 @@ Form.propTypes = {
     submitting: PropTypes.bool.isRequired,
     processingAdding: PropTypes.bool.isRequired,
     cidr: PropTypes.string.isRequired,
-    isEdit: PropTypes.bool,
 };
 
 export default reduxForm({ form: FORM_NAME.LEASE })(Form);

client/src/components/Settings/Dhcp/StaticLeases/Modal.js

@@ -5,11 +5,9 @@ import ReactModal from 'react-modal';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import Form from './Form';
 import { toggleLeaseModal } from '../../../../actions';
-import { MODAL_TYPE } from '../../../../helpers/constants';
 
 const Modal = ({
     isModalOpen,
-    modalType,
     handleSubmit,
     processingAdding,
     cidr,
@@ -34,11 +32,7 @@ const Modal = ({
             <div className="modal-content">
                 <div className="modal-header">
                     <h4 className="modal-title">
-                        {modalType === MODAL_TYPE.EDIT_LEASE ? (
-                            <Trans>dhcp_edit_static_lease</Trans>
-                        ) : (
-                            <Trans>dhcp_new_static_lease</Trans>
-                        )}
+                        <Trans>dhcp_new_static_lease</Trans>
                     </h4>
                     <button type="button" className="close" onClick={toggleModal}>
                         <span className="sr-only">Close</span>
@@ -59,7 +53,6 @@ const Modal = ({
                     cidr={cidr}
                     rangeStart={rangeStart}
                     rangeEnd={rangeEnd}
-                    isEdit={modalType === MODAL_TYPE.EDIT_LEASE}
                 />
             </div>
         </ReactModal>
@@ -68,7 +61,6 @@ const Modal = ({
 
 Modal.propTypes = {
     isModalOpen: PropTypes.bool.isRequired,
-    modalType: PropTypes.string.isRequired,
     handleSubmit: PropTypes.func.isRequired,
     processingAdding: PropTypes.bool.isRequired,
     cidr: PropTypes.string.isRequired,

client/src/components/Settings/Dhcp/StaticLeases/index.js

@@ -3,15 +3,10 @@ import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
-import { LEASES_TABLE_DEFAULT_PAGE_SIZE, MODAL_TYPE } from '../../../../helpers/constants';
+import { LEASES_TABLE_DEFAULT_PAGE_SIZE } from '../../../../helpers/constants';
 import { sortIp } from '../../../../helpers/helpers';
 import Modal from './Modal';
-import {
-    addStaticLease,
-    removeStaticLease,
-    toggleLeaseModal,
-    updateStaticLease,
-} from '../../../../actions';
+import { addStaticLease, removeStaticLease } from '../../../../actions';
 
 const cellWrap = ({ value }) => (
     <div className="logs__row o-hidden">
@@ -23,10 +18,8 @@ const cellWrap = ({ value }) => (
 
 const StaticLeases = ({
     isModalOpen,
-    modalType,
     processingAdding,
     processingDeleting,
-    processingUpdating,
     staticLeases,
     cidr,
     rangeStart,
@@ -38,12 +31,7 @@ const StaticLeases = ({
 
     const handleSubmit = (data) => {
         const { mac, ip, hostname } = data;
-
-        if (modalType === MODAL_TYPE.EDIT_LEASE) {
-            dispatch(updateStaticLease({ mac, ip, hostname }));
-        } else {
-            dispatch(addStaticLease({ mac, ip, hostname }));
-        }
+        dispatch(addStaticLease({ mac, ip, hostname }));
     };
 
     const handleDelete = (ip, mac, hostname = '') => {
@@ -92,35 +80,19 @@ const StaticLeases = ({
                         Cell: (row) => {
                             const { ip, mac, hostname } = row.original;
 
-                            return (
-                                <div className="logs__row logs__row--center">
-                                    <button
+                            return <div className="logs__row logs__row--center">
+                                <button
                                         type="button"
-                                        className="btn btn-icon btn-outline-primary btn-sm mr-2"
-                                        onClick={() => dispatch(toggleLeaseModal({
-                                            type: MODAL_TYPE.EDIT_LEASE,
-                                            config: { ip, mac, hostname },
-                                        }))}
-                                        disabled={processingUpdating}
-                                        title={t('edit_table_action')}
-                                    >
-                                        <svg className="icons icon12">
-                                            <use xlinkHref="#edit" />
-                                        </svg>
-                                    </button>
-                                    <button
-                                        type="button"
-                                        className="btn btn-icon btn-outline-secondary btn-sm"
-                                        onClick={() => handleDelete(ip, mac, hostname)}
-                                        disabled={processingDeleting}
+                                        className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
                                         title={t('delete_table_action')}
-                                    >
-                                        <svg className="icons icon12">
-                                            <use xlinkHref="#delete" />
-                                        </svg>
-                                    </button>
-                                </div>
-                            );
+                                        disabled={processingDeleting}
+                                        onClick={() => handleDelete(ip, mac, hostname)}
+                                        >
+                                            <svg className="icons">
+                                                <use xlinkHref="#delete"/>
+                                            </svg>
+                                        </button>
+                                    </div>;
                         },
                     },
                 ]}
@@ -133,7 +105,6 @@ const StaticLeases = ({
             />
             <Modal
                 isModalOpen={isModalOpen}
-                modalType={modalType}
                 handleSubmit={handleSubmit}
                 processingAdding={processingAdding}
                 cidr={cidr}
@@ -148,10 +119,8 @@ const StaticLeases = ({
 StaticLeases.propTypes = {
     staticLeases: PropTypes.array.isRequired,
     isModalOpen: PropTypes.bool.isRequired,
-    modalType: PropTypes.string.isRequired,
     processingAdding: PropTypes.bool.isRequired,
     processingDeleting: PropTypes.bool.isRequired,
-    processingUpdating: PropTypes.bool.isRequired,
     cidr: PropTypes.string.isRequired,
     rangeStart: PropTypes.string,
     rangeEnd: PropTypes.string,

client/src/components/Settings/Dhcp/index.js

@@ -49,7 +49,6 @@ const Dhcp = () => {
         isModalOpen,
         processingAdding,
         processingDeleting,
-        processingUpdating,
         processingDhcp,
         v4,
         v6,
@@ -57,7 +56,6 @@ const Dhcp = () => {
         enabled,
         dhcp_available,
         interfaces,
-        modalType,
     } = useSelector((state) => state.dhcp, shallowEqual);
 
     const interface_name = useSelector(
@@ -275,11 +273,8 @@ const Dhcp = () => {
                         <StaticLeases
                             staticLeases={staticLeases}
                             isModalOpen={isModalOpen}
-                            toggleModal={toggleModal}
-                            modalType={modalType}
                             processingAdding={processingAdding}
                             processingDeleting={processingDeleting}
-                            processingUpdating={processingUpdating}
                             cidr={cidr}
                             rangeStart={dhcp?.values?.v4?.range_start}
                             rangeEnd={dhcp?.values?.v4?.range_end}

client/src/components/Settings/Dns/Cache/Form.js

@@ -41,7 +41,7 @@ const Form = ({
         cache_ttl_max, cache_ttl_min,
     } = useSelector((state) => state.form[FORM_NAME.CACHE].values, shallowEqual);
 
-    const minExceedsMax = cache_ttl_min > 0 && cache_ttl_max > 0 && cache_ttl_min > cache_ttl_max;
+    const minExceedsMax = cache_ttl_min > cache_ttl_max;
 
     const handleClearCache = () => {
         if (window.confirm(t('confirm_dns_cache_clear'))) {

client/src/components/Settings/Dns/Config/Form.js

@@ -6,7 +6,6 @@ import { Trans, useTranslation } from 'react-i18next';
 import {
     renderInputField,
     renderRadioField,
-    renderTextareaField,
     CheckboxField,
     toNumber,
 } from '../../../../helpers/form';
@@ -15,10 +14,7 @@ import {
     validateIpv6,
     validateRequiredValue,
     validateIp,
-    validateIPv4Subnet,
-    validateIPv6Subnet,
 } from '../../../../helpers/validators';
-import { removeEmptyLines } from '../../../../helpers/helpers';
 import { BLOCKING_MODES, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
 
 const checkboxes = [
@@ -72,10 +68,10 @@ const Form = ({
 
     return <form onSubmit={handleSubmit}>
         <div className="row">
-            <div className="col-12 col-md-7">
+            <div className="col-12 col-sm-6">
                 <div className="form__group form__group--settings">
                     <label htmlFor="ratelimit"
-                        className="form__label form__label--with-desc">
+                           className="form__label form__label--with-desc">
                         <Trans>rate_limit</Trans>
                     </label>
                     <div className="form__desc form__desc--top">
@@ -94,69 +90,6 @@ const Form = ({
                     />
                 </div>
             </div>
-            <div className="col-12 col-md-7">
-                <div className="form__group form__group--settings">
-                    <label htmlFor="ratelimit_subnet_len_ipv4"
-                        className="form__label form__label--with-desc">
-                        <Trans>rate_limit_subnet_len_ipv4</Trans>
-                    </label>
-                    <div className="form__desc form__desc--top">
-                        <Trans>rate_limit_subnet_len_ipv4_desc</Trans>
-                    </div>
-                    <Field
-                        name="ratelimit_subnet_len_ipv4"
-                        type="number"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={t('form_enter_rate_limit_subnet_len')}
-                        normalize={toNumber}
-                        validate={[validateRequiredValue, validateIPv4Subnet]}
-                        min={0}
-                        max={32}
-                    />
-                </div>
-            </div>
-            <div className="col-12 col-md-7">
-                <div className="form__group form__group--settings">
-                    <label htmlFor="ratelimit_subnet_len_ipv6"
-                        className="form__label form__label--with-desc">
-                        <Trans>rate_limit_subnet_len_ipv6</Trans>
-                    </label>
-                    <div className="form__desc form__desc--top">
-                        <Trans>rate_limit_subnet_len_ipv6_desc</Trans>
-                    </div>
-                    <Field
-                        name="ratelimit_subnet_len_ipv6"
-                        type="number"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={t('form_enter_rate_limit_subnet_len')}
-                        normalize={toNumber}
-                        validate={[validateRequiredValue, validateIPv6Subnet]}
-                        min={0}
-                        max={128}
-                    />
-                </div>
-            </div>
-            <div className="col-12 col-md-7">
-                <div className="form__group form__group--settings">
-                    <label htmlFor="ratelimit_whitelist"
-                        className="form__label form__label--with-desc">
-                        <Trans>rate_limit_whitelist</Trans>
-                    </label>
-                    <div className="form__desc form__desc--top">
-                        <Trans>rate_limit_whitelist_desc</Trans>
-                    </div>
-                    <Field
-                        name="ratelimit_whitelist"
-                        component={renderTextareaField}
-                        type="text"
-                        className="form-control"
-                        placeholder={t('rate_limit_whitelist_placeholder')}
-                        normalizeOnBlur={removeEmptyLines}
-                    />
-                </div>
-            </div>
             <div className="col-12">
                 <div className="form__group form__group--settings">
                     <Field
@@ -227,46 +160,24 @@ const Form = ({
                         name,
                         validateIp,
                     }) => <div className="col-12 col-sm-6" key={name}>
-                            <div className="form__group form__group--settings">
-                                <label className="form__label form__label--with-desc"
-                                    htmlFor={name}><Trans>{name}</Trans>
-                                </label>
-                                <div className="form__desc form__desc--top">
-                                    <Trans>{description}</Trans>
-                                </div>
-                                <Field
-                                    name={name}
-                                    component={renderInputField}
-                                    className="form-control"
-                                    placeholder={t('form_enter_ip')}
-                                    validate={[validateIp, validateRequiredValue]}
-                                />
+                        <div className="form__group form__group--settings">
+                            <label className="form__label form__label--with-desc"
+                                   htmlFor={name}><Trans>{name}</Trans>
+                            </label>
+                            <div className="form__desc form__desc--top">
+                                <Trans>{description}</Trans>
                             </div>
-                        </div>)}
+                            <Field
+                                name={name}
+                                component={renderInputField}
+                                className="form-control"
+                                placeholder={t('form_enter_ip')}
+                                validate={[validateIp, validateRequiredValue]}
+                            />
+                        </div>
+                    </div>)}
                 </>
             )}
-            <div className="col-12 col-md-7">
-                <div className="form__group form__group--settings">
-                    <label htmlFor="blocked_response_ttl"
-                        className="form__label form__label--with-desc">
-                        <Trans>blocked_response_ttl</Trans>
-                    </label>
-                    <div className="form__desc form__desc--top">
-                        <Trans>blocked_response_ttl_desc</Trans>
-                    </div>
-                    <Field
-                        name="blocked_response_ttl"
-                        type="number"
-                        component={renderInputField}
-                        className="form-control"
-                        placeholder={t('form_enter_blocked_response_ttl')}
-                        normalize={toNumber}
-                        validate={validateRequiredValue}
-                        min={UINT32_RANGE.MIN}
-                        max={UINT32_RANGE.MAX}
-                    />
-                </div>
-            </div>
         </div>
         <button
             type="submit"

client/src/components/Settings/Dns/Config/index.js

@@ -11,12 +11,8 @@ const Config = () => {
     const {
         blocking_mode,
         ratelimit,
-        ratelimit_subnet_len_ipv4,
-        ratelimit_subnet_len_ipv6,
-        ratelimit_whitelist,
         blocking_ipv4,
         blocking_ipv6,
-        blocked_response_ttl,
         edns_cs_enabled,
         edns_cs_use_custom,
         edns_cs_custom_ip,
@@ -39,13 +35,9 @@ const Config = () => {
                 <Form
                     initialValues={{
                         ratelimit,
-                        ratelimit_subnet_len_ipv4,
-                        ratelimit_subnet_len_ipv6,
-                        ratelimit_whitelist,
                         blocking_mode,
                         blocking_ipv4,
                         blocking_ipv6,
-                        blocked_response_ttl,
                         edns_cs_enabled,
                         disable_ipv6,
                         dnssec_enabled,

client/src/components/Settings/Dns/Upstream/Examples.js

@@ -137,22 +137,6 @@ const Examples = (props) => (
                     example_upstream_reserved
                 </Trans>
             </li>
-            <li>
-                <code>[/example.local/]94.140.14.140 2a10:50c0::1:ff</code>: <Trans
-                    components={[
-                        <a
-                            href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            key="0"
-                        >
-                            Link
-                        </a>,
-                    ]}
-                >
-                    example_multiple_upstreams_reserved
-                </Trans>
-            </li>
             <li>
                 <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans>
                     example_upstream_comment

client/src/components/Settings/Encryption/Form.js

@@ -12,7 +12,7 @@ import {
     toNumber,
 } from '../../../helpers/form';
 import {
-    validateServerName, validateIsSafePort, validatePort, validatePortQuic, validatePortTLS, validatePlainDns,
+    validateServerName, validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
 } from '../../../helpers/validators';
 import i18n from '../../../i18n';
 import KeyStatus from './KeyStatus';
@@ -34,7 +34,7 @@ const validate = (values) => {
     return errors;
 };
 
-const clearFields = (change, setTlsConfig, validateTlsConfig, t) => {
+const clearFields = (change, setTlsConfig, t) => {
     const fields = {
         private_key: '',
         certificate_chain: '',
@@ -47,14 +47,12 @@ const clearFields = (change, setTlsConfig, validateTlsConfig, t) => {
         force_https: false,
         enabled: false,
         private_key_saved: false,
-        serve_plain_dns: true,
     };
     // eslint-disable-next-line no-alert
     if (window.confirm(t('encryption_reset'))) {
         Object.keys(fields)
             .forEach((field) => change(field, fields[field]));
         setTlsConfig(fields);
-        validateTlsConfig(fields);
     }
 };
 
@@ -84,7 +82,6 @@ let Form = (props) => {
         handleSubmit,
         handleChange,
         isEnabled,
-        servePlainDns,
         certificateChain,
         privateKey,
         certificatePath,
@@ -105,30 +102,26 @@ let Form = (props) => {
         subject,
         warning_validation,
         setTlsConfig,
-        validateTlsConfig,
         certificateSource,
         privateKeySource,
         privateKeySaved,
     } = props;
 
-    const isSavingDisabled = () => {
-        const processing = submitting || processingConfig || processingValidate;
+    const isSavingDisabled = invalid
+        || submitting
+        || processingConfig
+        || processingValidate
+        || !valid_key
+        || !valid_cert
+        || !valid_pair;
 
-        if (servePlainDns && !isEnabled) {
-            return invalid || processing;
-        }
-
-        return invalid || processing || !valid_key || !valid_cert || !valid_pair;
-    };
-
-    const isDisabled = isSavingDisabled();
     const isWarning = valid_key && valid_cert && valid_pair;
 
     return (
         <form onSubmit={handleSubmit}>
             <div className="row">
                 <div className="col-12">
-                    <div className="form__group form__group--settings mb-3">
+                    <div className="form__group form__group--settings">
                         <Field
                             name="enabled"
                             type="checkbox"
@@ -140,19 +133,6 @@ let Form = (props) => {
                     <div className="form__desc">
                         <Trans>encryption_enable_desc</Trans>
                     </div>
-                    <div className="form__group mb-3 mt-5">
-                        <Field
-                            name="serve_plain_dns"
-                            type="checkbox"
-                            component={CheckboxField}
-                            placeholder={t('encryption_plain_dns_enable')}
-                            onChange={handleChange}
-                            validate={validatePlainDns}
-                        />
-                    </div>
-                    <div className="form__desc">
-                        <Trans>encryption_plain_dns_desc</Trans>
-                    </div>
                     <hr />
                 </div>
                 <div className="col-12">
@@ -245,16 +225,16 @@ let Form = (props) => {
                             <Trans>encryption_doq</Trans>
                         </label>
                         <Field
-                            id="port_dns_over_quic"
-                            name="port_dns_over_quic"
-                            component={renderInputField}
-                            type="number"
-                            className="form-control"
-                            placeholder={t('encryption_doq')}
-                            validate={[validatePortQuic]}
-                            normalize={toNumber}
-                            onChange={handleChange}
-                            disabled={!isEnabled}
+                                id="port_dns_over_quic"
+                                name="port_dns_over_quic"
+                                component={renderInputField}
+                                type="number"
+                                className="form-control"
+                                placeholder={t('encryption_doq')}
+                                validate={[validatePortQuic]}
+                                normalize={toNumber}
+                                onChange={handleChange}
+                                disabled={!isEnabled}
                         />
                         <div className="form__desc">
                             <Trans>encryption_doq_desc</Trans>
@@ -430,8 +410,8 @@ let Form = (props) => {
             <div className="btn-list mt-2">
                 <button
                     type="submit"
-                    disabled={isDisabled}
                     className="btn btn-success btn-standart"
+                    disabled={isSavingDisabled}
                 >
                     <Trans>save_config</Trans>
                 </button>
@@ -439,7 +419,7 @@ let Form = (props) => {
                     type="button"
                     className="btn btn-secondary btn-standart"
                     disabled={submitting || processingConfig}
-                    onClick={() => clearFields(change, setTlsConfig, validateTlsConfig, t)}
+                    onClick={() => clearFields(change, setTlsConfig, t)}
                 >
                     <Trans>reset_settings</Trans>
                 </button>
@@ -452,7 +432,6 @@ Form.propTypes = {
     handleSubmit: PropTypes.func.isRequired,
     handleChange: PropTypes.func,
     isEnabled: PropTypes.bool.isRequired,
-    servePlainDns: PropTypes.bool.isRequired,
     certificateChain: PropTypes.string.isRequired,
     privateKey: PropTypes.string.isRequired,
     certificatePath: PropTypes.string.isRequired,
@@ -476,7 +455,6 @@ Form.propTypes = {
     subject: PropTypes.string,
     t: PropTypes.func.isRequired,
     setTlsConfig: PropTypes.func.isRequired,
-    validateTlsConfig: PropTypes.func.isRequired,
     certificateSource: PropTypes.string,
     privateKeySource: PropTypes.string,
     privateKeySaved: PropTypes.bool,
@@ -486,7 +464,6 @@ const selector = formValueSelector(FORM_NAME.ENCRYPTION);
 
 Form = connect((state) => {
     const isEnabled = selector(state, 'enabled');
-    const servePlainDns = selector(state, 'serve_plain_dns');
     const certificateChain = selector(state, 'certificate_chain');
     const privateKey = selector(state, 'private_key');
     const certificatePath = selector(state, 'certificate_path');
@@ -496,7 +473,6 @@ Form = connect((state) => {
     const privateKeySaved = selector(state, 'private_key_saved');
     return {
         isEnabled,
-        servePlainDns,
         certificateChain,
         privateKey,
         certificatePath,

client/src/components/Settings/Encryption/index.js

@@ -25,8 +25,7 @@ class Encryption extends Component {
 
     handleFormChange = debounce((values) => {
         const submitValues = this.getSubmitValues(values);
-
-        if (submitValues.enabled || submitValues.serve_plain_dns) {
+        if (submitValues.enabled) {
             this.props.validateTlsConfig(submitValues);
         }
     }, DEBOUNCE_TIMEOUT);
@@ -86,7 +85,6 @@ class Encryption extends Component {
             certificate_path,
             private_key_path,
             private_key_saved,
-            serve_plain_dns,
         } = encryption;
 
         const initialValues = this.getInitialValues({
@@ -101,7 +99,6 @@ class Encryption extends Component {
             certificate_path,
             private_key_path,
             private_key_saved,
-            serve_plain_dns,
         });
 
         return (
@@ -119,7 +116,6 @@ class Encryption extends Component {
                             onSubmit={this.handleFormSubmit}
                             onChange={this.handleFormChange}
                             setTlsConfig={this.props.setTlsConfig}
-                            validateTlsConfig={this.props.validateTlsConfig}
                             {...this.props.encryption}
                         />
                     </Card>

client/src/components/Settings/LogsConfig/index.js

@@ -62,7 +62,7 @@ class LogsConfig extends Component {
                             interval,
                             customInterval,
                             anonymize_client_ip,
-                            ignored: ignored?.join('\n'),
+                            ignored: ignored.join('\n'),
                         }}
                         onSubmit={this.handleFormSubmit}
                         processing={processing}

client/src/components/ui/Card.css

@@ -2,7 +2,6 @@
     align-items: center;
     justify-content: space-between;
     padding: 0.6rem 1.5rem;
-    flex-shrink: 0;
 }
 
 .card-subtitle {
@@ -20,16 +19,8 @@
     max-height: 17.5rem;
 }
 
-.dashboard .card-table {
-    overflow: hidden;
-}
-
 .dashboard .card-table-overflow--limited {
-    max-height: 292px;
-}
-
-.dashboard .ReactTable .rt-tr-group {
-    min-height: 52px;
+    max-height: 18rem;
 }
 
 .card-actions {
@@ -134,7 +125,7 @@
 
 @media (min-width: 992px) {
     .dashboard .card:not(.card--full) {
-        height: 360px;
+        height: 22rem;
     }
 }
 
@@ -149,7 +140,3 @@
 .card .logs__row--blue {
     background-color: #ecf7ff;
 }
-
-[data-theme="dark"] .card .logs__row--blue {
-    background-color: var(--logs__row--blue-bgcolor);
-}

client/src/components/ui/Icons.css

@@ -24,13 +24,6 @@
     height: var(--size);
 }
 
-.icon--15 {
-    --size: 0.95rem;
-
-    width: var(--size);
-    height: var(--size);
-}
-
 .icon--gray {
     color: var(--gray-a5);
 }

client/src/components/ui/Icons.js

@@ -239,16 +239,6 @@ const Icons = () => (
             <circle cx="12" cy="12" r="9" />
             <path d="M16.1215 12.1213H11.8789V7.87866" />
         </symbol>
-
-        <symbol id="bullets" width="24" height="24" viewBox="0 0 24 24">
-            <path fillRule="evenodd" clipRule="evenodd" d="M12 7C11.1716 7 10.5 6.32843 10.5 5.5C10.5 4.67157 11.1716 4 12 4C12.8284 4 13.5 4.67157 13.5 5.5C13.5 6.32843 12.8284 7 12 7Z" fill="currentColor" />
-            <path fillRule="evenodd" clipRule="evenodd" d="M12 13.5C11.1716 13.5 10.5 12.8284 10.5 12C10.5 11.1716 11.1716 10.5 12 10.5C12.8284 10.5 13.5 11.1716 13.5 12C13.5 12.8284 12.8284 13.5 12 13.5Z" fill="currentColor" />
-            <path fillRule="evenodd" clipRule="evenodd" d="M12 20C11.1716 20 10.5 19.3284 10.5 18.5C10.5 17.6716 11.1716 17 12 17C12.8284 17 13.5 17.6716 13.5 18.5C13.5 19.3284 12.8284 20 12 20Z" fill="currentColor" />
-        </symbol>
-
-        <symbol id="check" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
-            <path d="M5 11.7665L10.5878 17L19 8" />
-        </symbol>
     </svg>
 );
 

client/src/components/ui/Line.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { ResponsiveLine } from '@nivo/line';
 import addDays from 'date-fns/add_days';
+import addHours from 'date-fns/add_hours';
 import subDays from 'date-fns/sub_days';
 import subHours from 'date-fns/sub_hours';
 import dateFormat from 'date-fns/format';
@@ -8,14 +9,12 @@ import round from 'lodash/round';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import './Line.css';
-import { msToDays, msToHours } from '../../helpers/helpers';
-import { TIME_UNITS } from '../../helpers/constants';
+import { msToDays } from '../../helpers/helpers';
 
 const Line = ({
     data, color = 'black',
 }) => {
-    const interval = useSelector((state) => state.stats.interval);
-    const timeUnits = useSelector((state) => state.stats.timeUnits);
+    const interval = msToDays(useSelector((state) => state.stats.interval));
 
     return <ResponsiveLine
         enableArea
@@ -45,12 +44,12 @@ const Line = ({
         enableGridY={false}
         enablePoints={false}
         xFormat={(x) => {
-            if (timeUnits === TIME_UNITS.HOURS) {
-                const hoursAgo = msToHours(interval) - x - 1;
-                return dateFormat(subHours(Date.now(), hoursAgo), 'D MMM HH:00');
+            if (interval >= 0 && interval <= 7) {
+                const hoursAgo = subHours(Date.now(), 24 * interval);
+                return dateFormat(addHours(hoursAgo, x), 'D MMM HH:00');
             }
 
-            const daysAgo = subDays(Date.now(), msToDays(interval) - 1);
+            const daysAgo = subDays(Date.now(), interval - 1);
             return dateFormat(addDays(daysAgo, x), 'D MMM YYYY');
         }}
         yFormat={(y) => round(y, 2)}

client/src/components/ui/ReactTable.css

@@ -9,6 +9,10 @@
     overflow: visible;
 }
 
+.ReactTable .rt-tbody {
+    overflow: visible;
+}
+
 .ReactTable .rt-noData {
     color: var(--rt-nodata-color);
     background-color: var(--rt-nodata-bgcolor);

client/src/components/ui/Tooltip.js

@@ -21,7 +21,6 @@ const Tooltip = ({
     delayShow = SHOW_TOOLTIP_DELAY,
     delayHide = HIDE_TOOLTIP_DELAY,
     onVisibilityChange,
-    defaultTooltipShown,
 }) => {
     const { t } = useTranslation();
     const touchEventsAvailable = 'ontouchstart' in window;
@@ -76,7 +75,6 @@ const Tooltip = ({
             delayShow={delayShowValue}
             tooltip={renderTooltip}
             onVisibilityChange={onVisibilityChange}
-            defaultTooltipShown={defaultTooltipShown}
         >
             {renderTrigger}
         </TooltipTrigger>
@@ -99,7 +97,6 @@ Tooltip.propTypes = {
     className: propTypes.string,
     triggerClass: propTypes.string,
     onVisibilityChange: propTypes.func,
-    defaultTooltipShown: propTypes.bool,
 };
 
 export default Tooltip;

client/src/helpers/constants.js

@@ -26,12 +26,7 @@ export const R_WIN_ABSOLUTE_PATH = /^([a-zA-Z]:)?(\\|\/)(?:[^\\/:*?"<>|\x00]+\\)
 
 export const R_CLIENT_ID = /^[a-z0-9-]{1,63}$/;
 
-export const R_IPV4_SUBNET = /^([0-9]|[1-2][0-9]|3[0-2])?$/;
-
-export const R_IPV6_SUBNET = /^([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])?$/;
-
 export const MIN_PASSWORD_LENGTH = 8;
-export const MAX_PASSWORD_LENGTH = 72;
 
 export const HTML_PAGES = {
     INSTALL: '/install.html',
@@ -180,10 +175,6 @@ export const MODAL_TYPE = {
     CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
     ADD_REWRITE: 'ADD_REWRITE',
     EDIT_REWRITE: 'EDIT_REWRITE',
-    EDIT_LEASE: 'EDIT_LEASE',
-    ADD_LEASE: 'ADD_LEASE',
-    ADD_CLIENT: 'ADD_CLIENT',
-    EDIT_CLIENT: 'EDIT_CLIENT',
 };
 
 export const CLIENT_ID = {
@@ -438,7 +429,7 @@ export const SCHEME_TO_PROTOCOL_MAP = {
 export const DNS_REQUEST_OPTIONS = {
     PARALLEL: 'parallel',
     FASTEST_ADDR: 'fastest_addr',
-    LOAD_BALANCING: 'load_balance',
+    LOAD_BALANCING: '',
 };
 
 export const DHCP_FORM_NAMES = {
@@ -560,13 +551,6 @@ export const DISABLE_PROTECTION_TIMINGS = {
     TOMORROW: 24 * 60 * 60 * 1000,
 };
 
+export const LOCAL_STORAGE_THEME_KEY = 'account_theme';
+
 export const LOCAL_TIMEZONE_VALUE = 'Local';
-
-export const TABLES_MIN_ROWS = 5;
-
-export const DASHBOARD_TABLES_DEFAULT_PAGE_SIZE = 100;
-
-export const TIME_UNITS = {
-    HOURS: 'hours',
-    DAYS: 'days',
-};

client/src/helpers/filters/filters.js

@@ -142,11 +142,11 @@ export default {
             "homepage": "https://github.com/AdguardTeam/AdGuardSDNSFilter",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt"
         },
-        "awavenue_ads_rule": {
-            "name": "AWAvenue Ads Rule",
+        "adway_default_blocklist": {
+            "name": "AdAway Default Blocklist",
             "categoryId": "general",
-            "homepage": "https://awavenue.top/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_53.txt"
+            "homepage": "https://github.com/AdAway/adaway.github.io/",
+            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt"
         },
         "curben_phishing_filter": {
             "name": "Phishing URL Blocklist (PhishTank and OpenPhish)",
@@ -190,24 +190,6 @@ export default {
             "homepage": "https://github.com/hagezi/dns-blocklists#piracy",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_46.txt"
         },
-        "hagezi_badware_hoster_blocklist": {
-            "name": "HaGeZi's Badware Hoster Blocklist",
-            "categoryId": "security",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_55.txt"
-        },
-        "hagezi_dyndns_blocklist": {
-            "name": "HaGeZi's DynDNS Blocklist",
-            "categoryId": "security",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_54.txt"
-        },
-        "hagezi_encrypted_dns_vpn_tor_proxy_bypass": {
-            "name": "HaGeZi's Encrypted DNS/VPN/TOR/Proxy Bypass",
-            "categoryId": "security",
-            "homepage": "https://github.com/hagezi/dns-blocklists#bypass",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_52.txt"
-        },
         "hagezi_gambling_blocklist": {
             "name": "HaGeZi's Gambling Blocklist",
             "categoryId": "other",
@@ -215,41 +197,17 @@ export default {
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_47.txt"
         },
         "hagezi_multinormal": {
-            "name": "HaGeZi's Normal Blocklist",
+            "name": "HaGeZi Multi NORMAL",
             "categoryId": "general",
             "homepage": "https://github.com/hagezi/dns-blocklists",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_34.txt"
         },
-        "hagezi_pro": {
-            "name": "HaGeZi's Pro Blocklist",
-            "categoryId": "general",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_48.txt"
-        },
-        "hagezi_pro++": {
-            "name": "HaGeZi's Pro++ Blocklist",
-            "categoryId": "general",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_51.txt"
-        },
-        "hagezi_the_worlds_most_abused_tlds": {
-            "name": "HaGeZi's The World's Most Abused TLDs",
-            "categoryId": "security",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_56.txt"
-        },
         "hagezi_threat_intelligence_feeds": {
             "name": "HaGeZi's Threat Intelligence Feeds",
             "categoryId": "security",
             "homepage": "https://github.com/hagezi/dns-blocklists",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_44.txt"
         },
-        "hagezi_ultimate": {
-            "name": "HaGeZi's Ultimate Blocklist",
-            "categoryId": "general",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_49.txt"
-        },
         "no_google": {
             "name": "No Google",
             "categoryId": "other",
@@ -262,6 +220,12 @@ export default {
             "homepage": "https://github.com/hoshsadiq/adblock-nocoin-list/",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_8.txt"
         },
+        "notracking_hosts_blocklists": {
+            "name": "The NoTracking blocklist",
+            "categoryId": "general",
+            "homepage": "https://github.com/notracking/hosts-blocklists",
+            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_32.txt"
+        },
         "oisd_basic": {
             "name": "OISD Blocklist Small",
             "categoryId": "general",
@@ -322,12 +286,6 @@ export default {
             "homepage": "https://github.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
         },
-        "ublock_badware_risks": {
-            "name": "uBlock₀ filters – Badware risks",
-            "categoryId": "security",
-            "homepage": "https://github.com/uBlockOrigin/uAssets",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_50.txt"
-        },
         "urlhaus_filter_online": {
             "name": "Malicious URL Blocklist (URLHaus)",
             "categoryId": "security",