all: fix chlog link

Pull request 2100: v0.107.42-rc
Squashed commit of the following: commit 284190f748345c7556e60b67f051ec5f6f080948 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 6 19:36:00 2023 +0300 all: sync with master; upd chlog
2023-12-07 17:44:22 +03:00 · 2023-12-07 17:23:00 +03:00 · 2023-11-13 18:34:42 +03:00 · 2023-11-13 18:00:38 +03:00 · 2023-11-13 17:39:48 +03:00 · 2023-10-18 17:04:44 +03:00
524 changed files with 82325 additions and 30908 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -10,52 +10,60 @@
          - 'label': >
                I have checked the
                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
                and found no answer
            'required': true
          - 'label': >
                I have searched other issues and found no duplicates
            'required': true
          - 'label': >
-                I want to report a bug and not ask a question
+                I want to report a bug and not [ask a question or ask for
+                help](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
+            'required': true
+          - 'label': >
+                I have set up AdGuard Home correctly and [configured clients to
+                use it](https://github.com/AdguardTeam/AdGuardHome/wiki/Clients).
+                (Use the
+                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
+                for help with installing and configuring clients.)
            'required': true
    'id': 'prerequisites'
    'type': 'checkboxes'
  - 'attributes':
-        'description': 'On which operating system type does the issue occur?'
-        'label': 'Operating system type'
+        'description': 'On which Platform does the issue occur?'
+        'label': 'Platform (OS and CPU architecture)'
+        # NOTE: Keep the 386 at the bottom for each OS, because a lot of people
+        # Seem to confuse them with AMD64, which is what they actually need.
        'options':
-          - 'FreeBSD'
-          - 'Linux, OpenWrt'
-          - 'Linux, Other (please mention the version in the description)'
-          - 'macOS (aka Darwin)'
-          - 'OpenBSD'
-          - 'Windows'
-          - 'Other (please mention in the description)'
+          - 'Darwin (aka macOS), AMD64 (aka x86_64)'
+          - 'Darwin (aka macOS), ARM64'
+          - 'FreeBSD, AMD64 (aka x86_64)'
+          - 'FreeBSD, ARM64'
+          - 'FreeBSD, ARMv5'
+          - 'FreeBSD, ARMv6'
+          - 'FreeBSD, ARMv7'
+          - 'FreeBSD, 32-bit Intel (aka 386)'
+          - 'Linux, AMD64 (aka x86_64)'
+          - 'Linux, ARM64'
+          - 'Linux, ARMv5'
+          - 'Linux, ARMv6'
+          - 'Linux, ARMv7'
+          - 'Linux, MIPS LE'
+          - 'Linux, MIPS'
+          - 'Linux, MIPS64 LE'
+          - 'Linux, MIPS64'
+          - 'Linux, PPC64 LE'
+          - 'Linux, 32-bit Intel (aka 386)'
+          - 'OpenBSD, AMD64 (aka x86_64)'
+          - 'OpenBSD, ARM64'
+          - 'Windows, AMD64 (aka x86_64)'
+          - 'Windows, ARM64'
+          - 'Windows, 32-bit Intel (aka 386)'
+          - 'Custom (please mention in the description)'
    'id': 'os'
    'type': 'dropdown'
    'validations':
        'required': true
-  - 'attributes':
-        'description': 'On which CPU architecture does the issue occur?'
-        'label': 'CPU architecture'
-        'options':
-          - 'AMD64'
-          - 'x86'
-          - '64-bit ARM'
-          - 'ARMv5'
-          - 'ARMv6'
-          - 'ARMv7'
-          - '64-bit MIPS'
-          - '64-bit MIPS LE'
-          - '32-bit MIPS'
-          - '32-bit MIPS LE'
-          - '64-bit PowerPC LE'
-          - 'Other (please mention in the description)'
-    'id': 'arch'
-    'type': 'dropdown'
-    'validations':
-        'required': true
  - 'attributes':
        'description': 'How did you install AdGuard Home?'
        'label': 'Installation'
@@ -63,7 +71,7 @@
          - 'GitHub releases or script from README'
          - 'Docker'
          - 'Snapcraft'
-          - 'Custom port'
+          - 'Custom package (OpenWrt, HomeAssistant, etc; please mention in the description)'
          - 'Other (please mention in the description)'
    'id': 'install'
    'type': 'dropdown'
@@ -89,21 +97,57 @@
    'validations':
        'required': true
  - 'attributes':
-        'description': 'Please describe the bug'
-        'label': 'Description'
+        'description': >
+            Please describe what you did.  An `nslookup` or a `dig` command is
+            the best way.  For crashes, please provide a full failure log.
+        'label': 'Action'
        'value': |
-            #### What did you do?
-
-            #### Expected result
-
-            #### Actual result
-
-            #### Screenshots (if applicable)
-
-            #### Additional information
-    'id': 'description'
+            ```sh
+            nslookup -debug -type=a 'www.example.com' '$YOUR_AGH_ADDRESS'
+            ```
+    'id': 'failing_action'
    'type': 'textarea'
    'validations':
        'required': true
-'description': 'File a bug report'
+  - 'attributes':
+        'description': >
+            What did you expect to see?  Please add a description and/or
+            screenshots, if applicable.
+        'label': 'Expected result'
+        'placeholder': >
+            What did you expect to see?
+    'id': 'expected'
+    'type': 'textarea'
+    'validations':
+        'required': true
+  - 'attributes':
+        'description': >
+            What happened instead?  Please add a description and/or screenshots,
+            if applicable.
+        'label': 'Actual result'
+        'placeholder': >
+            What did you see instead?
+    'id': 'result'
+    'type': 'textarea'
+    'validations':
+        'required': true
+  - 'attributes':
+        'description': >
+            Please add additional information, such as non-standard OS or port,
+            here.  You can also put screenshots here, if applicable.  For
+            example, it is better to copy and paste text from a terminal instead
+            of posting a screenshot of the terminal.
+        'label': 'Additional information and/or screenshots'
+        'placeholder': >
+            Additional OS information, screenshots of the UI, etc.
+    'id': 'additional'
+    'type': 'textarea'
+    'validations':
+        'required': false
+# NOTE: GitHub limits the description length to 200 characters.  Also, Markdown
+# doesn't work here.
+'description': |
+    For help, use the Discussions section instead.  Write the title in English
+    to make it easier for other people to search for duplicates.  (Any language
+    is fine in the body.)
 'name': 'Bug'
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -23,19 +23,36 @@
    'id': 'prerequisites'
    'type': 'checkboxes'
  - 'attributes':
-        'description': 'Please describe the request'
-        'label': 'Description'
-        'value': |
-            #### What problem are you trying to solve?
-
-            #### Proposed solution
-
-            #### Alternatives considered
-
-            #### Additional information
-    'id': 'description'
+        'description': 'Please describe the problem you are trying to solve'
+        'label': 'The problem'
+        'placeholder': >
+            Please describe the problem you are trying to solve
+    'id': 'problem'
    'type': 'textarea'
    'validations':
        'required': true
-'description': 'Suggest a feature or an enhancement for AdGuard Home'
+  - 'attributes':
+        'description': 'What feature are you proposing to solve this problem?'
+        'label': 'Proposed solution'
+        'placeholder': >
+            What feature are you proposing to solve this problem?
+    'id': 'proposed_solution'
+    'type': 'textarea'
+    'validations':
+        'required': true
+  - 'attributes':
+        'label': 'Alternatives considered and additional information'
+        'placeholder': >
+            Are there any other ways to solve the problem?
+    'id': 'additional'
+    'type': 'textarea'
+    'validations':
+        'required': false
+# NOTE: GitHub limits the description length to 200 characters.  Also, Markdown
+# doesn't work here.
+'description': |
+    Write the title in English to make it easier for other people to search for
+    duplicates.  (Any language is fine in the body.)
+'labels':
+  - 'feature request'
 'name': 'Feature request or enhancement'
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,21 @@
+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).
+
+2.  This isn't a localization fix; please send those to our
+    [CrowdIn](https://crowdin.com/project/adguard-applications/en#/adguard-home)
+    page.
+
+3.  Your code follows our
+    [code guidelines](https://github.com/AdguardTeam/CodeGuidelines/blob/master/Go/Go.md).
+
+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.
+
+2.  A short description of how the change achieves that.
+
+Do not forget to remove these instructions!
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 'name': 'build'

 'env':
-  'GO_VERSION': '1.19.8'
-  'NODE_VERSION': '14'
+  'GO_VERSION': '1.20.12'
+  'NODE_VERSION': '16'

 'on':
  'push':
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'

 'env':
-  'GO_VERSION': '1.19.8'
+  'GO_VERSION': '1.20.12'

 'on':
  'push':
--- a/.github/workflows/potential-duplicates.yml
+++ b/.github/workflows/potential-duplicates.yml
@@ -0,0 +1,18 @@
+'name': 'potential-duplicates'
+'on':
+    'issues':
+        'types':
+          - 'opened'
+'jobs':
+    'run':
+        'runs-on': 'ubuntu-latest'
+        'steps':
+          - 'uses': 'wow-actions/potential-duplicates@v1'
+            'with':
+                'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
+                'state': 'all'
+                'threshold': 0.6
+                'comment': |
+                    Potential duplicates: {{#issues}}
+                     *  [#{{ number }}] {{ title }} ({{ accuracy }}%)
+                    {{/issues}}
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *.db
 *.log
 *.snap
+*.test
 /agh-backup/
 /bin/
 /build/*
@@ -16,12 +17,14 @@
 /dist/
 /filtering/tests/filtering.TestLotsOfRules*.pprof
 /filtering/tests/top-1m.csv
+/internal/next/AdGuardHome.yaml
 /launchpad_credentials
 /querylog.json*
 /snapcraft_login
-AdGuardHome*
+AdGuardHome
+AdGuardHome.exe
+AdGuardHome.yaml*
 coverage.txt
-leases.db
 node_modules/

 !/build/gitkeep
--- a/AGHTechDoc.md
+++ b/AGHTechDoc.md
@@ -835,7 +835,7 @@ Request:
 Response:

 	200 OK
-	
+
 ### API: Validate TLS configuration

 Request:
@@ -2008,7 +2008,7 @@ Request:
 Response:

 	200 OK
-	
+
    DOH plist file

 ## API: Get DNS over TLS .mobileconfig
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,11 +14,11 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA

-## [v0.107.29] - 2023-04-26 (APPROX.)
+## [v0.107.43] - 2023-12-20 (APPROX.)

-See also the [v0.107.29 GitHub milestone][ms-v0.107.29].
+See also the [v0.107.43 GitHub milestone][ms-v0.107.43].

-[ms-v0.107.29]: https://github.com/AdguardTeam/AdGuardHome/milestone/65?closed=1
+[ms-v0.107.43]: https://github.com/AdguardTeam/AdGuardHome/milestone/78?closed=1

 NOTE: Add new changes BELOW THIS COMMENT.
 -->
@@ -29,6 +29,750 @@ NOTE: Add new changes ABOVE THIS COMMENT.



+## [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].
+
+### Fixed
+
+- Incorrect original answer when a response is filtered ([#6183]).
+- Comments in the *Fallback DNS servers* field in the UI ([#6182]).
+- Empty or default Safe Browsing and Parental Control settings ([#6181]).
+- Various UI issues.
+
+[#6181]: https://github.com/AdguardTeam/AdGuardHome/issues/6181
+[#6182]: https://github.com/AdguardTeam/AdGuardHome/issues/6182
+[#6183]: https://github.com/AdguardTeam/AdGuardHome/issues/6183
+
+[ms-v0.107.38]: https://github.com/AdguardTeam/AdGuardHome/milestone/73?closed=1
+
+
+
+## [v0.107.37] - 2023-09-07
+
+See also the [v0.107.37 GitHub milestone][ms-v0.107.37].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-39318, CVE-2023-39319, and CVE-2023-39320 Go vulnerabilities fixed in
+  [Go 1.20.8][go-1.20.8].
+
+### Added
+
+- AdBlock-style syntax support for ignored domains in logs and statistics
+  ([#5720]).
+- [`Strict-Transport-Security`][hsts] header in the HTTP API and DNS-over-HTTPS
+  responses when HTTPS is forced ([#2998]).  See [RFC 6797][rfc6797].
+- UI for the schedule of the service-blocking pause ([#951]).
+- IPv6 hints are now filtered in case IPv6 addresses resolving is disabled
+  ([#6122]).
+- The ability to set fallback DNS servers in the configuration file and the UI
+  ([#3701]).
+- While adding or updating blocklists, the title can now be parsed from
+  `! Title:` definition of the blocklist's source ([#6020]).
+- The ability to filter DNS HTTPS records including IPv4 and IPv6 hints
+  ([#6053]).
+- Two new metrics showing total number of responses from each upstream DNS
+  server and their average processing time in the Web UI ([#1453]).
+- The ability to set the port for the `pprof` debug API, see configuration
+  changes below.
+
+### Changed
+
+- `$dnsrewrite` rules containing IPv4-mapped IPv6 addresses are now working
+  consistently with legacy DNS rewrites and match the `AAAA` requests.
+- For non-A and non-AAAA requests, which has been filtered, the NODATA response
+  is returned if the blocking mode isn't set to `Null IP`.  In previous versions
+  it returned NXDOMAIN response in such cases.
+
+#### Configuration changes
+
+In this release, the schema version has changed from 24 to 27.
+
+- Ignore rules blocking `.` in `querylog.ignored` and `statistics.ignored` have
+  been migrated to AdBlock syntax (`|.^`).  To rollback this change, restore the
+  rules and change the `schema_version` back to `26`.
+
+- Filtering-related settings have been moved from `dns` section of the YAML
+  configuration file to the new section `filtering`:
+
+  ```yaml
+  # BEFORE:
+  'dns':
+    'filtering_enabled': true
+    'filters_update_interval': 24
+    'parental_enabled': false
+    'safebrowsing_enabled': false
+    'safebrowsing_cache_size': 1048576
+    'safesearch_cache_size': 1048576
+    'parental_cache_size': 1048576
+    'safe_search':
+      'enabled': false
+      'bing': true
+      'duckduckgo': true
+      'google': true
+      'pixabay': true
+      'yandex': true
+      'youtube': true
+    'rewrites': []
+    'blocked_services':
+      'schedule':
+        'time_zone': 'Local'
+      'ids': []
+    'protection_enabled':        true,
+    'blocking_mode':             'custom_ip',
+    'blocking_ipv4':             '1.2.3.4',
+    'blocking_ipv6':             '1:2:3::4',
+    'blocked_response_ttl':      10,
+    'protection_disabled_until': 'null',
+    'parental_block_host':       'p.dns.adguard.com',
+    'safebrowsing_block_host':   's.dns.adguard.com'
+
+  # AFTER:
+  'filtering':
+    'filtering_enabled': true
+    'filters_update_interval': 24
+    'parental_enabled': false
+    'safebrowsing_enabled': false
+    'safebrowsing_cache_size': 1048576
+    'safesearch_cache_size': 1048576
+    'parental_cache_size': 1048576
+    'safe_search':
+      'enabled': false
+      'bing': true
+      'duckduckgo': true
+      'google': true
+      'pixabay': true
+      'yandex': true
+      'youtube': true
+    'rewrites': []
+    'blocked_services':
+      'schedule':
+        'time_zone': 'Local'
+      'ids': []
+    'protection_enabled':        true,
+    'blocking_mode':             'custom_ip',
+    'blocking_ipv4':             '1.2.3.4',
+    'blocking_ipv6':             '1:2:3::4',
+    'blocked_response_ttl':      10,
+    'protection_disabled_until': 'null',
+    'parental_block_host':       'p.dns.adguard.com',
+    'safebrowsing_block_host':   's.dns.adguard.com',
+  ```
+
+  To rollback this change, remove the new object `filtering`, set back filtering
+  properties in `dns` section, and change the `schema_version` back to `25`.
+
+- Property `debug_pprof` which used to setup profiling HTTP handler, is now
+  moved to the new `pprof` object under `http` section.  The new object contains
+  properties `enabled` and `port`:
+
+  ```yaml
+  # BEFORE:
+  'debug_pprof': true
+
+  # AFTER:
+  'http':
+    'pprof':
+      'enabled': true
+      'port': 6060
+  ```
+
+  Note that the new default `6060` is used as default.  To rollback this change,
+  remove the new object `pprof`, set back `debug_pprof`, and change the
+  `schema_version` back to `24`.
+
+### Fixed
+
+- Incorrect display date on statistics graph ([#5793]).
+- Missing query log entries and statistics on service restart ([#6100]).
+- Occasional DNS-over-QUIC and DNS-over-HTTP/3 errors ([#6133]).
+- Legacy DNS rewrites containing IPv4-mapped IPv6 addresses are now matching the
+  `AAAA` requests, not `A` ([#6050]).
+- File log configuration, such as `max_size`, being ignored ([#6093]).
+- Panic on using a single-slash filtering rule.
+- Panic on shutting down while DNS requests are in process of filtering
+  ([#5948]).
+
+[#1453]: https://github.com/AdguardTeam/AdGuardHome/issues/1453
+[#2998]: https://github.com/AdguardTeam/AdGuardHome/issues/2998
+[#3701]: https://github.com/AdguardTeam/AdGuardHome/issues/3701
+[#5720]: https://github.com/AdguardTeam/AdGuardHome/issues/5720
+[#5793]: https://github.com/AdguardTeam/AdGuardHome/issues/5793
+[#5948]: https://github.com/AdguardTeam/AdGuardHome/issues/5948
+[#6020]: https://github.com/AdguardTeam/AdGuardHome/issues/6020
+[#6050]: https://github.com/AdguardTeam/AdGuardHome/issues/6050
+[#6053]: https://github.com/AdguardTeam/AdGuardHome/issues/6053
+[#6093]: https://github.com/AdguardTeam/AdGuardHome/issues/6093
+[#6100]: https://github.com/AdguardTeam/AdGuardHome/issues/6100
+[#6122]: https://github.com/AdguardTeam/AdGuardHome/issues/6122
+[#6133]: https://github.com/AdguardTeam/AdGuardHome/issues/6133
+
+[go-1.20.8]:    https://groups.google.com/g/golang-announce/c/Fm51GRLNRvM/m/F5bwBlXMAQAJ
+[hsts]:         https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
+[ms-v0.107.37]: https://github.com/AdguardTeam/AdGuardHome/milestone/72?closed=1
+[rfc6797]:      https://datatracker.ietf.org/doc/html/rfc6797
+
+
+
+## [v0.107.36] - 2023-08-02
+
+See also the [v0.107.36 GitHub milestone][ms-v0.107.36].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-29409 Go vulnerability fixed in [Go 1.20.7][go-1.20.7].
+
+### Deprecated
+
+- Go 1.20 support.  Future versions will require at least Go 1.21 to build.
+
+### Fixed
+
+- Inability to block queries for the root domain, such as `NS .` queries, using
+  the *Disallowed domains* feature on the *DNS settings* page ([#6049]).  Users
+  who want to block `.` queries should use the `|.^` AdBlock rule or a similar
+  regular expression.
+- Client hostnames not resolving when upstream server responds with zero-TTL
+  records ([#6046]).
+
+### Removed
+
+- Go 1.19 support, as it has reached end of life.
+
+[#6046]: https://github.com/AdguardTeam/AdGuardHome/issues/6046
+[#6049]: https://github.com/AdguardTeam/AdGuardHome/issues/6049
+
+[go-1.20.7]:    https://groups.google.com/g/golang-announce/c/X0b6CsSAaYI/m/Efv5DbZ9AwAJ
+[ms-v0.107.36]: https://github.com/AdguardTeam/AdGuardHome/milestone/71?closed=1
+
+
+
+## [v0.107.35] - 2023-07-26
+
+See also the [v0.107.35 GitHub milestone][ms-v0.107.35].
+
+### Changed
+
+- Improved reliability filtering-rule list updates on Unix systems.
+
+### Fixed
+
+- Occasional client information lookup failures that could lead to the DNS
+  server getting stuck ([#6006]).
+- `bufio.Scanner: token too long` and other errors when trying to add
+  filtering-rule lists with lines over 1024 bytes long or containing cosmetic
+  rules ([#6003]).
+
+### Removed
+
+- Default exposure of the non-standard ports 784 and 8853 for DNS-over-QUIC in
+  the `Dockerfile`.
+
+[#6003]: https://github.com/AdguardTeam/AdGuardHome/issues/6003
+[#6006]: https://github.com/AdguardTeam/AdGuardHome/issues/6006
+
+[ms-v0.107.35]: https://github.com/AdguardTeam/AdGuardHome/milestone/70?closed=1
+
+
+
+## [v0.107.34] - 2023-07-12
+
+See also the [v0.107.34 GitHub milestone][ms-v0.107.34].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-29406 Go vulnerability fixed in [Go 1.19.11][go-1.19.11].
+
+### Added
+
+- Ability to ignore queries for the root domain, such as `NS .` queries
+  ([#5990]).
+
+### Changed
+
+- Improved CPU and RAM consumption during updates of filtering-rule lists.
+
+#### Configuration changes
+
+In this release, the schema version has changed from 23 to 24.
+
+- Properties starting with `log_`, and `verbose` property, which used to set up
+  logging are now moved to the new object `log` containing new properties
+  `file`, `max_backups`, `max_size`, `max_age`, `compress`, `local_time`, and
+  `verbose`:
+
+  ```yaml
+  # BEFORE:
+  'log_file': ""
+  'log_max_backups': 0
+  'log_max_size': 100
+  'log_max_age': 3
+  'log_compress': false
+  'log_localtime': false
+  'verbose': false
+
+  # AFTER:
+  'log':
+      'file': ""
+      'max_backups': 0
+      'max_size': 100
+      'max_age': 3
+      'compress': false
+      'local_time': false
+      'verbose': false
+  ```
+
+  To rollback this change, remove the new object `log`, set back `log_` and
+  `verbose` properties and change the `schema_version` back to `23`.
+
+### Deprecated
+
+- Default exposure of the non-standard ports 784 and 8853 for DNS-over-QUIC in
+  the `Dockerfile`.
+
+### Fixed
+
+- Two unspecified IPs when a host is blocked in two filter lists ([#5972]).
+- Incorrect setting of Parental Control cache size.
+- Excessive RAM and CPU consumption by Safe Browsing and Parental Control
+  filters ([#5896]).
+
+### Removed
+
+- The `HEALTHCHECK` section and the use of `tini` in the `ENTRYPOINT` section in
+  `Dockerfile` ([#5939]).  They caused a lot of issues, especially with tools
+  like `docker-compose` and `podman`.
+
+  **NOTE:** Some Docker tools may cache `ENTRYPOINT` sections, so some users may
+  be required to backup their configuration, stop the container, purge the old
+  image, and reload it from scratch.
+
+[#5896]: https://github.com/AdguardTeam/AdGuardHome/issues/5896
+[#5972]: https://github.com/AdguardTeam/AdGuardHome/issues/5972
+[#5990]: https://github.com/AdguardTeam/AdGuardHome/issues/5990
+
+[go-1.19.11]:   https://groups.google.com/g/golang-announce/c/2q13H6LEEx0/m/sduSepLLBwAJ
+[ms-v0.107.34]: https://github.com/AdguardTeam/AdGuardHome/milestone/69?closed=1
+
+
+
+## [v0.107.33] - 2023-07-03
+
+See also the [v0.107.33 GitHub milestone][ms-v0.107.33].
+
+### Added
+
+- The new command-line flag `--web-addr` is the address to serve the web UI on,
+  in the host:port format.
+- The ability to set inactivity periods for filtering blocked services, both
+  globally and per client, in the configuration file ([#951]).  The UI changes
+  are coming in the upcoming releases.
+- The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
+  and the Web UI ([#1577]).
+
+### Changed
+
+#### Configuration changes
+
+In this release, the schema version has changed from 20 to 23.
+
+- Properties `bind_host`, `bind_port`, and `web_session_ttl` which used to setup
+  web UI binding configuration, are now moved to a new object `http` containing
+  new properties `address` and `session_ttl`:
+
+  ```yaml
+  # BEFORE:
+  'bind_host': '1.2.3.4'
+  'bind_port': 8080
+  'web_session_ttl': 720
+
+  # AFTER:
+  'http':
+    'address': '1.2.3.4:8080'
+    'session_ttl': '720h'
+  ```
+
+  Note that the new `http.session_ttl` property is now a duration string.  To
+  rollback this change, remove the new object `http`, set back `bind_host`,
+  `bind_port`, `web_session_ttl`,  and change the `schema_version` back to `22`.
+- Property `clients.persistent.blocked_services`, which in schema versions 21
+  and earlier used to be a list containing ids of blocked services, is now an
+  object containing ids and schedule for blocked services:
+
+  ```yaml
+  # BEFORE:
+  'clients':
+    'persistent':
+      - 'name': 'client-name'
+        'blocked_services':
+        - id_1
+        - id_2
+
+  # AFTER:
+  'clients':
+    'persistent':
+    - 'name': client-name
+      'blocked_services':
+        'ids':
+        - id_1
+        - id_2
+      'schedule':
+        'time_zone': 'Local'
+        'sun':
+          'start': '0s'
+          'end': '24h'
+        'mon':
+          'start': '1h'
+          'end': '23h'
+  ```
+
+  To rollback this change, replace `clients.persistent.blocked_services` object
+  with the list of ids of blocked services and change the `schema_version` back
+  to `21`.
+- Property `dns.blocked_services`, which in schema versions 20 and earlier used
+  to be a list containing ids of blocked services, is now an object containing
+  ids and schedule for blocked services:
+
+  ```yaml
+  # BEFORE:
+  'blocked_services':
+  - id_1
+  - id_2
+
+  # AFTER:
+  'blocked_services':
+    'ids':
+    - id_1
+    - id_2
+    'schedule':
+      'time_zone': 'Local'
+      'sun':
+        'start': '0s'
+        'end': '24h'
+      'mon':
+        'start': '10m'
+        'end': '23h30m'
+      'tue':
+        'start': '20m'
+        'end': '23h'
+      'wed':
+        'start': '30m'
+        'end': '22h30m'
+      'thu':
+        'start': '40m'
+        'end': '22h'
+      'fri':
+        'start': '50m'
+        'end': '21h30m'
+      'sat':
+        'start': '1h'
+        'end': '21h'
+  ```
+
+  To rollback this change, replace `dns.blocked_services` object with the list
+  of ids of blocked services and change the `schema_version` back to `20`.
+
+### Deprecated
+
+- The `HEALTHCHECK` section and the use of `tini` in the `ENTRYPOINT` section in
+  `Dockerfile` ([#5939]).  They cause a lot of issues, especially with tools
+  like `docker-compose` and `podman`, and will be removed in a future release.
+- Flags `-h`, `--host`, `-p`, `--port` have been deprecated.  The `-h` flag
+  will work as an alias for `--help`, instead of the deprecated `--host` in the
+  future releases.
+
+### Fixed
+
+- Ignoring of `/etc/hosts` file when resolving the hostnames of upstream DNS
+  servers ([#5902]).
+- Excessive error logging when using DNS-over-QUIC ([#5285]).
+- Inability to set `bind_host` in `AdGuardHome.yaml` in Docker ([#4231],
+  [#4235]).
+- The blocklists can now be deleted properly ([#5700]).
+- Queries with the question-section target `.`, for example `NS .`, are now
+  counted in the statistics and correctly shown in the query log ([#5910]).
+- Safe Search not working with `AAAA` queries for domains that don't have `AAAA`
+  records ([#5913]).
+
+[#951]:  https://github.com/AdguardTeam/AdGuardHome/issues/951
+[#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
+[#4231]: https://github.com/AdguardTeam/AdGuardHome/issues/4231
+[#4235]: https://github.com/AdguardTeam/AdGuardHome/pull/4235
+[#5285]: https://github.com/AdguardTeam/AdGuardHome/issues/5285
+[#5700]: https://github.com/AdguardTeam/AdGuardHome/issues/5700
+[#5902]: https://github.com/AdguardTeam/AdGuardHome/issues/5902
+[#5910]: https://github.com/AdguardTeam/AdGuardHome/issues/5910
+[#5913]: https://github.com/AdguardTeam/AdGuardHome/issues/5913
+[#5939]: https://github.com/AdguardTeam/AdGuardHome/discussions/5939
+
+[ms-v0.107.33]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1
+
+
+
+## [v0.107.32] - 2023-06-13
+
+### Fixed
+
+- DNSCrypt upstream not resetting the client and resolver information on
+  dialing errors ([#5872]).
+
+
+
+
+## [v0.107.31] - 2023-06-08
+
+See also the [v0.107.31 GitHub milestone][ms-v0.107.31].
+
+### Fixed
+
+- Startup errors on OpenWrt ([#5872]).
+- Plain-UDP upstreams always falling back to TCP, causing outages and slowdowns
+  ([#5873], [#5874]).
+
+[#5872]: https://github.com/AdguardTeam/AdGuardHome/issues/5872
+[#5873]: https://github.com/AdguardTeam/AdGuardHome/issues/5873
+[#5874]: https://github.com/AdguardTeam/AdGuardHome/issues/5874
+
+[ms-v0.107.31]: https://github.com/AdguardTeam/AdGuardHome/milestone/67?closed=1
+
+
+
+## [v0.107.30] - 2023-06-07
+
+See also the [v0.107.30 GitHub milestone][ms-v0.107.30].
+
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-29402, CVE-2023-29403, and CVE-2023-29404 Go vulnerabilities fixed in
+  [Go 1.19.10][go-1.19.10].
+
+### Fixed
+
+- Unquoted IPv6 bind hosts with trailing colons erroneously considered
+  unspecified addresses are now properly validated ([#5752]).
+
+  **NOTE:** the Docker healthcheck script now also doesn't interpret the `""`
+  value as unspecified address.
+- Incorrect `Content-Type` header value in `POST /control/version.json` and `GET
+  /control/dhcp/interfaces` HTTP APIs ([#5716]).
+- Provided bootstrap servers are now used to resolve the hostnames of plain
+  UDP/TCP upstream servers.
+
+[#5716]: https://github.com/AdguardTeam/AdGuardHome/issues/5716
+
+[go-1.19.10]:   https://groups.google.com/g/golang-announce/c/q5135a9d924/m/j0ZoAJOHAwAJ
+[ms-v0.107.30]: https://github.com/AdguardTeam/AdGuardHome/milestone/66?closed=1
+
+
+
+## [v0.107.29] - 2023-04-18
+
+See also the [v0.107.29 GitHub milestone][ms-v0.107.29].
+
+### Added
+
+- The ability to exclude client activity from the query log or statistics by
+  editing client's settings on the respective page in the UI ([#1717], [#4299]).
+
+### Changed
+
+- Stored DHCP leases moved from `leases.db` to `data/leases.json`.  The file
+  format has also been optimized.
+
+### Fixed
+
+- The `github.com/mdlayher/raw` dependency has been temporarily returned to
+  support raw connections on Darwin ([#5712]).
+- Incorrect recording of blocked results as “Blocked by CNAME or IP” in the
+  query log ([#5725]).
+- All Safe Search services being unchecked by default.
+- Panic when a DNSCrypt stamp is invalid ([#5721]).
+
+[#5712]: https://github.com/AdguardTeam/AdGuardHome/issues/5712
+[#5721]: https://github.com/AdguardTeam/AdGuardHome/issues/5721
+[#5725]: https://github.com/AdguardTeam/AdGuardHome/issues/5725
+[#5752]: https://github.com/AdguardTeam/AdGuardHome/issues/5752
+
+[ms-v0.107.29]: https://github.com/AdguardTeam/AdGuardHome/milestone/65?closed=1
+
+
+
 ## [v0.107.28] - 2023-04-12

 See also the [v0.107.28 GitHub milestone][ms-v0.107.28].
@@ -68,7 +812,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.

@@ -149,17 +893,15 @@ In this release, the schema version has changed from 17 to 20.

 [#1163]: https://github.com/AdguardTeam/AdGuardHome/issues/1163
 [#1333]: https://github.com/AdguardTeam/AdGuardHome/issues/1333
-[#1163]: https://github.com/AdguardTeam/AdGuardHome/issues/1717
 [#1472]: https://github.com/AdguardTeam/AdGuardHome/issues/1472
 [#3290]: https://github.com/AdguardTeam/AdGuardHome/issues/3290
 [#3459]: https://github.com/AdguardTeam/AdGuardHome/issues/3459
 [#4262]: https://github.com/AdguardTeam/AdGuardHome/issues/4262
-[#3290]: https://github.com/AdguardTeam/AdGuardHome/issues/4299
 [#5567]: https://github.com/AdguardTeam/AdGuardHome/issues/5567
 [#5701]: https://github.com/AdguardTeam/AdGuardHome/issues/5701

 [ms-v0.107.28]: https://github.com/AdguardTeam/AdGuardHome/milestone/64?closed=1
-[rfc6761]:      https://www.rfc-editor.org/rfc/rfc6761
+[rfc6761]:      https://datatracker.ietf.org/doc/html/rfc6761



@@ -210,7 +952,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`
@@ -247,7 +989,6 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
  been relaxed to meet those from [RFC 3696][rfc3696] ([#4884]).
 - Failing service installation via script on FreeBSD ([#5431]).

-[#1472]: https://github.com/AdguardTeam/AdGuardHome/issues/1472
 [#4884]: https://github.com/AdguardTeam/AdGuardHome/issues/4884
 [#5270]: https://github.com/AdguardTeam/AdGuardHome/issues/5270
 [#5281]: https://github.com/AdguardTeam/AdGuardHome/issues/5281
@@ -300,7 +1041,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.

@@ -866,7 +1607,6 @@ See also the [v0.107.10 GitHub milestone][ms-v0.107.10].
 [#4342]: https://github.com/AdguardTeam/AdGuardHome/issues/4342
 [#4358]: https://github.com/AdguardTeam/AdGuardHome/issues/4358
 [#4670]: https://github.com/AdguardTeam/AdGuardHome/issues/4670
-[#4836]: https://github.com/AdguardTeam/AdGuardHome/issues/4836
 [#4843]: https://github.com/AdguardTeam/AdGuardHome/issues/4843

 [ddr-draft]:    https://datatracker.ietf.org/doc/html/draft-ietf-add-ddr-08
@@ -1011,7 +1751,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.

@@ -1352,7 +2092,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.

@@ -1500,9 +2240,7 @@ In this release, the schema version has changed from 10 to 12.
 [#3558]: https://github.com/AdguardTeam/AdGuardHome/issues/3558
 [#3564]: https://github.com/AdguardTeam/AdGuardHome/issues/3564
 [#3567]: https://github.com/AdguardTeam/AdGuardHome/issues/3567
-[#3568]: https://github.com/AdguardTeam/AdGuardHome/issues/3568
 [#3579]: https://github.com/AdguardTeam/AdGuardHome/issues/3579
-[#3607]: https://github.com/AdguardTeam/AdGuardHome/issues/3607
 [#3638]: https://github.com/AdguardTeam/AdGuardHome/issues/3638
 [#3655]: https://github.com/AdguardTeam/AdGuardHome/issues/3655
 [#3707]: https://github.com/AdguardTeam/AdGuardHome/issues/3707
@@ -1920,11 +2658,25 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].


 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...HEAD
-[v0.107.29]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...v0.107.29
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.43...HEAD
+[v0.107.43]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.42...v0.107.43
 -->

-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...HEAD
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.42...HEAD
+[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
+[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
+[v0.107.35]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.34...v0.107.35
+[v0.107.34]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.33...v0.107.34
+[v0.107.33]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...v0.107.33
+[v0.107.32]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...v0.107.32
+[v0.107.31]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.30...v0.107.31
+[v0.107.30]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...v0.107.30
+[v0.107.29]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...v0.107.29
 [v0.107.28]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.27...v0.107.28
 [v0.107.27]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.26...v0.107.27
 [v0.107.26]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.25...v0.107.26
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,89 @@
+ #  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 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 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
+[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.
--- a/16
+++ b/16
@@ -24,6 +24,7 @@ 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
 GPG_KEY = devteam@adguard.com
@@ -37,6 +38,8 @@ SIGN = 1
 VERSION = v0.0.0
 YARN = yarn

+NEXTAPI = 0
+
 # Macros for the build-release target.  If FRONTEND_PREBUILT is 0, the
 # default, the macro $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT)) expands
 # into BUILD_RELEASE_DEPS_0, and so both frontend and backend
@@ -59,11 +62,13 @@ ENV = env\
 	GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
 	DIST_DIR='$(DIST_DIR)'\
 	GO="$(GO.MACRO)"\
+	GOAMD64="$(GOAMD64)"\
 	GOPROXY='$(GOPROXY)'\
 	GOSUMDB='$(GOSUMDB)'\
 	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
 	RACE='$(RACE)'\
 	SIGN='$(SIGN)'\
+	NEXTAPI='$(NEXTAPI)'\
 	VERBOSE="$(VERBOSE.MACRO)"\
 	VERSION='$(VERSION)'\

@@ -75,7 +80,7 @@ build: deps quick-build

 quick-build: js-build go-build

-ci: deps test
+ci: deps test go-bench go-fuzz

 deps: js-deps go-deps
 lint: js-lint go-lint
@@ -101,8 +106,10 @@ js-deps:
 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
 go-deps:  ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
+go-fuzz:  ; $(ENV) "$(SHELL)" ./scripts/make/go-fuzz.sh
 go-lint:  ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
 go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh

@@ -125,3 +132,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
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ code.


 *  [Getting Started](#getting-started)
-     *  [Automated install (Unix)](#automated-install-linux-and-mac)
+     *  [Automated install (Linux/Unix/MacOS/FreeBSD/OpenBSD)](#automated-install-linux-and-mac)
     *  [Alternative methods](#alternative-methods)
     *  [Guides](#guides)
     *  [API](#api)
@@ -79,7 +79,7 @@ code.

 ##  <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 (Unix)</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:

@@ -201,7 +201,7 @@ opinion, this cannot be legitimately counted as a Pi-Hole's feature.
 | 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)                               | ✅                | ❌                                                        |
+| Parental control (blocking adult domains)                               | ✅                | ❌ (requires non-default blocklists)                      |
 | Force Safe search on search engines                                     | ✅                | ❌                                                        |
 | Per-client (device) configuration                                       | ✅                | ✅                                                        |
 | Access settings (choose who can use AGH DNS)                            | ✅                | ❌                                                        |
@@ -261,9 +261,9 @@ Run `make init` to prepare the development environment.

 You will need this to build AdGuard Home:

- *  [Go](https://golang.org/dl/) v1.19 or later;
- *  [Node.js](https://nodejs.org/en/download/) v10.16.2 or later;
- *  [npm](https://www.npmjs.com/) v6.14 or later;
+ *  [Go](https://golang.org/dl/) v1.20 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.


@@ -416,7 +416,8 @@ There are three options how you can install an unstable version:
   ###  <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.
+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

@@ -466,6 +467,10 @@ bug or implementing the feature.
    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)
+
 *  [AdGuard Home on GLInet
    routers](https://forum.gl-inet.com/t/adguardhome-on-gl-routers/10664) by
    [Gl-Inet](https://gl-inet.com/).
--- a/bamboo-specs/bamboo.yaml
+++ b/bamboo-specs/bamboo.yaml
@@ -1,5 +1,8 @@
---
-!include test.yaml
-
 ---
 !include release.yaml
+
+---
+!include snapcraft.yaml
+
+---
+!include test.yaml
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -1,349 +1,290 @@
 ---
 'version': 2
 'plan':
-  'project-key': 'AGH'
-  'key': 'AGHBSNAPSPECS'
-  'name': 'AdGuard Home - Build and publish release'
+    'project-key': 'AGH'
+    'key': 'AGHBSNAPSPECS'
+    'name': 'AdGuard Home - Build and publish release'
 # Make sure to sync any changes with the branch overrides below.
 'variables':
-  'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:6.3'
+    'channel': 'edge'
+    'dockerGo': 'adguard/golang-ubuntu:7.6'

 'stages':
- 'Build frontend':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Build frontend'
+  - 'Build frontend':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Build frontend'

- 'Make release':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Make release'
+  - 'Make release':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Make release'

- 'Make and publish docker':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Make and publish docker'
+  - 'Make and publish docker':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Make and publish docker'

- 'Publish to static storage':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Publish to static storage'
+  - 'Publish to static storage':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Publish to static storage'

- 'Publish to Snapstore':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Publish to Snapstore'
-
- 'Publish to GitHub Releases':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Publish to GitHub Releases'
+  - 'Publish to GitHub Releases':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Publish to GitHub Releases'

 'Build frontend':
-  'docker':
-    'image': '${bamboo.dockerGo}'
-    '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
+    'docker':
+        'image': '${bamboo.dockerGo}'
+        '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
+                set -e -f -u -x

-        # Explicitly checkout the revision that we need.
-        git checkout "${bamboo.repository.revision.number}"
+                # 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 js-deps js-build
+    'artifacts':
+      - 'name': 'AdGuardHome frontend'
+        'pattern': 'build/**'
+        'shared': true
+        'required': true
+    'requirements':
+      - 'adg-docker': 'true'

 'Make release':
-  'docker':
-    'image': '${bamboo.dockerGo}'
-    'volumes':
-      '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
-      '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
-  'key': 'MR'
-  'other':
-    'clean-working-dir': true
-  'tasks':
-  - 'checkout':
-      'force-clean-build': true
-  - 'script':
-      'interpreter': 'SHELL'
-      'scripts':
-      - |
-        #!/bin/sh
+    'docker':
+        'image': '${bamboo.dockerGo}'
+        'volumes':
+            '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+            '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+    'key': 'MR'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |
+                #!/bin/sh

-        set -e -f -u -x
+                set -e -f -u -x

-        # Explicitly checkout the revision that we need.
-        git checkout "${bamboo.repository.revision.number}"
+                # 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; }'\
-                | gpg --import --batch --yes
+                # Run the build with the specified channel.
+                echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
+                        | awk '{ gsub(/\\n/, "\n"); print; }'\
+                        | gpg --import --batch --yes

-        make\
-                CHANNEL=${bamboo.channel}\
-                GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
-                FRONTEND_PREBUILT=1\
-                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'
+                make\
+                        CHANNEL=${bamboo.channel}\
+                        GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
+                        FRONTEND_PREBUILT=1\
+                        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'

 'Make and publish docker':
-  'key': 'MPD'
-  'other':
-    'clean-working-dir': true
-  'tasks':
-  - 'checkout':
-      'force-clean-build': true
-  - 'script':
-      'interpreter': 'SHELL'
-      'scripts':
-      - |
-        #!/bin/sh
+    'key': 'MPD'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |
+                #!/bin/sh

-        set -e -f -u -x
+                set -e -f -u -x

-        COMMIT="${bamboo.repository.revision.number}"
-        export COMMIT
-        readonly COMMIT
+                COMMIT="${bamboo.repository.revision.number}"
+                export COMMIT
+                readonly COMMIT

-        # Explicitly checkout the revision that we need.
-        git checkout "$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 || :
-        docker buildx create --name buildx-builder --driver docker-container\
-                --use
-        docker buildx inspect --bootstrap
+                # Install Qemu, create builder.
+                docker version -f '{{ .Server.Experimental }}'
+                docker buildx rm buildx-builder || :
+                docker buildx create --name buildx-builder --driver docker-container\
+                                --use
+                docker buildx inspect --bootstrap

-        # Login to DockerHub.
-        docker login -u="${bamboo.dockerHubUsername}"\
-                -p="${bamboo.dockerHubPassword}"
+                # Login to DockerHub.
+                docker login -u="${bamboo.dockerHubUsername}"\
+                        -p="${bamboo.dockerHubPassword}"

-        # Boot the builder.
-        docker buildx inspect --bootstrap
+                # Boot the builder.
+                docker buildx inspect --bootstrap

-        # Print Docker info.
-        docker info
+                # Print Docker info.
+                docker info

-        # Prepare and push the build.
-        env\
-                CHANNEL="${bamboo.channel}"\
-                DIST_DIR='dist'\
-                DOCKER_IMAGE_NAME='adguard/adguardhome'\
-                DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
-                VERBOSE='1'\
-                sh ./scripts/make/build-docker.sh
-      'environment':
-        DOCKER_CLI_EXPERIMENTAL=enabled
-  'final-tasks':
-  - 'clean'
-  'requirements':
-  - 'adg-docker': 'true'
+                # Prepare and push the build.
+                env\
+                        CHANNEL="${bamboo.channel}"\
+                        DIST_DIR='dist'\
+                        DOCKER_IMAGE_NAME='adguard/adguardhome'\
+                        DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
+                        VERBOSE='1'\
+                        sh ./scripts/make/build-docker.sh
+            'environment':
+                DOCKER_CLI_EXPERIMENTAL=enabled
+    'final-tasks':
+      - 'clean'
+    'requirements':
+      - 'adg-docker': 'true'

 'Publish to static storage':
-  'key': 'PUB'
-  'other':
-    'clean-working-dir': true
-  'tasks':
-  - 'clean'
-  - 'checkout':
-      'repository': 'bamboo-deploy-publisher'
-      'path': 'bamboo-deploy-publisher'
-      'force-clean-build': true
-  - 'script':
-      'interpreter': 'SHELL'
-      'scripts':
-      - |
-        #!/bin/sh
+    'key': 'PUB'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'clean'
+      - 'checkout':
+            'repository': 'bamboo-deploy-publisher'
+            'path': 'bamboo-deploy-publisher'
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |
+                #!/bin/sh

-        set -e -f -u -x
+                set -e -f -u -x

-        cd ./dist/
+                cd ./dist/

-        CHANNEL="${bamboo.channel}"
-        export CHANNEL
+                CHANNEL="${bamboo.channel}"
+                export CHANNEL

-        ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
-  'final-tasks':
-  - 'clean'
-  'requirements':
-  - 'adg-docker': 'true'
-
-'Publish to Snapstore':
-  'docker':
-    'image': '${bamboo.dockerGo}'
-  'key': 'PTS'
-  'other':
-    'clean-working-dir': true
-  'tasks':
-  - 'clean'
-  - 'checkout':
-      'repository': 'bamboo-deploy-publisher'
-      'path': 'bamboo-deploy-publisher'
-      'force-clean-build': true
-  - 'script':
-      'interpreter': 'SHELL'
-      'scripts':
-      - |
-        #!/bin/sh
-
-        set -e -f -u -x
-
-        cd ./dist/
-
-        channel="${bamboo.channel}"
-        readonly channel
-
-        case "$channel"
-        in
-        ('release')
-              snapchannel='candidate'
-              ;;
-        ('beta')
-              snapchannel='beta'
-              ;;
-        ('edge')
-              snapchannel='edge'
-              ;;
-        (*)
-              echo "invalid channel '$channel'"
-              exit 1
-              ;;
-        esac
-
-        env\
-                SNAPCRAFT_CHANNEL="$snapchannel"\
-                SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
-                SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
-                SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\
-                ../bamboo-deploy-publisher/deploy.sh adguard-home-snap
-  'final-tasks':
-  - 'clean'
-  'requirements':
-  - 'adg-docker': 'true'
+                ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
+    'final-tasks':
+      - 'clean'
+    'requirements':
+      - 'adg-docker': 'true'

 'Publish to GitHub Releases':
-  'key': 'PTGR'
-  'other':
-    'clean-working-dir': true
-  'tasks':
-  - 'clean'
-  - 'checkout':
-      'repository': 'bamboo-deploy-publisher'
-      'path': 'bamboo-deploy-publisher'
-      'force-clean-build': true
-  - 'script':
-      'interpreter': 'SHELL'
-      'scripts':
-      - |
-        #!/bin/sh
+    'key': 'PTGR'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'clean'
+      - 'checkout':
+            'repository': 'bamboo-deploy-publisher'
+            'path': 'bamboo-deploy-publisher'
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |
+                #!/bin/sh

-        set -e -f -u -x
+                set -e -f -u -x

-        channel="${bamboo.channel}"
-        readonly channel
+                channel="${bamboo.channel}"
+                readonly channel

-        if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
-        then
-              echo "don't publish to GitHub Releases for this channel"
+                if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
+                then
+                        echo "don't publish to GitHub Releases for this channel"

-              exit 0
-        fi
+                        exit 0
+                fi

-        cd ./dist/
+                cd ./dist/

-        env\
-                GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
-                ../bamboo-deploy-publisher/deploy.sh adguard-home-github
-  'final-tasks':
-  - 'clean'
-  'requirements':
-  - 'adg-docker': 'true'
+                env\
+                        GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
+                        ../bamboo-deploy-publisher/deploy.sh adguard-home-github
+    'final-tasks':
+      - 'clean'
+    'requirements':
+      - 'adg-docker': 'true'

 'triggers':
-# Don't use minute values that end with a zero or a five as these are often used
-# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
+    # Don't use minute values that end with a zero or a five as these are often
+    # used in CI and so resources during these minutes can be quite busy.
+  - 'cron': '0 42 13 ? * MON-FRI *'
 'branches':
-  'create': 'manually'
-  'delete':
-    'after-deleted-days': 1
-    'after-inactive-days': 30
-  'integration':
-    'push-on-success': false
-    'merge-from': 'AdGuard Home - Build and publish release'
-  'link-to-jira': true
+    'create': 'manually'
+    'delete':
+        'after-deleted-days': 1
+        'after-inactive-days': 30
+    'integration':
+        'push-on-success': false
+        'merge-from': 'AdGuard Home   - Build and publish release'
+    'link-to-jira': true

 'notifications':
- 'events':
-  - 'plan-completed'
-  'recipients':
-  - 'webhook':
-      'name': 'Build webhook'
-      'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
+  - 'events':
+      - 'plan-completed'
+    'recipients':
+      - 'webhook':
+            'name': 'Build webhook'
+            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'

 'labels': []
 'other':
-  'concurrent-build-plugin': 'system-default'
+    'concurrent-build-plugin': 'system-default'

 'branch-overrides':
-# beta-vX.Y branches are the branches into which the commits that are needed to
-# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
-    # Build betas on release branches manually.
-    'triggers': []
-    # Set the default release channel on the release branch to beta, as we may
-    # need to build a few of these.
-    'variables':
-      'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:6.3'
-# release-vX.Y.Z branches are the branches from which the actual final release
-# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
-    # Disable integration branches for release branches.
-    'branch-config':
-      'integration':
-        'push-on-success': false
-        'merge-from': 'beta-v0.107'
-    # Build final releases on release branches manually.
-    'triggers': []
-    # Set the default release channel on the final branch to release, as these
-    # are the ones that actually get released.
-    'variables':
-      'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:6.3'
+    # beta-vX.Y branches are the branches into which the commits that are needed
+    # to release a new patch version are initially cherry-picked.
+  - '^beta-v[0-9]+\.[0-9]+':
+        # Build betas on release branches manually.
+        'triggers': []
+        # Set the default release channel on the release branch to beta, as we may
+        # need to build a few of these.
+        'variables':
+            'channel': 'beta'
+            'dockerGo': 'adguard/golang-ubuntu:7.6'
+    # release-vX.Y.Z branches are the branches from which the actual final
+    # release is built.
+  - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
+        # Disable integration branches for release branches.
+        'branch-config':
+            'integration':
+                'push-on-success': false
+                'merge-from': 'beta-v0.107'
+        # Build final releases on release branches manually.
+        'triggers': []
+        # Set the default release channel on the final branch to release, as these
+        # are the ones that actually get released.
+        'variables':
+            'channel': 'release'
+            'dockerGo': 'adguard/golang-ubuntu:7.6'
--- a/bamboo-specs/snapcraft.yaml
+++ b/bamboo-specs/snapcraft.yaml
@@ -0,0 +1,211 @@
+---
+# This part of the release build is separate from the one described in
+# release.yaml, because the Snapcraft infrastructure is brittle, and timeouts
+# during logins and uploads often lead to release blocking.
+'version': 2
+'plan':
+    'project-key': 'AGH'
+    'key': 'AGHSNAP'
+    'name': 'AdGuard Home - Build and publish Snapcraft release'
+# Make sure to sync any changes with the branch overrides below.
+'variables':
+    'channel': 'edge'
+    'dockerGo': 'adguard/golang-ubuntu:7.6'
+    'snapcraftChannel': 'edge'
+
+'stages':
+  - 'Download release':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Download release'
+
+  - 'Build packages':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Build packages'
+
+  - 'Publish to Snapstore':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Publish to Snapstore'
+
+# TODO(a.garipov): Consider using the Artifact Downloader Task if it ever learns
+# about plan branches.
+'Download release':
+    'artifacts':
+      - 'name': 'i386_binary'
+        'pattern': 'AdGuardHome_i386'
+        'shared': true
+        'required': true
+      - 'name': 'amd64_binary'
+        'pattern': 'AdGuardHome_amd64'
+        'shared': true
+        'required': true
+      - 'name': 'armhf_binary'
+        'pattern': 'AdGuardHome_armhf'
+        'shared': true
+        'required': true
+      - 'name': 'arm64_binary'
+        'pattern': 'AdGuardHome_arm64'
+        'shared': true
+        'required': true
+    'docker':
+        'image': '${bamboo.dockerGo}'
+    'key': 'DR'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+            - |
+              #!/bin/sh
+
+              set -e -f -u -x
+
+              env\
+                      CHANNEL="${bamboo.channel}"\
+                      VERBOSE='1'\
+                      sh ./scripts/snap/download.sh
+    'requirements':
+      - 'adg-docker': 'true'
+
+'Build packages':
+    'artifact-subscriptions':
+      - 'artifact': 'i386_binary'
+      - 'artifact': 'amd64_binary'
+      - 'artifact': 'armhf_binary'
+      - 'artifact': 'arm64_binary'
+    'artifacts':
+      - 'name': 'i386_snap'
+        'pattern': 'AdGuardHome_i386.snap'
+        'shared': true
+        'required': true
+      - 'name': 'amd64_snap'
+        'pattern': 'AdGuardHome_amd64.snap'
+        'shared': true
+        'required': true
+      - 'name': 'armhf_snap'
+        'pattern': 'AdGuardHome_armhf.snap'
+        'shared': true
+        'required': true
+      - 'name': 'arm64_snap'
+        'pattern': 'AdGuardHome_arm64.snap'
+        'shared': true
+        'required': true
+    'docker':
+        'image': '${bamboo.dockerGo}'
+    'key': 'BP'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+            - |
+              #!/bin/sh
+
+              set -e -f -u -x
+
+              env\
+                      VERBOSE='1'\
+                      sh ./scripts/snap/build.sh
+    'requirements':
+      - 'adg-docker': 'true'
+
+'Publish to Snapstore':
+    'artifact-subscriptions':
+      - 'artifact': 'i386_snap'
+      - 'artifact': 'amd64_snap'
+      - 'artifact': 'armhf_snap'
+      - 'artifact': 'arm64_snap'
+    'docker':
+        'image': '${bamboo.dockerGo}'
+    'key': 'PTS'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |
+                #!/bin/sh
+
+                set -e -f -u -x
+
+                env\
+                        SNAPCRAFT_CHANNEL="${bamboo.snapcraftChannel}"\
+                        SNAPCRAFT_STORE_CREDENTIALS="${bamboo.snapcraftMacaroonPassword}"\
+                        VERBOSE='1'\
+                        sh ./scripts/snap/upload.sh
+    'final-tasks':
+      - 'clean'
+    'requirements':
+      - 'adg-docker': 'true'
+
+'triggers':
+    # Don't use minute values that end with a zero or a five as these are often
+    # used in CI and so resources during these minutes can be quite busy.
+    #
+    # NOTE: The time is chosen to be exactly one hour after the main release
+    # build as defined as in release.yaml.
+  - 'cron': '0 42 14 ? * MON-FRI *'
+'branches':
+    'create': 'manually'
+    'delete':
+        'after-deleted-days': 1
+        'after-inactive-days': 30
+    'integration':
+        'push-on-success': false
+        'merge-from': 'AdGuard Home - Build and publish Snapcraft release'
+    'link-to-jira': true
+
+'notifications':
+  - 'events':
+      - 'plan-completed'
+    'recipients':
+      - 'webhook':
+            'name': 'Build webhook'
+            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
+
+'labels': []
+'other':
+    'concurrent-build-plugin': 'system-default'
+
+'branch-overrides':
+    # beta-vX.Y branches are the branches into which the commits that are needed
+    # to release a new patch version are initially cherry-picked.
+  - '^beta-v[0-9]+\.[0-9]+':
+        # Build betas on release branches manually.
+        'triggers': []
+        # Set the default release channel on the release branch to beta, as we may
+        # need to build a few of these.
+        'variables':
+            'channel': 'beta'
+            'dockerGo': 'adguard/golang-ubuntu:7.6'
+            'snapcraftChannel': 'beta'
+    # release-vX.Y.Z branches are the branches from which the actual final
+    # release is built.
+  - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
+        # Disable integration branches for release branches.
+        'branch-config':
+            'integration':
+                'push-on-success': false
+                'merge-from': 'beta-v0.107'
+        # Build final releases on release branches manually.
+        'triggers': []
+        # Set the default release channel on the final branch to release, as these
+        # are the ones that actually get released.
+        'variables':
+            'channel': 'release'
+            'dockerGo': 'adguard/golang-ubuntu:7.6'
+            'snapcraftChannel': 'candidate'
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -1,64 +1,117 @@
 ---
 'version': 2
 'plan':
-  'project-key': 'AGH'
-  'key': 'AHBRTSPECS'
-  'name': 'AdGuard Home - Build and run tests'
+    'project-key': 'AGH'
+    'key': 'AHBRTSPECS'
+    'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:6.3'
+    'dockerGo': 'adguard/golang-ubuntu:7.6'

 'stages':
- 'Tests':
-    'manual': false
-    'final': false
-    'jobs':
-    - 'Test'
+  - 'Tests':
+        'manual': false
+        'final': false
+        'jobs':
+          - 'Test'
+
+  - 'Artifact':
+        manual: false
+        final: false
+        jobs:
+          - 'Artifact'

 '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': 'TEST'
-  'other':
-    'clean-working-dir': true
-  'tasks':
-  - 'checkout':
-      'force-clean-build': true
-  - 'script':
-      'interpreter': 'SHELL'
-      'scripts':
-      - |
-        #!/bin/sh
+    'docker':
+        'image': '${bamboo.dockerGo}'
+        'volumes':
+            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
+            '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+            '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+    'key': 'TEST'
+    'other':
+        'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |
+                #!/bin/sh

-        set -e -f -u -x
+                set -e -f -u -x

-        make VERBOSE=1 ci go-tools lint
-  'final-tasks':
-  - 'clean'
-  'requirements':
-  - 'adg-docker': 'true'
+                make VERBOSE=1 ci go-tools lint
+    'final-tasks':
+      - 'clean'
+    'requirements':
+      - 'adg-docker': 'true'
+
+'Artifact':
+    'docker':
+        'image': '${bamboo.dockerGo}'
+        'volumes':
+         '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+         '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+    'key': 'ART'
+    'other':
+         'clean-working-dir': true
+    'tasks':
+      - 'checkout':
+            'force-clean-build': true
+      - 'script':
+            'interpreter': 'SHELL'
+            'scripts':
+              - |-
+                #!/bin/sh
+
+                set -e -f -u -x
+
+                # Explicitly checkout the revision that we need.
+                git checkout "${bamboo.repository.revision.number}"
+
+                make\
+                        ARCH="amd64"\
+                        OS="windows darwin linux"\
+                        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'

 'branches':
-  'create': 'for-pull-request'
-  'delete':
-    'after-deleted-days': 1
-    'after-inactive-days': 5
-  'integration':
-    'push-on-success': false
-    'merge-from': 'AdGuard Home - Build and run tests'
-  'link-to-jira': true
+    'create': 'for-pull-request'
+    'delete':
+        'after-deleted-days': 1
+        'after-inactive-days': 5
+    'integration':
+        'push-on-success': false
+        'merge-from': 'AdGuard Home - Build and run tests'
+    'link-to-jira': true

 'notifications':
- 'events':
-  - 'plan-status-changed'
-  'recipients':
-  - 'webhook':
-      'name': 'Build webhook'
-      'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
+  - 'events':
+      - 'plan-status-changed'
+    'recipients':
+      - 'webhook':
+            'name': 'Build webhook'
+            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'

 'labels': []
 'other':
-  'concurrent-build-plugin': 'system-default'
+    'concurrent-build-plugin': 'system-default'
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -81,6 +81,19 @@
            }
        ],
        "import/prefer-default-export": "off",
-        "no-alert": "off"
+        "no-alert": "off",
+        "arrow-body-style": "off",
+        "max-len": [
+            "error",
+            120,
+            2,
+            {
+                "ignoreUrls": true,
+                "ignoreComments": false,
+                "ignoreRegExpLiterals": true,
+                "ignoreStrings": true,
+                "ignoreTemplateLiterals": true
+            }
+        ]
    }
 }
--- a/client/dev.eslintrc
+++ b/client/dev.eslintrc
@@ -1,6 +1,6 @@
 {
    "extends": ".eslintrc",
    "rules": {
-        "no-debugger":"warn",
+        "no-debugger":"warn"
    }
 }
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -42,7 +42,7 @@
        "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": {
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -12,11 +12,40 @@
        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#67B279">
        <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
        <title>AdGuard Home</title>
+        <style>
+            .wrapper {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                min-height: 100vh;
+            }
+
+            [data-theme="DARK"] .wrapper {
+                background-color: #f5f7fb;
+            }
+        </style>
    </head>
    <body>
        <noscript>
            You need to enable JavaScript to run this app.
        </noscript>
-        <div id="root"></div>
+        <div id="root">
+            <div class="wrapper"></div>
+        </div>
+        <script>
+            (function() {
+                var LOCAL_STORAGE_THEME_KEY = 'account_theme';
+                var theme = 'light';
+
+                try {
+                    theme = window.localStorage.getItem(LOCAL_STORAGE_THEME_KEY);
+                } catch(e) {
+                    console.error(e);
+                }
+
+                document.body.dataset.theme = theme;
+            })();
+        </script>
    </body>
 </html>
--- a/client/public/login.html
+++ b/client/public/login.html
@@ -17,5 +17,12 @@
            You need to enable JavaScript to run this app.
        </noscript>
        <div id="root"></div>
+        <script>
+            (function() {
+                var prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+                var currentTheme = prefersDark ? 'dark' : 'light';
+                document.body.dataset.theme = currentTheme;
+            })();
+        </script>
    </body>
 </html>
--- a/client/src/__locales/ar.json
+++ b/client/src/__locales/ar.json
@@ -7,7 +7,7 @@
    "load_balancing": "توزيع الحمل",
    "load_balancing_desc": "الاستعلام عن خادم واحد في كل مرة سيستخدم AdGuard  الرئيسية الخوارزمية العشوائية الموزونة لاختيار الخادم بحيث يتم استخدام أسرع خادم في كثير من الأحيان",
    "bootstrap_dns": "خوادم Bootstrap DNS",
-    "bootstrap_dns_desc": "يتم استخدام خوادم Bootstrap DNS لحل عناوين IP الخاصة بمحللات DoH / DoT التي تحددها على هيئة تدفقات.",
+    "bootstrap_dns_desc": "عناوين IP لخوادم DNS المستخدمة لحل عناوين IP الخاصة بمحللات DoH/DoT التي تحددها كمصدرين رئيسيين. التعليقات غير مسموح بها.",
    "local_ptr_title": "خوادم DNS العكسية الخاصة",
    "local_ptr_desc": "خوادم DNS التي يستخدمها AdGuard Home لاستعلامات PTR المحلية. تُستخدم هذه الخوادم لحل أسماء المضيفين للعملاء بعناوين IP خاصة ، على سبيل المثال \"192.168.12.34\" ، باستخدام DNS العكسي. في حالة عدم التعيين ، يستخدم AdGuard Home عناوين محللات DNS الافتراضية لنظام التشغيل الخاص بك باستثناء عناوين AdGuard Home نفسها.",
    "local_ptr_default_resolver": "بشكل افتراضي ، يستخدم AdGuard Home محللات DNS العكسية التالية: {{ip}}.",
@@ -125,6 +125,8 @@
    "top_clients": "كبار العملاء",
    "no_clients_found": "لم يتم العثور على عملاء",
    "general_statistics": "الإحصاءات العامة",
+    "top_upstreams": "أعلى الخوادم upstream",
+    "no_upstreams_data_found": "لم يتم العثور على بيانات خوادم upstream",
    "number_of_dns_query_days": "عدد استعلامات DNS التي تمت معالجتها لآخر {{count}} يوم",
    "number_of_dns_query_days_plural": "عدد استعلامات DNS التي تمت معالجتها لآخر {{count}} أيام",
    "number_of_dns_query_24_hours": "عدد استعلامات DNS التي تمت معالجتها لآخر 24 ساعة",
@@ -158,6 +160,7 @@
    "upstream_dns_configured_in_file": "تم اعداده في {{path}}",
    "test_upstream_btn": "اختبار upstream",
    "upstreams": "Upstreams",
+    "upstream": "Upstream",
    "apply_btn": "تطبيق",
    "disabled_filtering_toast": "تم تعطيل الفلترة",
    "enabled_filtering_toast": "تم تمكين الفلترة",
@@ -212,6 +215,7 @@
    "example_upstream_udp": "regular DNS (over UDP, hostname);",
    "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": "encrypted <0>DNS-over-QUIC</0>;",
    "example_upstream_sdns": "<0>DNS Stamps</0> for <1>DNSCrypt</1> or <2>DNS-over-HTTPS</2> resolvers;",
    "example_upstream_tcp": "regular DNS (over TCP);",
@@ -274,6 +278,7 @@
    "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",
@@ -552,7 +557,7 @@
    "rewrite_A": "<0> A </0>: قيمة خاصة ، احتفظ بسجلات <0> A </0> من upstream",
    "rewrite_AAAA": "<0> AAAA </0>: قيمة خاصة ، احتفظ بسجلات <0> AAAA </0> من upstream",
    "disable_ipv6": "قم بتعطيل تحليل عناوين IPv6",
-    "disable_ipv6_desc": "قم بإسقاط جميع استعلامات DNS لعناوين IPv6 (اكتب AAAA).",
+    "disable_ipv6_desc": "قم بإسقاط كافة استعلامات DNS لعناوين IPv6 (اكتب AAAA) وقم بإزالة تلميحات IPv6 من استجابات HTTPS.",
    "fastest_addr": "أسرع عنوان IP",
    "fastest_addr_desc": "استعلم عن جميع خوادم DNS وأعد عنوان IP الأسرع بين جميع الاستجابات. يؤدي هذا إلى إبطاء استعلامات DNS حيث يتعين على AdGuard Home انتظار الاستجابات من جميع خوادم DNS ، ولكنه يحسن الاتصال الكلي.",
    "autofix_warning_text": "إذا قمت بالنقر فوق \"إصلاح\" ، فسيقوم AdGuard Home بتهيئة نظامك لاستخدام خادم AdGuard Home DNS.",
@@ -594,7 +599,7 @@
    "all_queries": "كافة الاستفسارات",
    "show_blocked_responses": "حظر",
    "show_whitelisted_responses": "القائمة البيضاء",
-    "show_processed_responses": "المعالجة",
+    "show_processed_responses": "معالجة",
    "blocked_safebrowsing": "محظور بواسطة التصفح الآمن",
    "blocked_adult_websites": "محظور بواسطة الرقابة الأبوية",
    "blocked_threats": "التهديدات المحظورة",
@@ -635,5 +640,13 @@
    "parental_control": "الرقابة الابويه",
    "safe_browsing": "تصفح آمن",
    "served_from_cache": "{{value}} <i>(يتم تقديمه من ذاكرة التخزين المؤقت)</i>",
-    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل"
+    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل",
+    "protection_section_label": "الحماية",
+    "sunday_short": "الاحد",
+    "monday_short": "الإثنين",
+    "tuesday_short": "الثلاثاء",
+    "wednesday_short": "الاربعاء",
+    "thursday_short": "الخميس",
+    "friday_short": "الجمعة",
+    "saturday_short": "السبت"
 }
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -1,13 +1,17 @@
 {
    "client_settings": "Налады кліентаў",
    "example_upstream_reserved": "upstream <0>для канкрэтных даменаў</0>;",
+    "example_multiple_upstreams_reserved": "некалькі DNS-сервераў <0>для канкрэтных даменаў</0>;",
    "example_upstream_comment": "каментар.",
    "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту",
    "parallel_requests": "Паралельныя запыты",
    "load_balancing": "Размеркаванне нагрузкі",
    "load_balancing_desc": "Запытвайце па адным серверы за раз. AdGuard Home будзе выкарыстоўваць выпадковы алгарытм для выбару сервера, так што самы хуткі сервер будзе выкарыстоўвацца часцей.",
    "bootstrap_dns": "Bootstrap DNS-серверы",
-    "bootstrap_dns_desc": "Bootstrap DNS-серверы выкарыстоўваюцца для пошуку IP-адрасоў DoH/DoT сервераў, якія вы паказалі.",
+    "bootstrap_dns_desc": "IP-адрасы DNS-сервераў, якія выкарыстоўваюцца для вырашэння IP-адрасоў распознавальнікаў DoH/DoT, якія вы ўказваеце ў якасці перадачы. Каментары не дапускаюцца.",
+    "fallback_dns_title": "Рэзервовыя DNS-серверы",
+    "fallback_dns_desc": "Спіс рэзервовых DNS-сервераў, якія выкарыстоўваюцца, калі вышэйшыя DNS-серверы не адказваюць. Сінтаксіс такі ж, як і ў галоўным полі ўверх.",
+    "fallback_dns_placeholder": "Увядзіце па адным рэзервовым серверы DNS у радку",
    "local_ptr_title": "Прыватныя DNS-серверы",
    "local_ptr_desc": "DNS-серверы, якія AdGuard Home выкарыстоўвае для лакальных PTR-запытаў. Гэтыя серверы выкарыстоўваюцца, каб атрымаць даменавыя імёны кліентаў з прыватнымі IP-адрасамі, напрыклад «192.168.12.34», з дапамогай rDNS. Калі спіс пусты, AdGuard Home выкарыстоўвае прадвызначаныя DNS-серверы вашай АС.",
    "local_ptr_default_resolver": "Па змаўчанні AdGuard Home выкарыстоўвае наступныя зваротныя DNS-рэзолверы: {{ip}}.",
@@ -70,7 +74,9 @@
    "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": "Скінуць усё арэнды",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Заблакаваныя шкодныя і фішынгавыя сайты",
    "stats_adult": "Заблакаваныя «дарослыя» сайты",
    "stats_query_domain": "Часта запытаныя дамены",
-    "for_last_24_hours": "за 24 гадзіны",
+    "for_last_hours": "за апошнюю {{count}} гадзіну",
+    "for_last_hours_plural": "за апошнія {{count}} гадзін",
    "for_last_days": "за апошні {{count}} дзень",
    "for_last_days_plural": "за апошнія {{count}} дзён",
    "stats_disabled": "Статыстыка была адключаная. Вы можаце ўключыць яго <0>на старонцы налад </0>.",
@@ -125,15 +132,20 @@
    "top_clients": "Частыя кліенты",
    "no_clients_found": "Кліентаў не знойдзена",
    "general_statistics": "Агульная статыстыка",
+    "top_upstreams": "Часта запытаныя upstream серверы",
+    "no_upstreams_data_found": "Няма дадзеных аб upstream серверах",
    "number_of_dns_query_days": "Колькасць DNS-запытаў за апошні {{count}} дзень",
    "number_of_dns_query_days_plural": "Колькасць DNS запытаў, апрацаваных за апошнія {{count}} дзён",
-    "number_of_dns_query_24_hours": "Колькасць DNS-запытаў за 24 гадзіны",
+    "number_of_dns_query_hours": "Колькасць DNS-запытаў, апрацаваных за апошнюю {{count}} гадзіну",
+    "number_of_dns_query_hours_plural": "Колькасць DNS-запытаў, апрацаваных за апошнія {{count}} гадзін",
    "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": "Час водгуку",
    "average_processing_time_hint": "Сярэдні час для апрацоўкі запыту DNS  у мілісекундах",
    "block_domain_use_filters_and_hosts": "Блакаваць дамены з выкарыстаннем фільтраў і файлаў хастоў",
    "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў «<a>Фільтрах</a>».",
@@ -150,7 +162,7 @@
    "dns_allowlists": "Белыя спісы DNS",
    "dns_blocklists_desc": "AdGuard Home будзе блакаваць дамены з чорных спісаў.",
    "dns_allowlists_desc": "Дамены з белых спісаў DNS будуць дазволены, нават калі яны знаходзяцца ў любым з чорных спісаў.",
-    "custom_filtering_rules": "Карыстацкія правілы фільтрацыі",
+    "custom_filtering_rules": "Карыстальніцкія правілы фільтрацыі",
    "encryption_settings": "Налады шыфравання",
    "dhcp_settings": "Налады DHCP",
    "upstream_dns": "Upstream DNS-серверы",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Наладжаны ў {{path}}",
    "test_upstream_btn": "Тэст upstream сервераў",
    "upstreams": "Upstreams",
+    "upstream": "Upstream сервер",
    "apply_btn": "Ужыць",
    "disabled_filtering_toast": "Фільтрацыя выкл.",
    "enabled_filtering_toast": "Фільтрацыя ўкл.",
@@ -167,6 +180,7 @@
    "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-адрас спіса",
@@ -247,7 +261,7 @@
    "loading_table_status": "Загрузка...",
    "page_table_footer_text": "Старонка",
    "rows_table_footer_text": "радкоў",
-    "updated_custom_filtering_toast": "Занесены змены ў карыстацкія правілы",
+    "updated_custom_filtering_toast": "Карыстальніцкія правілы паспяхова захаваны",
    "rule_removed_from_custom_filtering_toast": "Карыстацкае правіла выдалена: {{rule}}",
    "rule_added_to_custom_filtering_toast": "Карыстацкае правіла дададзена: {{rule}}",
    "query_log_response_status": "Статус: {{value}}",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "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",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць кліента «{{key}}»?",
    "list_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць гэты спіс?",
    "auto_clients_title": "Кліенты (runtime)",
-    "auto_clients_desc": "Прылады, якіх няма ў спісе пастаянных кліентаў, якія ўсё яшчэ могуць выкарыстоўваць AdGuard Home",
+    "auto_clients_desc": "Інфармацыя аб IP-адрасах прылад, якія выкарыстоўваюць або могуць выкарыстоўваць AdGuard Home. Гэтая інфармацыя збіраецца з некалькіх крыніц, уключаючы файлы хостаў, зваротны DNS і г.д.",
    "access_title": "Налады доступу",
    "access_desc": "Тут вы можаце наладзіць правілы доступу да DNS-серверу AdGuard Home",
    "access_allowed_title": "Дазволеныя кліенты",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Каб выкарыстоўваць <1>DNS-over-HTTPS</1> ці <1>DNS-over-TLS</1>, вам патрэбна <0>наладзіць шыфраванне</0> у наладах AdGuard Home.",
    "rewrite_added": "Правіла перанакіравання DNS для «{{key}}» паспяхова дададзена",
    "rewrite_deleted": "Правіла перанакіравання DNS для «{{key}}» паспяхова выдалена",
+    "rewrite_updated": "Перазапіс DNS паспяхова абноўлены",
    "rewrite_add": "Дадаць правіла перанакіравання DNS",
+    "rewrite_edit": "Рэдагаваць перазапіс DNS",
    "rewrite_not_found": "Не знойдзена правілаў перанакіравання DNS",
    "rewrite_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць правіла перанакіравання DNS для «{{key}}»?",
    "rewrite_desc": "Дазваляе лёгка наладзіць карыстацкі DNS-адказ для пэўнага дамена.",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання статыстыкі? Пры памяншэнні інтэрвалу, некаторыя даныя могуць быць страчаны",
    "statistics_cleared": "Статыстыка паспяхова вычышчана",
    "statistics_enable": "Уключыць статыстыку",
+    "ignore_domains": "Ігнаруемыя дамены (парадкова)",
+    "ignore_domains_title": "Ігнаруемыя дамены",
+    "ignore_domains_desc_stats": "Запыты, якія адпавядаюць гэтым правілам, не запісваюцца ў статыстыку",
+    "ignore_domains_desc_query": "Запыты, якія адпавядаюць гэтым правілам, не запісваюцца ў часопіс запытаў",
    "interval_hours": "{{count}} гадзіна",
    "interval_hours_plural": "{{count}} гадзін",
    "filters_configuration": "Налада фільтраў",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: адмысловае значэнне, захоўваць запісы <0>A</0> з сервера для выгрузкі даных",
    "rewrite_AAAA": "<0>AAAA</0>: адмысловае значэнне, захоўваць запісы <0>AAAA</0> з сервера для выгрузкі даных",
    "disable_ipv6": "Адключыць IPv6",
-    "disable_ipv6_desc": "Калі гэта опцыя ўлучана, усе DNS-запыты адрасоў IPv6 (тып AAAA) будуць ігнаравацца.",
+    "disable_ipv6_desc": "Ігнараваць усе запыты DNS для адрасоў IPv6 (тып AAAA) і выдаленне дадзеных IPv6 з адказаў тыпу HTTPS.",
    "fastest_addr": "Найхуткі IP-адрас",
    "fastest_addr_desc": "Апытайце ўсе DNS-серверы і вярніце самы хуткі IP-адрас сярод усіх адказаў. Гэта замарудзіць выкананне DNS-запытаў, бо нам давядзецца чакаць адказаў ад усіх DNS-сервераў, але палепшыць агульную ўзаемасувязь.",
    "autofix_warning_text": "Пры націску «Выправіць» AdGuard Home наладзіць вашу сістэму на выкарыстанне DNS-сервера AdGuard Home.",
@@ -568,7 +603,7 @@
    "check_desc": "Праверыць фільтрацыю імя хаста",
    "check": "Праверыць",
    "form_enter_host": "Увядзіце імя хаста",
-    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстацкіх правілаў фільтрацыі",
+    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстальніцкіх правіл фільтрацыі",
    "choose_from_list": "Абраць са спіса",
    "add_custom_list": "Дадаць свой спіс",
    "host_whitelisted": "Хост занесены ў белы спіс",
@@ -638,9 +673,69 @@
    "parental_control": "Бацькоўскі кантроль",
    "safe_browsing": "Бяспечны інтэрнэт",
    "served_from_cache": "{{value}} <i>(атрымана з кэша)</i>",
-    "form_error_password_length": "Пароль павінен быць не менш за {{value}} сімвалаў",
+    "form_error_password_length": "Пароль павінен утрымліваць ад {{min}} да {{max}} сімвалаў",
    "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
    "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
    "cache_cleared": "Кэш DNS паспяхова ачышчаны",
-    "clear_cache": "Ачысціць кэш"
+    "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": "Ігнараваць гэтага кліента ў журнале запытаў",
+    "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": "Канфігурацыя кэша upstream DNS-сервераў",
+    "enable_upstream_dns_cache": "Ўключыць кэшаванне для карыстацкай канфігурацыі upstream-сервераў гэтага кліента",
+    "dns_cache_size": "Памер кэша DNS, у байтах"
 }
--- a/client/src/__locales/bg.json
+++ b/client/src/__locales/bg.json
@@ -265,7 +265,7 @@
    "domain": "Домейн",
    "ecs": "ECS",
    "statistics_clear": "Нулирай статистиката",
-    "disabled": "Деактивиран",
+    "disabled": "Изключен",
    "username_label": "Потребител",
    "username_placeholder": "Въведете потребител",
    "password_label": "Парола",
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Optimalizace vytížení",
    "load_balancing_desc": "Optimalizovaný dotaz na odchozí server. AdGuard Home použije vážený náhodný algoritmus k výběru serveru, takže nejrychlejší server je používán častěji.",
    "bootstrap_dns": "Bootstrap DNS servery",
-    "bootstrap_dns_desc": "Servery Bootstrap DNS se používají k řešení IP adres DoH/DoT, které zadáváte jako upstreamy.",
+    "bootstrap_dns_desc": "IP adresy DNS serverů používaných k překladu IP adres řešitelů DoH/DoT, které zadáte jako odchozí servery. Komentáře nejsou povoleny.",
+    "fallback_dns_title": "Záložní DNS servery",
+    "fallback_dns_desc": "Seznam záložních DNS serverů používaných v případě, že odchozí DNS servery neodpovídají. Syntaxe je stejná jako v hlavním poli pro odchozí servery výše.",
+    "fallback_dns_placeholder": "Zadejte jeden záložní DNS server na řádek",
    "local_ptr_title": "Soukromé reverzní DNS servery",
    "local_ptr_desc": "Servery DNS, které AdGuard Home používá pro lokální dotazy PTR. Tyto servery se používají k řešení požadavků PTR na adresy v soukromých rozmezích IP, například \"192.168.12.34\", pomocí reverzního DNS. Pokud není nastaveno, AdGuard Home automaticky použije výchozí řešitele vašeho OS s výjimkou adres samotného AdGuard Home.",
    "local_ptr_default_resolver": "Ve výchozím nastavení používá AdGuard Home následující reverzní DNS řešitele: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home nemohl určit vhodné soukromé reverzní DNS řešitele pro tento systém.",
-    "local_ptr_placeholder": "Zadejte jednu adresu serveru na řádek",
+    "local_ptr_placeholder": "Zadejte jednu IP adresu na řádek",
    "resolve_clients_title": "Povolit zpětné řešení IP adres klientů",
    "resolve_clients_desc": "Obráceně vyřešit IP adresy klientů na jejich názvy hostitelů zasláním dotazů PTR příslušným řešitelům (soukromé DNS servery pro místní klienty, odchozí servery pro klienty s veřejnou IP adresou).",
    "use_private_ptr_resolvers_title": "Použít soukromé reverzní rDNS řešitele",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "za posledních 24 hodin",
+    "for_last_hours": "za poslední {{count}} hodinu",
+    "for_last_hours_plural": "za posledních {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Nejčastější klienti",
    "no_clients_found": "Nenalezeny žádní klienti",
    "general_statistics": "Obecné statistiky",
+    "top_upstreams": "Top odchozí připojení",
+    "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_24_hours": "Počet DNS dotazů zpracovaných za posledních 24 hodin",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Konfigurováno v {{path}}",
    "test_upstream_btn": "Test upstreamů",
    "upstreams": "Odesláno",
+    "upstream": "Odchozí připojení",
    "apply_btn": "Použít",
    "disabled_filtering_toast": "Vypnuté filtrování",
    "enabled_filtering_toast": "Zapnuté filtrování",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Protokol dotazů byl úspěšně vymazán",
    "query_log_updated": "Protokol dotazů byl úspěšně aktualizován",
    "query_log_clear": "Vymazat protokoly dotazů",
-    "query_log_retention": "Uchování protokolů dotazů",
+    "query_log_retention": "Rotace protokolů dotazů",
    "query_log_enable": "Povolit protokol",
    "query_log_configuration": "Konfigurace protokolů",
    "query_log_disabled": "Protokol dotazu je zakázán a lze jej nakonfigurovat v <0>nastavení</0>",
    "query_log_strict_search": "Pro striktní vyhledávání použijte dvojité uvozovky",
-    "query_log_retention_confirm": "Opravdu chcete změnit uchovávání protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
+    "query_log_retention_confirm": "Opravdu chcete změnit rotaci protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
    "anonymize_client_ip": "Anonymizovat IP klienta",
    "anonymize_client_ip_desc": "Neukládat úplnou IP adresu klienta do protokolů a statistik",
    "dns_config": "Konfigurace DNS serveru",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Opravdu chcete odstranit klienta \"{{key}}\"?",
    "list_confirm_delete": "Opravdu chcete smazat tento seznam?",
    "auto_clients_title": "Spuštění klienti",
-    "auto_clients_desc": "Zařízení, která nejsou na seznamu stálých klientů, a mohou nadále používat AdGuard Home",
+    "auto_clients_desc": "Informace o IP adresách zařízení, která používají nebo mohou používat AdGuard Home. Tyto informace se získávají z několika zdrojů, včetně souborů hosts, reverzního DNS atd.",
    "access_title": "Nastavení přístupu",
    "access_desc": "Zde můžete konfigurovat pravidla přístupu pro server DNS AdGuard Home",
    "access_allowed_title": "Povolení klienti",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Pro použití <1>DNS skrze HTTPS</1> nebo <1>DNS skrze TLS</1> potřebujete v nastaveních AdGuard Home <0>nakonfigurovat šifrování</0>.",
    "rewrite_added": "Přesměrování DNS pro „{{key}}“ úspěšně přidáno",
    "rewrite_deleted": "Přesměrování DNS pro „{{key}}“ úspěšně smazáno",
+    "rewrite_updated": "Přesměrování DNS bylo úspěšně aktualizováno",
    "rewrite_add": "Přidat přesměrování DNS",
+    "rewrite_edit": "Upravit přesměrování DNS",
    "rewrite_not_found": "Přesměrování DNS nenalezeny",
    "rewrite_confirm_delete": "Jste si jisti, že chcete smazat přesměrování DNS pro „{{key}}“?",
    "rewrite_desc": "Umožňuje snadno nakonfigurovat vlastní DNS odezvy pro konkrétní název domény.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Povolit statistiky",
    "ignore_domains": "Ignorované domény (oddělené novým řádkem)",
    "ignore_domains_title": "Ignorované domény",
-    "ignore_domains_desc_stats": "Dotazy pro tyto domény se do statistik nezapisují",
-    "ignore_domains_desc_query": "Dotazy pro tyto domény se do záznamu dotazů nezapisují",
+    "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í",
    "interval_hours": "Hodiny: {{count}}",
    "interval_hours_plural": "Hodiny: {{count}}",
    "filters_configuration": "Konfigurace filtrů",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: speciální hodnota, udržet záznamy typu <0>A</0> z odchozího serveru",
    "rewrite_AAAA": "<0>AAAA</0>: speciální hodnota, udržet záznamy typu <0>AAAA</0> z odchozího serveru",
    "disable_ipv6": "Zakázat řešení IPv6 adres",
-    "disable_ipv6_desc": "Zrušit všechny dotazy DNS pro adresy IPv6 (typ AAAA).",
+    "disable_ipv6_desc": "Odstranění všech dotazů DNS na adresy IPv6 (typ AAAA) a odstranění náznaků IPv6 z odpovědí HTTPS.",
    "fastest_addr": "Nejrychlejší IP adresa",
    "fastest_addr_desc": "Dotazovat všechny DNS servery a vrátit nejrychlejší IP adresu ze všech odpovědí. To zpomalí dotazy DNS, protože AdGuard Home musí čekat na odpovědi ze všech serverů DNS, ale celková konektivita se zlepší.",
    "autofix_warning_text": "Pokud kliknete na „Opravit“, AdGuard Home nakonfiguruje váš systém tak, aby používal DNS server AdGuard Home.",
@@ -645,7 +673,7 @@
    "parental_control": "Rodičovská ochrana",
    "safe_browsing": "Bezpečné prohlížení",
    "served_from_cache": "{{value}} <i>(převzato z mezipaměti)</i>",
-    "form_error_password_length": "Heslo musí být alespoň {{value}} znaků dlouhé",
+    "form_error_password_length": "Heslo musí obsahovat od {{min}} do {{max}} znaků",
    "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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Vypnout ochranu na {{count}} hod.",
    "disable_notify_for_hours_plural": "Vypnout ochranu na {{count}} hod.",
    "disable_notify_until_tomorrow": "Vypnout ochranu do zítřka",
-    "enable_protection_timer": "Ochrana bude zapnuta za {{time}}"
+    "enable_protection_timer": "Ochrana bude zapnuta za {{time}}",
+    "custom_retention_input": "Zadejte retenci v hodinách",
+    "custom_rotation_input": "Zadejte rotaci v hodinách",
+    "protection_section_label": "Ochrana",
+    "log_and_stats_section_label": "Protokol dotazů a statistiky",
+    "ignore_query_log": "Ignorovat tohoto klienta v protokolu dotazů",
+    "ignore_statistics": "Ignorovat tohoto klienta ve statistikách",
+    "schedule_services": "Pozastavit blokování služeb",
+    "schedule_services_desc": "Konfigurace plánu pozastavení filtru blokování služeb",
+    "schedule_services_desc_client": "Konfigurace plánu pozastavení filtru blokování služeb pro tohoto klienta",
+    "schedule_desc": "Nastavení doby nečinnosti pro blokované služby",
+    "schedule_invalid_select": "Čas zahájení musí být před časem ukončení",
+    "schedule_select_days": "Vyberte dny",
+    "schedule_timezone": "Vyberte časové pásmo",
+    "schedule_current_timezone": "Aktuální časové pásmo: {{value}}",
+    "schedule_time_all_day": "Všechny dny",
+    "schedule_modal_description": "Tento plán nahradí všechny stávající plány pro stejný den v týdnu. Každý den v týdnu může mít pouze jedno období nečinnosti.",
+    "schedule_modal_time_off": "Žádné blokování služeb:",
+    "schedule_new": "Nový plán",
+    "schedule_edit": "Upravit plán",
+    "schedule_save": "Uložit plán",
+    "schedule_add": "Přidat plán",
+    "schedule_remove": "Odstranit plán",
+    "schedule_from": "Od",
+    "schedule_to": "Do",
+    "sunday": "Neděle",
+    "monday": "Pondělí",
+    "tuesday": "Úterý",
+    "wednesday": "Středa",
+    "thursday": "Čtvrtek",
+    "friday": "Pátek",
+    "saturday": "Sobota",
+    "sunday_short": "Neděle",
+    "monday_short": "Pondělí",
+    "tuesday_short": "Úterý",
+    "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"
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Belastningsfordeling",
    "load_balancing_desc": "Forespørg én server ad gangen. AdGuard Home vil bruge en vægtet randomiseringsalgoritme til valg af server, så den hurtigste server oftere anvendes.",
    "bootstrap_dns": "Bootstrap DNS-servere",
-    "bootstrap_dns_desc": "Bootstrap DNS-servere bruges til at fortolke IP-adresser for de DoH-/DoT-resolvere, du angiver som upstream.",
+    "bootstrap_dns_desc": "IP-adresser på DNS-servere, som bruges til at opløse IP-adresser på de DoH/DoT-opløsere, som angives som upstreams. Kommentarer er ikke tilladt.",
+    "fallback_dns_title": "Reserve DNS-servere",
+    "fallback_dns_desc": "Liste over reserve (fallback) DNS-servere, som bruges, når upstream DNS-servere ikke reagerer. Samme syntaks som i upstream-hovedfeltet ovenfor.",
+    "fallback_dns_placeholder": "Angiv én reserve DNS-server pr. linje",
    "local_ptr_title": "Private reverse DNS-servere",
    "local_ptr_desc": "DNS-servere brugt af AdGuard Home til lokale PTR-forespørgsler. Disse servere bruges til at opløse PTR-forespørgsler fra private IP-adresseområder, f.eks. \"192.168.12.34\", vha. reverse DNS. Hvis ikke opsat, bruger AdGuard Home operativsystems standard DNS-opløsere undtagen for sine egne adresser.",
    "local_ptr_default_resolver": "AdGuard Home bruger som standard flg. reverse DNS-opløsere: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home kunne ikke fastslå egnede private reverse DNS-opløsere for dette system.",
-    "local_ptr_placeholder": "Indtast en serveradresse pr. Linje",
+    "local_ptr_placeholder": "Angiv én IP-adresse pr. linje",
    "resolve_clients_title": "Aktivér omvendt løsning af klienters IP-adresser",
    "resolve_clients_desc": "Opløs klienters IP-adresser reverseret til deres værtsnavne ved at sende PTR-forespørgsler til korresponderende opløsere (private DNS-servere til lokale klienter, upstream-servere til klienter med offentlige IP-adresser).",
    "use_private_ptr_resolvers_title": "Brug private reverse DNS-opløsere",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Blokeret malware/phishing",
    "stats_adult": "Blokerede voksne websteder",
    "stats_query_domain": "Mest forespurgte domæner",
-    "for_last_24_hours": "de seneste 24 timer",
+    "for_last_hours": "den seneste {{count}} time",
+    "for_last_hours_plural": "de seneste {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Hyppigste klienter",
    "no_clients_found": "Ingen klienter fundet",
    "general_statistics": "Generelle statistikker",
+    "top_upstreams": "Top-upstreams",
+    "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_24_hours": "Antallet af DNS-forespørgsler behandlet de seneste 24 timer",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Opsat i {{path}}",
    "test_upstream_btn": "Test upstreams",
    "upstreams": "Upstreams",
+    "upstream": "Upstream",
    "apply_btn": "Anvend",
    "disabled_filtering_toast": "Filtrering deaktiveret",
    "enabled_filtering_toast": "Filtrering aktiveret",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Forespørgselsloggen er blevet ryddet",
    "query_log_updated": "Forespørgselsloggen er blevet opdateret",
    "query_log_clear": "Ryd forespørgselslogfiler",
-    "query_log_retention": "Opbevar forespørgselslogger i",
+    "query_log_retention": "Rotation af forespørgselslog",
    "query_log_enable": "Aktivér log",
    "query_log_configuration": "Opsætning af logger",
    "query_log_disabled": "Forespørgselsloggen er deaktiveret og kan opsættes i <0>indstillingerne</0>",
    "query_log_strict_search": "Brug dobbelt anførselstegn til stringent søgning",
-    "query_log_retention_confirm": "Sikker på, at du vil ændre forespørgselsloggens opbevaringperiode? Mindskes intervalværdien, mistes data",
+    "query_log_retention_confirm": "Sikker på, at forespørgselsloggens rotationstid skal ændres? Mindskes intervalværdien, mistes nogle data",
    "anonymize_client_ip": "Anonymisér klient-IP",
    "anonymize_client_ip_desc": "Gem ikke fuld klient IP-adresse i logfiler eller statistikker",
    "dns_config": "DNS-serveropsætning",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Sikker på, at du vil slette klient \"{{key}}\"?",
    "list_confirm_delete": "Sikker på, at du vil slette denne liste?",
    "auto_clients_title": "Klienter (runtime)",
-    "auto_clients_desc": "Enheder, som ikke er på listen over Permanente klienter, kan stadig bruge AdGuard Home",
+    "auto_clients_desc": "Oplysninger om IP-adresser på enheder, som (måske) bruger AdGuard Home. Disse oplysninger indsamles fra flere kilder, herunder hosts-filer, reverse DNS mv.",
    "access_title": "Adgangsindstillinger",
    "access_desc": "Her kan adgangsregler for AdGuard Home DNS-serveren opsættes",
    "access_allowed_title": "Tilladte klienter",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "For at kunne bruge <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, skal du <0>opsætte Krypteringen</0> i AdGuard Homes indstillinger.",
    "rewrite_added": "DNS-omskrivning for \"{{key}}\" blev tilføjet",
    "rewrite_deleted": "DNS-omskrivning for \"{{key}}\" blev slettet",
+    "rewrite_updated": "DNS-omskrivning hermed opdateret",
    "rewrite_add": "Tilføj DNS-omskrivning",
+    "rewrite_edit": "Redigér DNS-omskrivning",
    "rewrite_not_found": "Ingen DNS-omskrivninger fundet",
    "rewrite_confirm_delete": "Sikker på, at du vil slette DNS-omskrivning for \"{{key}}\"?",
    "rewrite_desc": "Gør det nemt at opsætte det tilpassede DNS-svar for et specifikt domænenavn.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Aktivér statistikker",
    "ignore_domains": "Ignorerede domæner (adskilt af ny linje)",
    "ignore_domains_title": "Ignorerede domæner",
-    "ignore_domains_desc_stats": "Forespørgsler til disse domæner opføres ikke i statistikken",
-    "ignore_domains_desc_query": "Forespørgsler til disse domæner opføres ikke i forespørgselsloggen",
+    "ignore_domains_desc_stats": "Forespørgsler, der matcher disse regler, skrives ikke til statistikken",
+    "ignore_domains_desc_query": "Forespørgsler, der matcher disse regler, skrives ikke til forespørgselsloggen",
    "interval_hours": "{{count}} time",
    "interval_hours_plural": "{{count}} timer",
    "filters_configuration": "Filteropsætninger",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: Særlig værdi, hold <0>A</0> poster fra upstream",
    "rewrite_AAAA": "<0>AAAA</0>: Særlig værdi, hold <0>AAAA</0> poster fra upstream",
    "disable_ipv6": "Deaktivér IPv6-adresseopløsning",
-    "disable_ipv6_desc": "Drop alle DNS-forespørgsler for IPv6-adresser (type AAAA).",
+    "disable_ipv6_desc": "Drop alle DNS-forespørgsler for IPv6-adresser (type AAAA), og fjern IPv6-tips fra HTTPS-svar.",
    "fastest_addr": "Hurtigste IP-adresse",
    "fastest_addr_desc": "Forespørger alle DNS-servere og returner den hurtigste IP-adresse blandt alle svar. Dette vil gøre DNS-forespørgslerne langsommere grundet afventning af svar fra alle DNS-servere, men forbedrer samlet set forbindelsen.",
    "autofix_warning_text": "Klikker du på \"Reparér\", opsætter AdGuard Home dit system til brug med AdGuard Home DNS-server.",
@@ -645,7 +673,7 @@
    "parental_control": "Forældrekontrol",
    "safe_browsing": "Sikker Browsing",
    "served_from_cache": "{{value}} <i>(leveret fra cache)</i>",
-    "form_error_password_length": "Adgangskoden skal udgøre mindst {{value}} tegn.",
+    "form_error_password_length": "Adgangskode skal udgøre fra {{min}} til {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Deaktivere beskyttelse i {{count}} time",
    "disable_notify_for_hours_plural": "Deaktivere beskyttelse i {{count}} timer",
    "disable_notify_until_tomorrow": "Deaktiver beskyttelse indtil i morgen",
-    "enable_protection_timer": "Beskyttelse deaktiveres om {{time}}"
+    "enable_protection_timer": "Beskyttelse deaktiveres om {{time}}",
+    "custom_retention_input": "Angiv opbevaringstid i timer",
+    "custom_rotation_input": "Angiv rotationstid i timer",
+    "protection_section_label": "Beskyttelse",
+    "log_and_stats_section_label": "Forespørgselslog og statistik",
+    "ignore_query_log": "Ignorér denne klient i forespørgselslog",
+    "ignore_statistics": "Ignorér denne klient i statistik",
+    "schedule_services": "Pausering af tjenesteblokering",
+    "schedule_services_desc": "Opsæt pauseringstidsplan for det tjenesteblokerende filter",
+    "schedule_services_desc_client": "Opsæt pauseringstidsplan for det tjenesteblokerende filter for denne klient",
+    "schedule_desc": "Sæt inaktivitetsperioder for blokerede tjenester",
+    "schedule_invalid_select": "Starttidspunkt skal være før sluttidspunkt",
+    "schedule_select_days": "Vælg dage",
+    "schedule_timezone": "Vælg tidszone",
+    "schedule_current_timezone": "Aktuel tidszone: {{value}}",
+    "schedule_time_all_day": "Hele dagen",
+    "schedule_modal_description": "Denne tidsplan vil erstatte alle eksisterende tidsplaner for den samme ugedag. Hver ugedag kan kun have én inaktivitetsperiode.",
+    "schedule_modal_time_off": "Ingen tjenesteblokering:",
+    "schedule_new": "Ny tidsplan",
+    "schedule_edit": "Redigér tidsplan",
+    "schedule_save": "Gem tidsplan",
+    "schedule_add": "Tilføj tidsplan",
+    "schedule_remove": "Fjern tidsplan",
+    "schedule_from": "Fra",
+    "schedule_to": "Til",
+    "sunday": "Søndag",
+    "monday": "Mandag",
+    "tuesday": "Tirsdag",
+    "wednesday": "Onsdag",
+    "thursday": "Torsdag",
+    "friday": "Fredag",
+    "saturday": "Lørdag",
+    "sunday_short": "Søn",
+    "monday_short": "Man",
+    "tuesday_short": "Tirs",
+    "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"
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -1,18 +1,22 @@
 {
    "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_desc": "Bootstrap-DNS-Server werden verwendet, um IP-Adressen der DoH/DoT-Resolver aufzulösen, die Sie als Upstreams angeben.",
+    "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 Invers-DNS-Resolver: {{ip}}.",
+    "local_ptr_default_resolver": "Standardmäßig verwendet AdGuard Home die folgenden inversen DNS-Resolver: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home konnte keine geeigneten privaten Invers-DNS-Resolver für dieses System ermitteln.",
-    "local_ptr_placeholder": "Eine Serveradresse pro Zeile eingeben",
+    "local_ptr_placeholder": "Geben Sie eine IP-Adresse pro Zeile ein",
    "resolve_clients_title": "Hostnamenauflösung der Clients aktivieren",
    "resolve_clients_desc": "Inverses Auflösen der IP-Adressen der Clients in ihre Hostnamen durch Senden von PTR-Anfragen an die entsprechenden Resolver (private DNS-Server für lokale Kunden, Upstream-Server für Kunden mit öffentlichen IP-Adressen).",
    "use_private_ptr_resolvers_title": "Private Reverse-DNS-Resolver verwenden",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Gesperrte Schädliche/Phishing-Websites",
    "stats_adult": "Gesperrte jugendgefährdende Websites",
    "stats_query_domain": "Am häufigsten angefragte Domains",
-    "for_last_24_hours": "für die letzten 24 Stunden",
+    "for_last_hours": "in die letzte {{count}} Stunde",
+    "for_last_hours_plural": "in die letzten {{count}} 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.",
@@ -125,15 +132,20 @@
    "top_clients": "Top Clients",
    "no_clients_found": "Keine Clients gefunden",
    "general_statistics": "Allgemeine Statistiken",
+    "top_upstreams": "Top Upstreams",
+    "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_24_hours": "Anzahl der in den letzten 24 Stunden durchgeführten DNS-Anfragen",
+    "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_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",
    "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.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Konfiguriert in {{path}}",
    "test_upstream_btn": "Upstreams testen",
    "upstreams": "Upstreams",
+    "upstream": "Upstream",
    "apply_btn": "Anwenden",
    "disabled_filtering_toast": "Filtern deaktiviert",
    "enabled_filtering_toast": "Filtern aktiviert",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Das Abfrageprotokoll wurde erfolgreich gelöscht",
    "query_log_updated": "Das Abfrageprotokoll wurde erfolgreich aktualisiert",
    "query_log_clear": "Abfrageprotokolle leeren",
-    "query_log_retention": "Abfrageprotokolle aufbewahren",
+    "query_log_retention": "Rotation der Abfrageprotokolle",
    "query_log_enable": "Protokoll aktivieren",
    "query_log_configuration": "Konfiguration der Protokolle",
    "query_log_disabled": "Das Abfrageprotokoll ist deaktiviert und kann in den <0>Einstellungen</0> konfiguriert werden.",
    "query_log_strict_search": "Doppelte Anführungszeichen für die strikte Suche verwenden",
-    "query_log_retention_confirm": "Möchten Sie die Aufbewahrung des Abfrageprotokolls wirklich ändern? Wenn Sie den Zeitabstand verringern, gehen einige Daten verloren.",
+    "query_log_retention_confirm": "Möchten Sie die Abfrageprotokollrotation wirklich ändern? Wenn Sie den Intervallwert verringern, gehen einige Daten verloren",
    "anonymize_client_ip": "Client-IP anonymisieren",
    "anonymize_client_ip_desc": "Vollständige IP-Adresse des Clients nicht in Protokollen und Statistiken speichern",
    "dns_config": "DNS-Serverkonfiguration",
@@ -276,6 +289,9 @@
    "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",
@@ -289,11 +305,21 @@
    "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",
@@ -315,16 +341,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, 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, so 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",
@@ -337,7 +363,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 belauscht die folgenden Adressen",
+    "install_devices_address": "Der AdGuard-Home-DNS-Server lauscht unter 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.",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Möchten Sie den Client „{{key}}“ wirklich löschen?",
    "list_confirm_delete": "Möchten Sie diese Liste wirklich löschen?",
    "auto_clients_title": "Laufzeit-Clients",
-    "auto_clients_desc": "Geräte, die nicht auf der Liste der persistenten Clients stehen und trotzdem AdGuard Home verwenden dürfen",
+    "auto_clients_desc": "Informationen über IP-Adressen der Geräten, die AdGuard Home nutzen oder nutzen könnten. Diese Informationen werden aus verschiedenen Quellen gesammelt, darunter Hosts-Dateien, Reverse-DNS usw.",
    "access_title": "Zugriffsrechte",
    "access_desc": "Hier können Sie die Zugriffsregeln für den DNS-Server von AdGuard Home konfigurieren",
    "access_allowed_title": "Zugelassene Clients",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Um <1>DNS-over-HTTTPS</1> oder <1>DNS-over-TLS</1> verwenden zu können, müssen Sie in den AdGuard Home Einstellungen die <0>Verschlüsselung konfigurieren</0>.",
    "rewrite_added": "DNS-Umschreibung für „{{key}}“ erfolgreich hinzugefügt",
    "rewrite_deleted": "DNS-Umschreibung für „{{key}}“ erfolgreich entfernt",
+    "rewrite_updated": "DNS-Rewrite erfolgreich aktualisiert",
    "rewrite_add": "DNS-Umschreibung hinzufügen",
+    "rewrite_edit": "DNS-Rewrite bearbeiten",
    "rewrite_not_found": "Keine DNS-Umschreibungen gefunden",
    "rewrite_confirm_delete": "Möchten Sie die DNS-Umschreibung für „{{key}}“ wirklich entfernen?",
    "rewrite_desc": "Ermöglicht die einfache Konfiguration der benutzerdefinierten DNS-Antwort für einen bestimmten Domainnamen.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Statistiken aktivieren",
    "ignore_domains": "Ignorierte Domains (durch Zeilenumbruch getrennt)",
    "ignore_domains_title": "Ignorierte Domains",
-    "ignore_domains_desc_stats": "Abfragen für diese Domains werden nicht in die Statistik aufgenommen",
-    "ignore_domains_desc_query": "Abfragen für diese Domains werden nicht in das Abfrageprotokoll aufgenommen",
+    "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",
    "interval_hours": "{{count}} Stunde",
    "interval_hours_plural": "{{count}} Stunden",
    "filters_configuration": "Filterkonfiguration",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: spezieller Wert, <0>A</0>-Datensätze des \n vorgeschalteten Servers beibehalten",
    "rewrite_AAAA": "<0>AAAA</0>: spezieller Wert, <0>AAAA</0>-Datensätze des vorgeschalteten Servers beibehalten",
    "disable_ipv6": "IPv6 deaktivieren",
-    "disable_ipv6_desc": "Löschen Sie alle DNS-Abfragen für IPv6-Adressen (Typ AAAA).",
+    "disable_ipv6_desc": "Alle DNS-Anfragen für IPv6-Adressen (Typ AAAA) verwerfen und IPv6-Hinweise aus HTTPS-Antworten entfernen.",
    "fastest_addr": "Schnellste IP-Adresse",
    "fastest_addr_desc": "Fragen Sie alle DNS-Server ab und geben Sie die schnellste IP-Adresse unter allen Antworten zurück. Dies verlangsamt DNS-Abfragen, da AdGuard Home auf Antworten von allen DNS-Servern warten muss, verbessert jedoch die Gesamtkonnektivität.",
    "autofix_warning_text": "Wenn Sie auf „Beheben“ klicken, konfiguriert AdGuardHome Ihr System für die Verwendung des AdGuardHome-DNS-Servers.",
@@ -631,7 +659,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",
@@ -645,7 +673,7 @@
    "parental_control": "Kindersicherung",
    "safe_browsing": "Internetsicherheit",
    "served_from_cache": "{{value}} <i>(aus dem Cache abgerufen)</i>",
-    "form_error_password_length": "Das Passwort muss mindestens {{value}} Zeichen enthalten",
+    "form_error_password_length": "Das Passwort muss zwischen {{min}} und {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Schutz für {{count}} Stunde deaktivieren",
    "disable_notify_for_hours_plural": "Schutz für {{count}} Stunden deaktivieren",
    "disable_notify_until_tomorrow": "Schutz bis morgen deaktivieren",
-    "enable_protection_timer": "Der Schutz wird in {{time}} wieder aktiviert"
+    "enable_protection_timer": "Der Schutz wird in {{time}} wieder aktiviert",
+    "custom_retention_input": "Rückhaltezeit in Stunden eingeben",
+    "custom_rotation_input": "Rotation in Stunden eingeben",
+    "protection_section_label": "Schutz",
+    "log_and_stats_section_label": "Abfrageprotokoll und Statistik",
+    "ignore_query_log": "Diesen Client im Abfrageprotokoll ignorieren",
+    "ignore_statistics": "Diesen Client in der Statistik ignorieren",
+    "schedule_services": "Dienstblockierung anhalten",
+    "schedule_services_desc": "Konfigurieren Sie den Pausenplan des Dienstblockierungsfilters",
+    "schedule_services_desc_client": "Konfigurieren Sie den Pausenplan des Dienstblockierungsfilters für diesen Client",
+    "schedule_desc": "Inaktivitätszeiträume für blockierte Dienste festlegen",
+    "schedule_invalid_select": "Die Startzeit muss vor der Endzeit liegen",
+    "schedule_select_days": "Tage auswählen",
+    "schedule_timezone": "Wählen Sie eine Zeitzone",
+    "schedule_current_timezone": "Aktuelle Zeitzone: {{value}}",
+    "schedule_time_all_day": "Ganzen Tag",
+    "schedule_modal_description": "Dieser Zeitplan wird alle bestehenden Zeitpläne für denselben Wochentag ersetzen. Jeder Wochentag kann nur einen Inaktivitätszeitraum haben.",
+    "schedule_modal_time_off": "Keine Dienstblockierung:",
+    "schedule_new": "Neuer Zeitplan",
+    "schedule_edit": "Zeitplan bearbeiten",
+    "schedule_save": "Zeitplan speichern",
+    "schedule_add": "Zeitplan hinzufügen",
+    "schedule_remove": "Zeitplan entfernen",
+    "schedule_from": "Von",
+    "schedule_to": "Bis",
+    "sunday": "Sonntag",
+    "monday": "Montag",
+    "tuesday": "Dienstag",
+    "wednesday": "Mittwoch",
+    "thursday": "Donnerstag",
+    "friday": "Freitag",
+    "saturday": "Samstag",
+    "sunday_short": "So",
+    "monday_short": "Mo",
+    "tuesday_short": "Di",
+    "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"
 }
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Load-balancing",
    "load_balancing_desc": "Query one upstream server at a time. AdGuard Home uses its weighted random algorithm to pick the server so that the fastest server is used more often.",
    "bootstrap_dns": "Bootstrap DNS servers",
-    "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.",
+    "bootstrap_dns_desc": "IP addresses of DNS servers used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams. Comments are not permitted.",
+    "fallback_dns_title": "Fallback DNS servers",
+    "fallback_dns_desc": "List of fallback DNS servers used when upstream DNS servers are not responding. The syntax is the same as in the main upstreams field above.",
+    "fallback_dns_placeholder": "Enter one fallback DNS server per line",
    "local_ptr_title": "Private reverse DNS servers",
    "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve PTR requests for addresses in private IP ranges, for example \"192.168.12.34\", using reverse DNS. If not set, AdGuard Home uses the addresses of the default DNS resolvers of your OS except for the addresses of AdGuard Home itself.",
    "local_ptr_default_resolver": "By default, AdGuard Home uses the following reverse DNS resolvers: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home could not determine suitable private reverse DNS resolvers for this system.",
-    "local_ptr_placeholder": "Enter one server address per line",
+    "local_ptr_placeholder": "Enter one IP address per line",
    "resolve_clients_title": "Enable reverse resolving of clients' IP addresses",
    "resolve_clients_desc": "Reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream servers for clients with public IP addresses).",
    "use_private_ptr_resolvers_title": "Use private reverse DNS resolvers",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Blocked malware/phishing",
    "stats_adult": "Blocked adult websites",
    "stats_query_domain": "Top queried domains",
-    "for_last_24_hours": "for the last 24 hours",
+    "for_last_hours": "for the last {{count}} hour",
+    "for_last_hours_plural": "for the last {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Top clients",
    "no_clients_found": "No clients found",
    "general_statistics": "General statistics",
+    "top_upstreams": "Top upstreams",
+    "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_24_hours": "The number of DNS queries processed for the last 24 hours",
+    "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_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",
    "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.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Configured in {{path}}",
    "test_upstream_btn": "Test upstreams",
    "upstreams": "Upstreams",
+    "upstream": "Upstream",
    "apply_btn": "Apply",
    "disabled_filtering_toast": "Disabled filtering",
    "enabled_filtering_toast": "Enabled filtering",
@@ -257,12 +270,12 @@
    "query_log_cleared": "The query log has been successfully cleared",
    "query_log_updated": "The query log has been successfully updated",
    "query_log_clear": "Clear query logs",
-    "query_log_retention": "Query logs retention",
+    "query_log_retention": "Query logs rotation",
    "query_log_enable": "Enable log",
    "query_log_configuration": "Logs configuration",
    "query_log_disabled": "The query log is disabled and can be configured in the <0>settings</0>",
    "query_log_strict_search": "Use double quotes for strict search",
-    "query_log_retention_confirm": "Are you sure you want to change query log retention? If you decrease the interval value, some data will be lost",
+    "query_log_retention_confirm": "Are you sure you want to change query log rotation? If you decrease the interval value, some data will be lost",
    "anonymize_client_ip": "Anonymize client IP",
    "anonymize_client_ip_desc": "Don't save the client's full IP address to logs or statistics",
    "dns_config": "DNS server configuration",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Are you sure you want to delete client \"{{key}}\"?",
    "list_confirm_delete": "Are you sure you want to delete this list?",
    "auto_clients_title": "Runtime clients",
-    "auto_clients_desc": "Devices not on the list of Persistent clients that may still use AdGuard Home",
+    "auto_clients_desc": "Information about IP addresses of devices that are using or may use AdGuard Home. This information is gathered from several sources, including hosts files, reverse DNS, etc.",
    "access_title": "Access settings",
    "access_desc": "Here you can configure access rules for the AdGuard Home DNS server",
    "access_allowed_title": "Allowed clients",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
    "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
    "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
+    "rewrite_updated": "DNS rewrite successfully updated",
    "rewrite_add": "Add DNS rewrite",
+    "rewrite_edit": "Edit DNS rewrite",
    "rewrite_not_found": "No DNS rewrites found",
    "rewrite_confirm_delete": "Are you sure you want to delete DNS rewrite for \"{{key}}\"?",
    "rewrite_desc": "Allows to easily configure custom DNS response for a specific domain name.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Enable statistics",
    "ignore_domains": "Ignored domains (separated by newline)",
    "ignore_domains_title": "Ignored domains",
-    "ignore_domains_desc_stats": "Queries for these domains are not written to the statistics",
-    "ignore_domains_desc_query": "Queries for these domains are not written to the query log",
+    "ignore_domains_desc_stats": "Queries matching these rules are not written to the statistics",
+    "ignore_domains_desc_query": "Queries matching these rules are not written to the query log",
    "interval_hours": "{{count}} hour",
    "interval_hours_plural": "{{count}} hours",
    "filters_configuration": "Filters configuration",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: special value, keep <0>A</0> records from the upstream",
    "rewrite_AAAA": "<0>AAAA</0>: special value, keep <0>AAAA</0> records from the upstream",
    "disable_ipv6": "Disable resolving of IPv6 addresses",
-    "disable_ipv6_desc": "Drop all DNS queries for IPv6 addresses (type AAAA).",
+    "disable_ipv6_desc": "Drop all DNS queries for IPv6 addresses (type AAAA) and remove IPv6 hints from HTTPS responses.",
    "fastest_addr": "Fastest IP address",
    "fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This slows down DNS queries as AdGuard Home has to wait for responses from all DNS servers, but improves the overall connectivity.",
    "autofix_warning_text": "If you click \"Fix\", AdGuard Home will configure your system to use AdGuard Home DNS server.",
@@ -645,7 +673,7 @@
    "parental_control": "Parental Control",
    "safe_browsing": "Safe Browsing",
    "served_from_cache": "{{value}} <i>(served from cache)</i>",
-    "form_error_password_length": "Password must be at least {{value}} characters long",
+    "form_error_password_length": "Password must be {{min}} to {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Disable protection for {{count}} hour",
    "disable_notify_for_hours_plural": "Disable protection for {{count}} hours",
    "disable_notify_until_tomorrow": "Disable protection until tomorrow",
-    "enable_protection_timer": "Protection will be enabled in {{time}}"
+    "enable_protection_timer": "Protection will be enabled in {{time}}",
+    "custom_retention_input": "Enter retention in hours",
+    "custom_rotation_input": "Enter rotation in hours",
+    "protection_section_label": "Protection",
+    "log_and_stats_section_label": "Query log and statistics",
+    "ignore_query_log": "Ignore this client in query log",
+    "ignore_statistics": "Ignore this client in statistics",
+    "schedule_services": "Pause service blocking",
+    "schedule_services_desc": "Configure the pause schedule of the service-blocking filter",
+    "schedule_services_desc_client": "Configure the pause schedule of the service-blocking filter for this client",
+    "schedule_desc": "Set inactivity periods for blocked services",
+    "schedule_invalid_select": "Start time must be before end time",
+    "schedule_select_days": "Select days",
+    "schedule_timezone": "Select a time zone",
+    "schedule_current_timezone": "Current time zone: {{value}}",
+    "schedule_time_all_day": "All day",
+    "schedule_modal_description": "This schedule will replace any existing schedules for the same day of the week. Each day of the week can have only one inactivity period.",
+    "schedule_modal_time_off": "No service blocking:",
+    "schedule_new": "New schedule",
+    "schedule_edit": "Edit schedule",
+    "schedule_save": "Save schedule",
+    "schedule_add": "Add schedule",
+    "schedule_remove": "Remove schedule",
+    "schedule_from": "From",
+    "schedule_to": "To",
+    "sunday": "Sunday",
+    "monday": "Monday",
+    "tuesday": "Tuesday",
+    "wednesday": "Wednesday",
+    "thursday": "Thursday",
+    "friday": "Friday",
+    "saturday": "Saturday",
+    "sunday_short": "Sun",
+    "monday_short": "Mon",
+    "tuesday_short": "Tue",
+    "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"
 }
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Balanceo de carga",
    "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": "Los servidores DNS de arranque se utilizan para resolver las direcciones IP de los resolutores DoH/DoT que especifiques como DNS de subida.",
+    "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",
    "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}}.",
    "local_ptr_no_default_resolver": "AdGuard Home no pudo determinar los resolutores DNS inversos y privados adecuados para este sistema.",
-    "local_ptr_placeholder": "Ingresa una dirección de servidor por línea",
+    "local_ptr_placeholder": "Ingresa una dirección IP por línea",
    "resolve_clients_title": "Habilitar la resolución inversa de las direcciones IP de clientes",
    "resolve_clients_desc": "Resolve de manera inversa las direcciones IP de los clientes a sus nombres de hosts enviando consultas PTR a los resolutores correspondientes (servidores DNS privados para clientes locales, servidores DNS de subida para clientes con direcciones IP públicas).",
    "use_private_ptr_resolvers_title": "Usar resolutores DNS inversos y privados",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Malware/phishing bloqueado",
    "stats_adult": "Sitios web para adultos bloqueado",
    "stats_query_domain": "Dominios más consultados",
-    "for_last_24_hours": "en las últimas 24 horas",
+    "for_last_hours": "de la última {{count}} hora",
+    "for_last_hours_plural": "de las últimas {{count}} 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>.",
@@ -125,15 +132,20 @@
    "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",
    "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_24_hours": "Número de consultas DNS procesadas durante las últimas 24 horas",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Configurado en {{path}}",
    "test_upstream_btn": "Probar DNS de subida",
    "upstreams": "DNS de subida",
+    "upstream": "DNS de subida",
    "apply_btn": "Aplicar",
    "disabled_filtering_toast": "Filtrado deshabilitado",
    "enabled_filtering_toast": "Filtrado habilitado",
@@ -257,12 +270,12 @@
    "query_log_cleared": "El registro de consultas se ha borrado correctamente",
    "query_log_updated": "El registro de consultas se ha actualizado correctamente",
    "query_log_clear": "Borrar registros de consultas",
-    "query_log_retention": "Retención de registros de consultas",
+    "query_log_retention": "Rotanción de registros de consultas",
    "query_log_enable": "Habilitar registro",
    "query_log_configuration": "Configuración de registros",
    "query_log_disabled": "El registro de consultas está deshabilitado y se puede configurar en la <0>configuración</0>",
    "query_log_strict_search": "Usar comillas dobles para una búsqueda estricta",
-    "query_log_retention_confirm": "¿Estás seguro de que deseas cambiar la retención del registro de consultas? Si disminuye el valor del intervalo, se perderán algunos datos",
+    "query_log_retention_confirm": "¿Está seguro de que deseas cambiar la rotación del registro de consultas? Si reduces el valor del intervalo, se perderán algunos datos",
    "anonymize_client_ip": "Anonimizar IP del cliente",
    "anonymize_client_ip_desc": "No guarda la dirección IP completa del cliente en registros o estadísticas",
    "dns_config": "Configuración del servidor DNS",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "¿Estás seguro de que deseas eliminar el cliente \"{{key}}\"?",
    "list_confirm_delete": "¿Estás seguro de que deseas eliminar esta lista?",
    "auto_clients_title": "Clientes activos",
-    "auto_clients_desc": "Dispositivos que no están en la lista de clientes persistentes que aún pueden utilizar AdGuard Home",
+    "auto_clients_desc": "Información sobre las direcciones IP de los dispositivos que usan o pueden usar AdGuard Home. Esta información se recopila de varias fuentes, incluidos ficheros de host, DNS inverso, etc.",
    "access_title": "Configuración de acceso",
    "access_desc": "Aquí puedes configurar las reglas de acceso para el servidor DNS de AdGuard Home",
    "access_allowed_title": "Clientes permitidos",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Para utilizar <1>DNS mediante HTTPS</1> o <1>DNS mediante TLS</1>, debes <0>configurar el cifrado</0> en la configuración de AdGuard Home.",
    "rewrite_added": "Reescritura DNS para \"{{key}}\" añadido correctamente",
    "rewrite_deleted": "Reescritura DNS para \"{{key}}\" eliminado correctamente",
+    "rewrite_updated": "Reconfiguración de DNS actualizada correctamente",
    "rewrite_add": "Añadir reescritura DNS",
+    "rewrite_edit": "Editar reconfiguración de DNS",
    "rewrite_not_found": "No se han encontrado reescrituras DNS",
    "rewrite_confirm_delete": "¿Estás seguro de que deseas eliminar la reescritura DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar fácilmente la respuesta DNS personalizada para un nombre de dominio específico.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Habilitar estadísticas",
    "ignore_domains": "Dominios ignorados (separados por una nueva línea)",
    "ignore_domains_title": "Dominios ignorados",
-    "ignore_domains_desc_stats": "Las consultas para estos dominios no aparecen en las estadísticas",
-    "ignore_domains_desc_query": "Las consultas para estos dominios no aparecen en el registro de consultas",
+    "ignore_domains_desc_stats": "Las consultas que coinciden con estas reglas no aparecen en las estadísticas",
+    "ignore_domains_desc_query": "Las consultas que coinciden con estas reglas no aparecen en el registro de consultas",
    "interval_hours": "{{count}} hora",
    "interval_hours_plural": "{{count}} horas",
    "filters_configuration": "Configuración de filtros",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: valor especial, mantiene registros <0>A</0> del DNS de subida",
    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantiene registros <0>AAAA</0> del DNS de subida",
    "disable_ipv6": "Deshabilitar resolución de direcciones IPv6",
-    "disable_ipv6_desc": "Descarta todas las consultas DNS para direcciones IPv6 (tipo AAAA).",
+    "disable_ipv6_desc": "Descarta todas las consultas de DNS para direcciones IPv6 (tipo AAAA) y elimina las sugerencias de IPv6 de las respuestas HTTPS.",
    "fastest_addr": "Dirección IP más rápida",
    "fastest_addr_desc": "Consulta todos los servidores DNS y devuelve la dirección IP más rápida de todas las respuestas. Esto ralentiza las consultas DNS ya que AdGuard Home tiene que esperar las respuestas de todos los servidores DNS, pero mejora la conectividad general.",
    "autofix_warning_text": "Si haces clic en \"Corregir\", AdGuard Home configurará tu sistema para utilizar el servidor DNS de AdGuard Home.",
@@ -645,7 +673,7 @@
    "parental_control": "Control parental",
    "safe_browsing": "Navegación segura",
    "served_from_cache": "{{value}} <i>(servido desde la caché)</i>",
-    "form_error_password_length": "La contraseña debe tener al menos {{value}} caracteres",
+    "form_error_password_length": "La contraseña debe tener entre {{min}} y {{max}} 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",
@@ -661,12 +689,53 @@
    "disable_for_hours": "Por {{count}} hora",
    "disable_for_hours_plural": "Por {{count}} horas",
    "disable_until_tomorrow": "Hasta mañana",
-    "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}}"
+    "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}}",
+    "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_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",
+    "schedule_invalid_select": "El tiempo de inicio debe de ir antes del tiempo de finalización",
+    "schedule_select_days": "Selecciona los dias",
+    "schedule_timezone": "Selecciona una zona horaria",
+    "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_new": "Nuevo horario",
+    "schedule_edit": "Editar horario",
+    "schedule_save": "Guardar horario",
+    "schedule_add": "Añadir horario",
+    "schedule_remove": "Eliminar horario",
+    "schedule_from": "De",
+    "schedule_to": "A",
+    "sunday": "Domingo",
+    "monday": "Lunes",
+    "tuesday": "Martes",
+    "wednesday": "Miércoles",
+    "thursday": "Jueves",
+    "friday": "Viernes",
+    "saturday": "Sábado",
+    "sunday_short": "Dom.",
+    "monday_short": "Lun.",
+    "tuesday_short": "Mar.",
+    "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"
 }
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -5,8 +5,12 @@
    "upstream_parallel": "استفاده از جستار موازی برای سرعت دادن به تفکیک با جستار همزمان همه جریان های ارسالی",
    "parallel_requests": "درخواست های موازی",
    "load_balancing": "متعادل کننده بار",
+    "load_balancing_desc": "یک سرور بالادستی را در یک زمان پرس و جو کنید. AdGuard Home از الگوریتم تصادفی وزنی خود برای انتخاب سرور استفاده می کند تا سریع ترین سرور بیشتر مورد استفاده قرار گیرد.",
    "bootstrap_dns": "خودراه انداز سرورهای DNS",
-    "bootstrap_dns_desc": "خودراه انداز سرورهای DNS برای تفکیک آدرس آی پی  تفکیک کننده های DoH/DoT که شما بعنوان جریان ارسالی تعیین کردید استفاده میشود.",
+    "bootstrap_dns_desc": "آدرس‌های IP سرورهای DNS که برای حل کردن آدرس‌های IP حل‌کننده‌های DoH/DoT که به‌عنوان upstream مشخص می‌کنید، استفاده می‌شوند. اظهار نظر مجاز نیست.",
+    "fallback_dns_title": "سرورهای DNS بازگشتی",
+    "fallback_dns_desc": "لیست سرورهای DNS بازگشتی که در زمانی که سرورهای DNS بالادستی پاسخ نمی‌دهند استفاده می‌شوند. نحو مانند فیلد بالادستی اصلی بالا است.",
+    "fallback_dns_placeholder": "یک سرور DNS بازگشتی در هر خط وارد کنید",
    "local_ptr_title": "سرورهای خصوصی DNS",
    "local_ptr_desc": "سرور یا سرور های DNS ای که AdGuard Home برای درخواست های منابع محلی ارائه شده مورد استفاده قرار خواهد داد. برای مثال، این سرور برای تعیین نام های سرویس دهنده برای سرویس گیرنده با آدرس های آی پی خصوصی مورد استفاده قرار خواهد گرفت. اگر تعیین نشود،AdGuard Home به طور خودکار از تعیین کننده ی DNS پیش فرض شما استفاده خواهد کرد.",
    "local_ptr_default_resolver": "به طور پیش فرض، AdGuard Home از تعیین کننده های DNS معکوس زیر استفاده می کند: {{ip}}.",
@@ -20,6 +24,8 @@
    "save_config": "ذخیره پیکربندی",
    "enabled_dhcp": "سرور DHCP  فعال شده است",
    "disabled_dhcp": "سرور DHCP  غیرفعال شده است",
+    "unavailable_dhcp": "DHCP در دسترس نیست",
+    "unavailable_dhcp_desc": "AdGuard Home نمی تواند سرور DHCP را روی سیستم عامل شما اجرا کند",
    "dhcp_title": "سرور DHCP",
    "dhcp_description": "اگر روتر شما تنظیمات DHCP ارائه نمی کند،میتوانید از سرور DHCP تو-کار خود AdGuard استفاده کنید.",
    "dhcp_enable": "فعالسازی سرور DHCP",
@@ -30,6 +36,8 @@
    "dhcp_static_leases": "اجاره DHCP ایستا",
    "dhcp_leases_not_found": "اجاره DHCP یافت نشد",
    "dhcp_config_saved": "پیکربندی سرور DHCP ذخیره شده است",
+    "dhcp_ipv4_settings": "تنظیمات DHCP IPv4",
+    "dhcp_ipv6_settings": "تنظیمات DHCP IPv4",
    "form_error_required": "فیلد مورد نیاز",
    "form_error_ip4_format": "فرمت نامعتبر IPv4",
    "form_error_ip4_gateway_format": "قالب IPv4 درگاه نامعتبر است",
@@ -37,8 +45,10 @@
    "form_error_ip_format": "فرمت IPv4 نامعتبر است",
    "form_error_mac_format": "فرمت مَک نامعتبر است",
    "form_error_client_id_format": "فرمت شناسه کلاینت نامعتبر است",
+    "form_error_server_name": "نام سرور نامعتبر است",
    "form_error_subnet": "زیرشبکه\"{{cidr}}\"آدرس آی پی {{ip}} را در بر ندارد",
    "form_error_positive": "باید بزرگتر از 0 باشد",
+    "form_error_gateway_ip": "Lease نمی تواند آدرس IP دروازه را داشته باشد",
    "out_of_range_error": "باید خارج از دامنه باشد\"{{start}}\"-\"{{end}}\"",
    "lower_range_start_error": "باید کمتر از شروع دامنه باشد",
    "greater_range_start_error": "باید بیشتر از شروع دامنه باشد",
@@ -118,6 +128,8 @@
    "top_clients": "بالاترین کلاینت ها",
    "no_clients_found": "کلاینتی یافت نشد",
    "general_statistics": "آمار عمومی",
+    "top_upstreams": "سرورهای بالادست بالا",
+    "no_upstreams_data_found": "هیچ اطلاعاتی در مورد سرورهای بالادست یافت نشد",
    "number_of_dns_query_days": "تعداد جستار DNS پردازش شده در {{count}} روز آخر",
    "number_of_dns_query_days_plural": "تعداد جستار DNS پردازش شده در {{count}} روز گذشته",
    "number_of_dns_query_24_hours": "تعداد جستار DNS پردازش شده در 24 ساعت گذشته",
@@ -149,6 +161,7 @@
    "upstream_dns": "سرورهای DNS جریان ارسالی",
    "test_upstream_btn": "تست جریان ارسالی",
    "upstreams": "جریان ارسالی",
+    "upstream": "سرور مادر",
    "apply_btn": "اِعمال",
    "disabled_filtering_toast": "فیلترینگ غیرفعال شده است",
    "enabled_filtering_toast": "فیلترینگ فعال شده است",
@@ -181,6 +194,8 @@
    "new_allowlist": "لیست مجاز جدید",
    "edit_blocklist": "ویرایش لیست سیاه",
    "edit_allowlist": "ویرایش لیست مجاز",
+    "choose_blocklist": "لیست های مسدود را انتخاب کنید",
+    "choose_allowlist": "لیست های مسدود را انتخاب کنید",
    "enter_valid_blocklist": "آدرس معتبر برای لیست سیاه وارد کنید.",
    "enter_valid_allowlist": "آدرس معتبر برای لیست مجاز وارد کنید.",
    "form_error_url_format": "فرمت آدرس نامعتبر است",
@@ -246,6 +261,8 @@
    "anonymize_client_ip": "گمنام کردن IP کلاینت",
    "anonymize_client_ip_desc": "آدرس IP کلاینت در وقایع و آمارها را ذخیره نکن",
    "dns_config": "پیکربندی DNS سرور",
+    "dns_cache_config": "تنظیمات کش DNS",
+    "dns_cache_config_desc": "در اینجا می توانید کش DNS را تنظیم کنید",
    "blocking_mode": "حالت مسدودسازی",
    "default": "پيش فرض",
    "nxdomain": "NXDOMAIN",
@@ -253,6 +270,9 @@
    "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",
@@ -268,6 +288,8 @@
    "blocking_mode_nxdomain": "NXDOMAIN: پاسخ با کُد NXDOMAIN",
    "blocking_mode_null_ip": "Null IP: پاسخ با آدرس آی پی صفر(0.0.0.0 برای A; :: برای AAAA)",
    "blocking_mode_custom_ip": "آی پی دستی: پاسخ با آدرس آی پی دستی تنظیم شده",
+    "theme_light": "پوسته روشن",
+    "theme_dark": "پوسته تیره",
    "upstream_dns_client_desc": "اگر این فیلد را خالی نگه دارید، AdGuard Home از سرور پیکربندی شده در <0> تنظیماتDNS </0> استفاده می کند.",
    "tracker_source": "منبع ردیاب",
    "source_label": "منبع",
@@ -438,7 +460,9 @@
    "setup_dns_notice": "به منظور استفاده از <1>DNS-over-HTTPS</1> یا <1>DNS-over-TLS</1>، شما نیاز به <0>پیکربندی رمزگذاری</0> در تنظیمات AdGuard Home دارید.",
    "rewrite_added": "بازنویسی DNS برای \"{{key}}\" با موفقیت اضافه شد",
    "rewrite_deleted": "بازنویسی DNS برای \"{{key}}\" با موفقیت حذف شد",
+    "rewrite_updated": "بازنویسی DNS با موفقیت به روز شد",
    "rewrite_add": "افزودن بازنویسی DNS",
+    "rewrite_edit": "بازنویسی DNS را ویرایش کنید",
    "rewrite_not_found": "بازنویسی DNS یافت نشد",
    "rewrite_confirm_delete": "آیا واقعا میخواهید بازنویسی DNS برای \"{{key}}\" را حذف کنید؟",
    "rewrite_desc": "به آسانی اجازه پیکربندی پاسخ DNS دستی برای یک نام دامنه خاص را می دهد.",
@@ -510,7 +534,7 @@
    "example_rewrite_domain": "فقط بازنویسی پاسخ برای این دامنه.",
    "example_rewrite_wildcard": "بازنویسی پاسخ ها برای همه زیردامنه های <0>example.org</0>.",
    "disable_ipv6": "غیرفعالسازی IPv6",
-    "disable_ipv6_desc": "اگر این ویژگی فعال شده، همه جستارهای DNS برای آدرس های IPv6 (نوع AAAA) رها میشود.",
+    "disable_ipv6_desc": "تمام درخواست‌های DNS برای آدرس‌های IPv6 را رها کنید (تایپ AAAA) و نکات IPv6 را از پاسخ‌های HTTPS حذف کنید.",
    "fastest_addr": "سریعترین آدرس آی پی",
    "fastest_addr_desc": "جستار همه سرورهای DNS و بازگرداندن سریعترین آدرس IP از میان همه پاسخ ها",
    "autofix_warning_text": "اگر روی \"تعمیر\" کلیک کنید، AdGuardHome سیستم شما را برای استفاده از DNS سرور AdGuardHome پیکربندی می کند.",
@@ -567,5 +591,41 @@
    "use_saved_key": "از کلید ذخیره شده قبلی استفاده کنید",
    "parental_control": "نظارت والدین",
    "safe_browsing": "وب گردی اَمن",
-    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد."
+    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد.",
+    "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": "شنبه"
 }
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -1,22 +1,26 @@
 {
    "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ävirran palvelimia samanaikaisesti.",
+    "upstream_parallel": "Käytä rinnakkaisia pyyntöjä ja nopeuta selvitystä käyttämällä kaikkia ylävirtapalvelimia samanaikaisesti.",
    "parallel_requests": "Rinnakkaiset pyynnöt",
    "load_balancing": "Kuormantasaus",
-    "load_balancing_desc": "Lähetä pyyntö yhdelle ylävirran palvelimelle kerrallaan. AdGuard Home pyrkii valitsemaan nopeimman palvelimen painotetun satunnaisalgoritminsa avulla.",
+    "load_balancing_desc": "Lähetä pyyntö yhdelle ylävirtapalvelimelle kerrallaan. AdGuard Home pyrkii valitsemaan nopeimman palvelimen painotetun satunnaisalgoritminsa avulla.",
    "bootstrap_dns": "Bootstrap DNS-palvelimet",
-    "bootstrap_dns_desc": "Bootstrap DNS-palvelimia käytetään ylävirroiksi määritettyjen DoH/DoT-resolvereiden IP-osoitteiden selvitykseen.",
-    "local_ptr_title": "Yksityiset käänteiset DNS-palvelimet",
-    "local_ptr_desc": "DNS-palvelimet, joita AdGuard Home käyttää paikallisille PTR-pyynnöille. Näitä palvelimia käytetään yksityistä IP-osoitetta käyttävien PTR-pyyntöjen osoitteiden, kuten \"192.168.12.34\", selvitykseen käänteisen DNS:n avulla. Jos ei käytössä, AdGuard Home käyttää käyttöjärjestelmän oletusarvoisia DNS-resolvereita, poislukien AdGuard Homen omat osoitteet.",
-    "local_ptr_default_resolver": "Oletusarvoisesti AdGuard Home käyttää seuraavia käänteisiä DNS-resolvereita: {{ip}}.",
-    "local_ptr_no_default_resolver": "AdGuard Home ei voinut määrittää tälle järjestelmälle sopivaa yksityistä käänteistä DNS-resolveria.",
-    "local_ptr_placeholder": "Syötä yksi palvelimen osoite per rivi",
+    "bootstrap_dns_desc": "Ylävirroiksi määrittämiesi DoH/DoT-resolverien IP-osoitteiden selvitykseen käytettävien DNS-palvelimien IP-osoitteet. Kommentteja ei sallita.",
+    "fallback_dns_title": "DNS-varapalvelimet",
+    "fallback_dns_desc": "Listaus DNS-varapalvelimista, joita käytetään kun lähtevät DNS-palvelimet eivät vastaa. Syntaksi on sama kuin yllä olevassa pääylävirrat-kentässä.",
+    "fallback_dns_placeholder": "Syötä yksi DNS-varapalvelin per rivi",
+    "local_ptr_title": "Yksityiset käänteis-DNS-palvelimet",
+    "local_ptr_desc": "DNS-palvelimet, joita AdGuard Home käyttää paikallisille PTR-pyynnöille. Näitä palvelimia käytetään yksityistä IP-osoitetta käyttävien PTR-pyyntöjen osoitteiden, kuten \"192.168.12.34\", selvitykseen käänteis-DNS:n avulla. Jos ei käytössä, AdGuard Home käyttää käyttöjärjestelmän oletusarvoisia DNS-resolvereita, poislukien AdGuard Homen omat osoitteet.",
+    "local_ptr_default_resolver": "Oletusarvoisesti AdGuard Home käyttää seuraavia käänteis-DNS-resolvereita: {{ip}}.",
+    "local_ptr_no_default_resolver": "AdGuard Home ei voinut määrittää tälle järjestelmälle sopivaa yksityistä käänteis-DNS-resolveria.",
+    "local_ptr_placeholder": "Syötä yksi IP-osoite per rivi",
    "resolve_clients_title": "Käytä päätelaitteiden IP-osoitteille käänteistä selvitystä",
-    "resolve_clients_desc": "Selvitä päätelaitteiden IP-osoitteiden isäntänimet käänteisesti lähettämällä PTR-pyynnöt sopiville resolvereille (yksityiset DNS-palvelimet paikallisille päätelaitteille, lähtevät palvelimet päätelaitteille, joilla on julkiset IP-osoitteet).",
-    "use_private_ptr_resolvers_title": "Käytä yksityisiä käänteisiä DNS-resolvereita",
-    "use_private_ptr_resolvers_desc": "Suorita käänteiset DNS-selvitykset paikallisesti tarjotuille osoitteille käyttäen näitä ylävirran palvelimia. Jos ei käytössä, vastaa AdGuard Home kaikkiin sen tyyppisiin PTR-pyyntöihin NXDOMAIN-arvolla, pois lukien DHCP, /etc/hosts, yms. -tiedoista tunnistettut päätelaitteet.",
+    "resolve_clients_desc": "Selvitä päätelaitteiden IP-osoitteiden isäntänimet käänteisesti lähettämällä PTR-pyynnöt sopiville resolvereille (yksityiset DNS-palvelimet paikallisille päätelaitteille, ylävirtapalvelimet päätelaitteille, joilla on julkiset IP-osoitteet).",
+    "use_private_ptr_resolvers_title": "Käytä yksityisiä käänteis-DNS-resolvereita",
+    "use_private_ptr_resolvers_desc": "Suorita käänteis-DNS-selvitykset paikallisesti tarjotuille osoitteille käyttäen näitä ylävirtapalvelimia. Jos ei käytössä, vastaa AdGuard Home kaikkiin sen tyyppisiin PTR-pyyntöihin NXDOMAIN-arvolla, pois lukien DHCP, /etc/hosts, yms. -tiedoista tunnistettut päätelaitteet.",
    "check_dhcp_servers": "Etsi DHCP-palvelimia",
    "save_config": "Tallenna asetukset",
    "enabled_dhcp": "DHCP-palvelin otettiin käyttöön",
@@ -70,7 +74,9 @@
    "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",
@@ -86,7 +92,7 @@
    "request_details": "Pyynnön tiedot",
    "client_details": "Päätelaitteen tiedot",
    "details": "Yksityiskohdat",
-    "back": "Takaisin",
+    "back": "Palaa takaisin",
    "dashboard": "Tila",
    "settings": "Asetukset",
    "filters": "Suodattimet",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Estetyt haittaohjelmat/tietojenkalastelut",
    "stats_adult": "Estetyt aikuisille tarkoitetut sivustot",
    "stats_query_domain": "Kysytyimmät verkkotunnukset",
-    "for_last_24_hours": "viimeisten 24 tunnin ajalta",
+    "for_last_hours": "viimeisen {{count}} tunnin ajalta",
+    "for_last_hours_plural": "viimeisen {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Käytetyimmät päätelaitteet",
    "no_clients_found": "Päätelaitteita ei löytynyt",
    "general_statistics": "Yleiset tilastot",
+    "top_upstreams": "Käytetyimmät ylävirrat",
+    "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_24_hours": "Käsiteltyjen DNS-pyyntöjen määrä viimeisten 24 tunnin 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_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",
    "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>.",
@@ -146,8 +158,8 @@
    "no_servers_specified": "Palvelimia ei ole määritetty",
    "general_settings": "Yleiset asetukset",
    "dns_settings": "DNS-asetukset",
-    "dns_blocklists": "DNS-estolistat",
-    "dns_allowlists": "DNS-sallittujen listat",
+    "dns_blocklists": "DNS-estot",
+    "dns_allowlists": "DNS-sallinnat",
    "dns_blocklists_desc": "AdGuard Home estää estolistalla olevat verkkotunnukset.",
    "dns_allowlists_desc": "DNS-sallittujen listalla olevat verkkotunnukset sallitaan myös silloin, jos ne ovat jollain muulla estolistalla.",
    "custom_filtering_rules": "Omat suodatussäännöt",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Määritetty tiedostossa {{path}}",
    "test_upstream_btn": "Testaa ylävirtoja",
    "upstreams": "Ylävirrat",
+    "upstream": "Ylävirta",
    "apply_btn": "Käytä",
    "disabled_filtering_toast": "Suodatus poistettiin käytöstä",
    "enabled_filtering_toast": "Suodatus otettiin käyttöön",
@@ -220,9 +233,9 @@
    "example_upstream_tcp_port": "tavallinen DNS (TCP, portti);",
    "example_upstream_tcp_hostname": "tavallinen DNS (TCP, isäntänimi);",
    "all_lists_up_to_date_toast": "Kaikki listat ovat ajan tasalla",
-    "updated_upstream_dns_toast": "Ylävirtojen palvelimet tallennettiin",
+    "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 sen oikeinkirjoitus",
+    "dns_test_not_ok_toast": "Palvelin \"{{key}}\": 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ä",
@@ -257,12 +270,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 säilytys",
+    "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>asetuksissa</0>",
    "query_log_strict_search": "Käytä tarkalle haulle lainausmerkkejä",
-    "query_log_retention_confirm": "Haluatko varmasti muuttaa pyyntöhistoriasi säilytysaikaa? Jos lyhennät aikaa, joitakin tietoja menetetään",
+    "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",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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": "Aliverkon etuliitteen pituus IPv4-osoitteille, joita käytetään nopeuden rajoittamiseen. Oletusarvo on 24",
+    "rate_limit_subnet_len_ipv4_error": "IPv4-aliverkon etuliitteen pituuden tulee olla 0–32",
+    "rate_limit_subnet_len_ipv6": "IPv6-osoitteiden aliverkon etuliitteen pituus",
+    "rate_limit_subnet_len_ipv6_desc": "Aliverkon etuliitteen pituus IPv6-osoitteille, joita käytetään nopeuden rajoittamiseen. Oletusarvo on 56",
+    "rate_limit_subnet_len_ipv6_error": "IPv6-aliverkon etuliitteen pituuden tulee olla 0–128",
+    "form_enter_rate_limit_subnet_len": "Anna aliverkon etuliitteen pituus nopeuden rajoittamista varten",
+    "rate_limit_whitelist": "Nopeutta rajoittava sallittu luettelo",
+    "rate_limit_whitelist_desc": "IP-osoitteet, jotka eivät kuulu nopeusrajoituksen 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ä",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Haluatko varmasti poistaa päätelaitteen \"{{key}}\"?",
    "list_confirm_delete": "Haluatko varmasti poistaa tämän listan?",
    "auto_clients_title": "Määrittämättömät päätelaitteet",
-    "auto_clients_desc": "Päätelaitteet, joita ei ole määritetty pysyviksi ja jotka voivat silti käyttää AdGuard Homea.",
+    "auto_clients_desc": "Päätelaitteet, joita ei ole määritetty pysyviksi ja jotka voivat silti käyttää AdGuard Homea. Näitä tietoja kertään useista lähteistä, mm. hosts-tiedostoista ja kääteis-DNS:llä.",
    "access_title": "Käytön asetukset",
    "access_desc": "Tässä voidaan määrittää AdGuard Homen DNS-palvelimen käyttöoikeussääntöjä.",
    "access_allowed_title": "Sallitut päätelaitteet",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "<1>DNS-over-HTTPS</1> tai <1>DNS-over-TLS</1> -toteutuksia varten, on AdGuard Homen <0>Salausasetukset</0> määritettävä.",
    "rewrite_added": "Kohteen \"{{key}}\" DNS-uudelleenohjaus lisättiin",
    "rewrite_deleted": "Kohteen \"{{key}}\" DNS-uudelleenohjaus poistettiin",
+    "rewrite_updated": "DNS-uudelleenohjaukset päivitettiin",
    "rewrite_add": "Lisää DNS-uudelleenohjaus",
+    "rewrite_edit": "Muokkaa DNS-uudelleenohjausta",
    "rewrite_not_found": "DNS-uudelleenohjauksia ei löytynyt",
    "rewrite_confirm_delete": "Haluatko varmasti poistaa DNS-uudelleenohjauksen kohteelle \"{{key}}\"?",
    "rewrite_desc": "Mahdollistaa oman DNS-vastauksen helpon määrityksen tietylle verkkotunnukselle.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Ota tilastointi käyttöön",
    "ignore_domains": "Ohitettavat verkkotunnukset (erotettu rivinvaihdolla)",
    "ignore_domains_title": "Ohitettavat verkkotunnukset",
-    "ignore_domains_desc_stats": "Näihin verkkotunnuksiin lähetettyjä pyyntöjä ei tallenneta tilastoihin.",
-    "ignore_domains_desc_query": "Näihin verkkotunnuksiin lähetettyjä pyyntöjä ei tallenneta pyyntöhistoriaan.",
+    "ignore_domains_desc_stats": "Sääntöihin sopivat kyselyt eivät kirjoitu tilastoihin",
+    "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",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: erityinen arvo, säilytä ylävirran <0>A</0>-tiedot",
    "rewrite_AAAA": "<0>AAAA</0>: erityinen arvo, säilytä ylävirran <0>AAAA</0>-tiedot",
    "disable_ipv6": "Älä selvitä IPv6-osoitteita",
-    "disable_ipv6_desc": "Hylkää kaikki IPv6-osoitteiden DNS-pyynnöt (tyyppi AAAA).",
+    "disable_ipv6_desc": "Hylkää kaikki IPv6-osoitteiden DNS-pyynnöt (tyyppi AAAA) ja poista HTTPS-vastausten IPv6-tiedot.",
    "fastest_addr": "Nopein IP-osoite",
    "fastest_addr_desc": "Lähetä pyynnöt kaikille DNS-palvelimille ja valitse vastauksista nopein IP-osoite. Tämä parantaa yleistä liitettävyyttä, joskin hidastaa DNS-pyyntöjä, koska AdGuard Homen on odotettava kaikkien DNS-palvelinten vastauksia.",
    "autofix_warning_text": "Jos painat \"Korjaa\", AdGuard Home määrittää järjestelmäsi käyttämään AdGuard Homen DNS-palvelinta.",
@@ -602,7 +630,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": "Estetyt",
+    "show_blocked_responses": "Estetty",
    "show_whitelisted_responses": "Sallitut",
    "show_processed_responses": "Käsitelty",
    "blocked_safebrowsing": "Turvallisen selauksen estämät",
@@ -621,13 +649,13 @@
    "enter_cache_size": "Syötä välimuistin koko (tavuina)",
    "enter_cache_ttl_min_override": "Syötä vähimmäis-TTL (sekunteina)",
    "enter_cache_ttl_max_override": "Syötä enimmäis-TTL (sekunteina)",
-    "cache_ttl_min_override_desc": "Pidennä ylävirran palvelimelta vastaanotettuja, lyhyitä elinaika-arvoja (sekunteina) tallennettaessa DNS-vastauksia välimuistiin.",
+    "cache_ttl_min_override_desc": "Pidennä ylävirtapalvelimelta vastaanotettuja, lyhyitä elinaika-arvoja (sekunteina) tallennettaessa DNS-vastauksia välimuistiin.",
    "cache_ttl_max_override_desc": "Määritä DNS-välimuistin kohteiden enimmäiselinaika (sekunteina).",
    "ttl_cache_validation": "Välimuistin vähimmäiselinajan on oltava pienempi tai sama kuin enimmäiselinajan",
    "cache_optimistic": "Optimistinen välimuisti",
    "cache_optimistic_desc": "Pakota AdGuard Home vastaamaan välimuistista vaikka tiedot olisivat vanhentuneet. Pyri samalla myös päivittämään tiedot.",
    "filter_category_general": "Yleiset",
-    "filter_category_security": "Turvallisuus",
+    "filter_category_security": "Tietoturva",
    "filter_category_regional": "Alueelliset",
    "filter_category_other": "Muut",
    "filter_category_general_desc": "Listat, jotka estävät seurannan ja mainokset useimmilla laitteilla",
@@ -645,7 +673,7 @@
    "parental_control": "Lapsilukko",
    "safe_browsing": "Turvallinen selaus",
    "served_from_cache": "{{value}} <i>(jaettu välimuistista)</i>",
-    "form_error_password_length": "Salasanan on oltava ainakin {{value}} merkkiä",
+    "form_error_password_length": "Salasanan on oltava {{min}} - {{max}} merkkiä pitkä",
    "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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Poista suojaus käytöstä {{count}} tunniksi",
    "disable_notify_for_hours_plural": "Poista suojaus käytöstä {{count}} tunniksi",
    "disable_notify_until_tomorrow": "Poista suojaus käytöstä huomiseen asti",
-    "enable_protection_timer": "Suojaus otetaan käyttöön {{time}} kuluttua"
+    "enable_protection_timer": "Suojaus otetaan käyttöön {{time}} kuluttua",
+    "custom_retention_input": "Syötä säilytysaika tunteina",
+    "custom_rotation_input": "Syötä uudistusaika tunteina",
+    "protection_section_label": "Suojaus",
+    "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.",
+    "schedule_services_desc_client": "Määritä palvelunestosuodattimen keskeytysajoitus tälle päätteelle.",
+    "schedule_desc": "Aseta estettujen palveluiden käyttämättömyysjaksot",
+    "schedule_invalid_select": "Aloitusaika on oltava ennen lopetusaikaa",
+    "schedule_select_days": "Valitse päivät",
+    "schedule_timezone": "Valitse aikavyöhyke",
+    "schedule_current_timezone": "Nykyinen aikavyöhyke: {{value}}",
+    "schedule_time_all_day": "Koko päivän",
+    "schedule_modal_description": "Tämä ajoitus korvaa kaikki nykyiset kyseisen viikonpäivän ajoitukset. Jokaisella viikonpäivällä voi olla vain yksi toimettomuusjakso.",
+    "schedule_modal_time_off": "Ei palveluestoa:",
+    "schedule_new": "Uusi ajoitus",
+    "schedule_edit": "Muokkaa ajoitus",
+    "schedule_save": "Tallenna ajoitus",
+    "schedule_add": "Lisää ajoitus",
+    "schedule_remove": "Poista ajoitus",
+    "schedule_from": "Alkaen",
+    "schedule_to": "Päättyen",
+    "sunday": "Sunnuntai",
+    "monday": "Maanantai",
+    "tuesday": "Tiistai",
+    "wednesday": "Keskiviikko",
+    "thursday": "Torstai",
+    "friday": "Perjantai",
+    "saturday": "Lauantai",
+    "sunday_short": "Su",
+    "monday_short": "Ma",
+    "tuesday_short": "Ti",
+    "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"
 }
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -1,18 +1,22 @@
 {
    "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": "Demandes en parallèle",
+    "parallel_requests": "Requêtes en parallèle",
    "load_balancing": "Équilibrage de charge",
    "load_balancing_desc": "Interroger un serveur en amont à la fois. AdGuard Home utilise son algorithme aléatoire pondéré pour choisir le serveur de sorte que le serveur le plus rapide soit utilisé plus souvent.",
    "bootstrap_dns": "Serveurs DNS d'amorçage",
-    "bootstrap_dns_desc": "Les serveurs DNS d'amorçage sont utilisés pour résoudre les adresses IP des résolveurs DoH/DoT que vous spécifiez comme upstream.",
+    "bootstrap_dns_desc": "Les adresses IP des serveurs DNS utilisées pour résoudre les adresses IP des résolveurs DoH/DoT que vous spécifiez comme en amont. Les commentaires ne sont pas autorisés.",
+    "fallback_dns_title": "Serveurs DNS de repli",
+    "fallback_dns_desc": "Liste des serveurs DNS de repli utilisés lorsque les serveurs DNS en amont ne répondent pas. La syntaxe est la même que dans le champ principal en amont ci-dessus.",
+    "fallback_dns_placeholder": "Saisissez un serveur DNS de repli par ligne",
    "local_ptr_title": "Serveurs DNS privés inverses",
    "local_ptr_desc": "Les serveurs DNS que AdGuard Home utilise pour les requêtes PTR locales. Ces serveurs sont utilisés pour résoudre les noms d'hôte des clients avec des adresses IP privées, par exemple « 192.168.12.34 », en utilisant le DNS inversé. Si ce paramètre n'est pas défini, AdGuard Home utilise les adresses des résolveurs DNS par défaut de votre système d'exploitation, à l'exception des adresses d'AdGuard Home lui-même.",
    "local_ptr_default_resolver": "Par défaut, AdGuard Home utilise les résolveurs DNS inversés suivants : {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home n'a pas pu déterminer de résolveurs DNS inversés privés appropriés pour ce système.",
-    "local_ptr_placeholder": "Saisissez une adresse de serveur par ligne",
+    "local_ptr_placeholder": "Saisissez une adresse IP par ligne",
    "resolve_clients_title": "Activer la résolution inverse des adresses IP des clients",
    "resolve_clients_desc": "Résoudre inversement les adresses IP des clients en leurs noms d'hôtes en envoyant des requêtes PTR aux résolveurs correspondants (serveurs DNS privés pour les clients locaux, serveurs en amont pour les clients ayant une adresse IP publique).",
    "use_private_ptr_resolvers_title": "Utiliser des résolveurs DNS inversés privés",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "pendant les dernières 24 heures",
+    "for_last_hours": "pendant la dernière {{count}} heure",
+    "for_last_hours_plural": "pendant les dernières {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Meilleurs clients",
    "no_clients_found": "Pas de clients trouvés",
    "general_statistics": "Statistiques générales",
+    "top_upstreams": "Top amonts",
+    "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_24_hours": "Le nombre de requêtes DNS traitées au cours des 24 dernières heures",
+    "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_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",
    "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>.",
@@ -149,7 +161,7 @@
    "dns_blocklists": "Listes de blocage DNS",
    "dns_allowlists": "Listes d’autorisation DNS",
    "dns_blocklists_desc": "AdGuard Home bloquera les domaines correspondant aux listes de blocage.",
-    "dns_allowlists_desc": "Les domaines provenant de listes d’autorisation DNS seront autorisés même s’ils figurent dans l’une des listes de blocage.",
+    "dns_allowlists_desc": "Les domaines des listes blanches des DNS seront autorisés même s’ils figurent dans une des listes de blocage.",
    "custom_filtering_rules": "Règles de filtrage personnalisées",
    "encryption_settings": "Paramètres de chiffrement",
    "dhcp_settings": "Paramètres DHCP",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Configuré dans {{path}}",
    "test_upstream_btn": "Tester les upstreams",
    "upstreams": "En amont",
+    "upstream": "Amont",
    "apply_btn": "Appliquer",
    "disabled_filtering_toast": "Filtrage désactivé",
    "enabled_filtering_toast": "Filtrage activé",
@@ -191,8 +204,8 @@
    "new_allowlist": "Nouvelle liste d’autorisation",
    "edit_blocklist": "Modifier la liste de blocage",
    "edit_allowlist": "Modifier la liste d’autorisation",
-    "choose_blocklist": "Choisir des listes de blocage",
-    "choose_allowlist": "Choisir des listes d’autorisation",
+    "choose_blocklist": "Choisir les listes de blocage",
+    "choose_allowlist": "Choisir les listes blanches",
    "enter_valid_blocklist": "Saisissez une URL valide vers la liste de blocage.",
    "enter_valid_allowlist": "Saisissez une URL valide vers la liste d’autorisation.",
    "form_error_url_format": "Format d’URL incorrect",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Le journal des requêtes a été effacé",
    "query_log_updated": "Le journal des requêtes a été mis à jour",
    "query_log_clear": "Effacer journal des requêtes",
-    "query_log_retention": "Rétention du journal des requêtes",
+    "query_log_retention": "Rotation des journaux de requêtes",
    "query_log_enable": "Activer le journal",
    "query_log_configuration": "Configuration du journal",
    "query_log_disabled": "Le journal des requêtes est désactivé et peut être configuré dans les <0>paramètres</0>",
    "query_log_strict_search": "Utilisez les doubles guillemets pour une recherche stricte",
-    "query_log_retention_confirm": "Êtes-vous sûr de vouloir modifier la rétention des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
+    "query_log_retention_confirm": "Êtes-vous sûr de souhaiter modifier la rotation des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
    "anonymize_client_ip": "Anonymiser l’IP du client",
    "anonymize_client_ip_desc": "Ne pas enregistrer l’adresse IP complète du client dans les journaux et statistiques",
    "dns_config": "Configuration du serveur DNS",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -304,7 +330,7 @@
    "theme_auto": "Auto",
    "theme_light": "Thème clair",
    "theme_dark": "Thème sombre",
-    "upstream_dns_client_desc": "Si vous laissez ce champ vide, AdGuard Home utilisera les serveurs configurés dans les <0>paramètres DNS</0>.",
+    "upstream_dns_client_desc": "Si vous laissez ce champ vide, AdGuard Home utilisera les serveurs configurés dans les <0>Paramètres DNS</0>.",
    "tracker_source": "Source du traceur",
    "source_label": "Source",
    "found_in_known_domain_db": "Trouvé dans la base de données des domaines connus",
@@ -312,7 +338,7 @@
    "rule_label": "Règle(s)",
    "list_label": "Liste",
    "unknown_filter": "Filtre inconnu {{filterId}}",
-    "known_tracker": "Pisteur connu",
+    "known_tracker": "Traqueur 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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Voulez-vous vraiment supprimer le client « {{key}} » ?",
    "list_confirm_delete": "Voulez-vous vraiment supprimer cette liste ?",
    "auto_clients_title": "Clients d'exécution",
-    "auto_clients_desc": "Appareils ne figurant pas sur la liste des clients persistants qui peuvent encore utiliser AdGuard Home.",
+    "auto_clients_desc": "Informations sur les adresses IP des appareils qui utilisent ou pourraient utiliser AdGuard Home. Ces informations sont recueillies à partir de plusieurs sources, notamment les fichiers hosts, le DNS inverse, etc.",
    "access_title": "Paramètres d'accès",
    "access_desc": "Ici vous pouvez configurer les règles d'accès au serveur DNS AdGuard Home",
    "access_allowed_title": "Clients autorisés",
@@ -478,12 +504,14 @@
    "setup_dns_notice": "Pour utiliser le <1>DNS-over-HTTPS</1> ou le <1>DNS-over-TLS</1>, vous devez <0>configurer le Chiffrement</0> dans les paramètres de AdGuard Home.",
    "rewrite_added": "Réécriture DNS pour « {{key}} » ajoutée",
    "rewrite_deleted": "Réécriture DNS pour « {{key}} » supprimée",
+    "rewrite_updated": "Réécriture DNS mise à jour",
    "rewrite_add": "Ajouter une réécriture DNS",
+    "rewrite_edit": "Modifier la réécriture DNS",
    "rewrite_not_found": "Aucune réécriture DNS trouvée",
    "rewrite_confirm_delete": "Voulez-vous vraiment supprimer la réécriture DNS pour « {{key}} » ?",
    "rewrite_desc": "Permet de configurer facilement la réponse DNS personnalisée pour un nom de domaine spécifique.",
    "rewrite_applied": "Règle de réécriture appliquée",
-    "rewrite_hosts_applied": "Réécrit par la règle du fichier d’hôtes",
+    "rewrite_hosts_applied": "Réécrit par la règle du fichier hosts",
    "dns_rewrites": "Réécritures DNS",
    "form_domain": "Saisissez un domaine ou caracrtère générique",
    "form_answer": "Saisissez une adresse IP ou un nom de domaine",
@@ -528,8 +556,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 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",
+    "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",
    "interval_hours": "{{count}} heure",
    "interval_hours_plural": "{{count}} heures",
    "filters_configuration": "Configuration des filtres",
@@ -550,7 +578,7 @@
    "network": "Réseau",
    "descr": "Description",
    "whois": "WHOIS",
-    "filtering_rules_learn_more": "<0>Apprenez-en plus</0> à propos de la création de vos propres listes de blocage d’hôtes.",
+    "filtering_rules_learn_more": "<0>Apprenez plus</0> sur la création de vos propres listes hosts.",
    "blocked_by_response": "Bloqué par un CNAME ou une réponse IP",
    "blocked_by_cname_or_ip": "Bloqué par CNAME ou adresse IP",
    "try_again": "Réessayer",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0> : valeur spéciale, conserver les enregistrements <0>A</0> de l’amont",
    "rewrite_AAAA": "<0>AAAA</0> : valeur spéciale, conserver les enregistrements <0>AAAA</0> de l’amont",
    "disable_ipv6": "Désactiver la résolution des adresses IPv6",
-    "disable_ipv6_desc": "Abandonner toutes les requêtes DNS pour les adresses IPv6 (type AAAA).",
+    "disable_ipv6_desc": "Supprimer toutes les requêtes DNS pour les adresses IPv6 (type AAAA) et supprimer les indices IPv6 des réponses HTTPS.",
    "fastest_addr": "Adresse IP la plus rapide",
    "fastest_addr_desc": "Rechercher tous les serveurs DNS et renvoyer l’adresse IP la plus rapide parmi toutes les réponses. Cela ralentit les requêtes DNS car AdGuard Home doit attendre les réponses de tous les serveurs DNS, mais la connectivité globale s'améliore.",
    "autofix_warning_text": "Si vous cliquez sur « Réparer », AdGuard Home configurera votre système pour utiliser le serveur DNS AdGuard Home.",
@@ -578,7 +606,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 sur liste blanche",
+    "host_whitelisted": "L’hôte est autorisé",
    "check_ip": "Adresses IP : {{ip}}",
    "check_cname": "CNAME : {{cname}}",
    "check_reason": "Raison : {{reason}}",
@@ -603,12 +631,12 @@
    "validated_with_dnssec": "Validé avec DNSSEC",
    "all_queries": "Toutes les requêtes",
    "show_blocked_responses": "Bloqué",
-    "show_whitelisted_responses": "Ajouté à la liste blanche",
+    "show_whitelisted_responses": "Autorisée",
    "show_processed_responses": "Traité",
-    "blocked_safebrowsing": "Navigation sécurisée bloquée",
+    "blocked_safebrowsing": "Bloqué par la Navigation sécurisée",
    "blocked_adult_websites": "Bloqué par le Contrôle Parental",
    "blocked_threats": "Menaces bloquées",
-    "allowed": "Autorisé",
+    "allowed": "Autorisées",
    "filtered": "Filtré",
    "rewritten": "Réécrit",
    "safe_search": "Recherche Sécurisée",
@@ -630,13 +658,13 @@
    "filter_category_security": "Sécurité",
    "filter_category_regional": "Régional",
    "filter_category_other": "Autre",
-    "filter_category_general_desc": "Listes qui bloquent le pistage et la publicité sur la plupart des appareils",
+    "filter_category_general_desc": "Listes qui bloquent le suivi 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 pistage",
+    "filter_category_regional_desc": "Listes axées sur les annonces régionales et les serveurs de suivi",
    "filter_category_other_desc": "Autres listes noires",
    "setup_config_to_enable_dhcp_server": "Configurer les paramètres pour activer le serveur DHCP",
    "original_response": "Réponse originale",
-    "click_to_view_queries": "Cliquez pour voir les requêtes",
+    "click_to_view_queries": "Cliquer pour voir les requêtes",
    "port_53_faq_link": "Le port 53 est souvent occupé par les services « DNSStubListener » ou « systemd-resolved ». Veuillez lire <0>cette instruction</0> pour savoir comment résoudre ce problème.",
    "adg_will_drop_dns_queries": "AdGuard Home ignorera toutes les requêtes DNS de ce client.",
    "filter_allowlist": "ATTENTION : Cette action exclura également la règle « {{disallowed_rule}} » de la liste des clients autorisés.",
@@ -645,7 +673,7 @@
    "parental_control": "Contrôle parental",
    "safe_browsing": "Navigation sécurisée",
    "served_from_cache": "{{value}} <i>(depuis le cache)</i>",
-    "form_error_password_length": "Le mot de passe doit comporter au moins {{value}} caractères",
+    "form_error_password_length": "Le mot de passe doit comporter entre {{min}} et {{max}}  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é",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Désactiver la protection pendant {{count}} heure",
    "disable_notify_for_hours_plural": "Désactiver la protection pendant {{count}} heures",
    "disable_notify_until_tomorrow": "Désactiver la protection jusqu'à demain",
-    "enable_protection_timer": "La protection sera activée dans {{time}}"
+    "enable_protection_timer": "La protection sera activée dans {{time}}",
+    "custom_retention_input": "Saisir la rétention en heures",
+    "custom_rotation_input": "Saisir la rotation en heures",
+    "protection_section_label": "Protection",
+    "log_and_stats_section_label": "Journal des requêtes et statistiques",
+    "ignore_query_log": "Ignorer ce client dans le journal des requêtes",
+    "ignore_statistics": "Ignorer ce client dans les statistiques",
+    "schedule_services": "Suspendre le blocage des services",
+    "schedule_services_desc": "Configurez l'horaire de pauses du filtre de blocage de services",
+    "schedule_services_desc_client": "Configurez l'horaire de pauses du filtre de blocage de services pour ce client",
+    "schedule_desc": "Définissez les périodes d'inactivité pour les services bloqués",
+    "schedule_invalid_select": "Le temps du début doit précéder le temps de la fin",
+    "schedule_select_days": "Sélectionnez les jours",
+    "schedule_timezone": "Sélectionnez un fuseau horaire",
+    "schedule_current_timezone": "Fuseau horaire actuel : {{value}}",
+    "schedule_time_all_day": "Toute la journée",
+    "schedule_modal_description": "Cet horaire remplacera tout autre planning existant pour le même jour de la semaine. Chaque jour de la semaine ne peut avoir qu'une seule période d'inactivité.",
+    "schedule_modal_time_off": "Suspendre le blocage :",
+    "schedule_new": "Nouvel horaire",
+    "schedule_edit": "Modifier l'horaire",
+    "schedule_save": "Enregistrer l'horaire",
+    "schedule_add": "Ajouter un horaire",
+    "schedule_remove": "Supprimer l'horaire",
+    "schedule_from": "Du",
+    "schedule_to": "Au",
+    "sunday": "Dimanche",
+    "monday": "Lundi",
+    "tuesday": "Mardi",
+    "wednesday": "Mercredi",
+    "thursday": "Jeudi",
+    "friday": "Vendredi",
+    "saturday": "Samedi",
+    "sunday_short": "Dim.",
+    "monday_short": "Lun.",
+    "tuesday_short": "Mar.",
+    "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"
 }
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -1,13 +1,17 @@
 {
    "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",
    "load_balancing": "Load-balancing",
    "load_balancing_desc": "Pitajte jedan po jedan uzvodni poslužitelj. AdGuard Home koristi svoj ponderirani slučajni algoritam za odabir poslužitelja tako da se najbrži poslužitelj koristi češće.",
    "bootstrap_dns": "Bootstrap DNS poslužitelji",
-    "bootstrap_dns_desc": "Bootstrap DNS poslužitelji koriste se za rezolvanje IP adresa DoH/DoT rezolvera koje navedete kao upstreams.",
+    "bootstrap_dns_desc": "IP adrese DNS poslužitelja koji se koriste za rješavanje IP adresa DoH/DoT razrjeđivača koje navedete kao uzvodne. Komentari nisu dopušteni.",
+    "fallback_dns_title": "Rezervni DNS poslužitelji",
+    "fallback_dns_desc": "Popis rezervnih DNS poslužitelja koji se koriste kada uzvodni DNS poslužitelji ne odgovaraju. Sintaksa je ista kao u gornjem polju glavnog uzvodnog toka.",
+    "fallback_dns_placeholder": "Unesite jedan rezervni DNS poslužitelj po retku",
    "local_ptr_title": "Privatni obrnuti DNS poslužitelji",
    "local_ptr_desc": "DNS poslužitelji koje AdGuard Home koristi za lokalne PTR upite. Ti se poslužitelji koriste za razrješavanje naziva glavnog računala klijenata s privatnim IP adresama, na primjer \"192.168.12.34\", koristeći obrnuti DNS. Ako nije postavljeno, AdGuard Home koristi adrese zadanih DNS razrješivača vašeg OS-a, osim za adrese samog AdGuard Homea.",
    "local_ptr_default_resolver": "Prema zadanim postavkama AdGuard Home koristi sljedeće obrnute DNS razrješivače: {{ip}}.",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "u zadnja 24 sata",
+    "for_last_hours": "za posljednji {{count}} sat",
+    "for_last_hours_plural": "za posljednjih {{count}} sati",
    "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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Top klijenti",
    "no_clients_found": "Nema pronađenih klijenata",
    "general_statistics": "Opća statistika",
+    "top_upstreams": "Top upstream poslužitelji",
+    "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_24_hours": "Broj DNS upita obrađenih u posljednja 24 sata",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Postavljeno u {{path}}",
    "test_upstream_btn": "Testiraj upstream-ove",
    "upstreams": "Upstreams",
+    "upstream": "Upstream poslužitelj",
    "apply_btn": "Primijeni",
    "disabled_filtering_toast": "Onemogućeno filtriranje",
    "enabled_filtering_toast": "Omogućeno filtriranje",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Zapisnik upita je uspješno uklonjen",
    "query_log_updated": "Zapisnik upita je uspješno ažuriran",
    "query_log_clear": "Očisti zapisnik upita",
-    "query_log_retention": "Spremanje zapisnika upita",
+    "query_log_retention": "Rotacija dnevnika upita",
    "query_log_enable": "Omogući zapise",
    "query_log_configuration": "Postavke zapisa",
    "query_log_disabled": "Zapisnik upita je onemogućen i može se postaviti u <0>postavkama</0>",
    "query_log_strict_search": "Koristite dvostruke navodnike za strogo pretraživanje",
-    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje zapisnika upita? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
+    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti rotaciju dnevnika upita? Ako smanjite vrijednost intervala, neki će se podaci izgubiti",
    "anonymize_client_ip": "Anonimiraj IP klijenta",
    "anonymize_client_ip_desc": "Ne spremajte cijelu IP adresu klijenta u zapisnike i statistike",
    "dns_config": "DNS postavke poslužitelja",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Jeste li sigurni da želite ukloniti \"{{key}}\" klijenta?",
    "list_confirm_delete": "Jeste li sigurni da želite ukloniti ovaj popis?",
    "auto_clients_title": "Runtime klijenti",
-    "auto_clients_desc": "Podaci na klijentu koji koriste AdGuard Home, ali se ne mijenjaju u postavkama",
+    "auto_clients_desc": "Informacije o IP adresama uređaja koji koriste ili bi mogli koristiti AdGuard Home. Ove informacije prikupljaju se iz nekoliko izvora, uključujući datoteke hostova, obrnuti DNS itd.",
    "access_title": "Postavke pristupa",
    "access_desc": "Ovdje možete konfigurirati pravila pristupa za AdGuard Home DNS poslužitelj",
    "access_allowed_title": "Dopušteni klijenti",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Da biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, morate <0>postaviti šifriranje</0> u AdGuard Home postavkama.",
    "rewrite_added": "DNS prijepis za \"{{key}}\" je uspješno dodan",
    "rewrite_deleted": "DNS prijepis za \"{{key}}\" je uspješno uklonjen",
+    "rewrite_updated": "Prepisivanje DNS-a uspješno ažurirano",
    "rewrite_add": "Dodaj DNS prijepis",
+    "rewrite_edit": "Uredite prepisivanje DNS-a",
    "rewrite_not_found": "Nema DNS prijepisa",
    "rewrite_confirm_delete": "Jeste li sigurni da želite ukloniti DNS prijepis za \"{{key}}\" klijenta?",
    "rewrite_desc": "Omogućuje jednostavno postavljanje prilagođenog DNS odgovora za određenu domenu.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Omogući statistiku",
    "ignore_domains": "Zanemarene domene (odvojene novim retkom)",
    "ignore_domains_title": "Zanemarene domene",
-    "ignore_domains_desc_stats": "Upiti za ove domene ne upisuju se u statistiku",
-    "ignore_domains_desc_query": "Upiti za te domene nisu zapisani u zapisnik upita",
+    "ignore_domains_desc_stats": "Upiti koji odgovaraju ovim pravilima ne upisuju se u statistiku",
+    "ignore_domains_desc_query": "Upiti koji odgovaraju ovim pravilima ne upisuju se u zapisnik upita",
    "interval_hours": "{{count}} sata/i",
    "interval_hours_plural": "{{count}} sata/i",
    "filters_configuration": "Postavke filtara",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: posebna vrijednost, ukloni <0>A</0> zapis od upstreama",
    "rewrite_AAAA": "<0>AAAA</0>: posebna vrijednost, ukloni <0>AAAA</0> zapis od upstreama",
    "disable_ipv6": "Onemogući razrješavanje IPv6 adresa",
-    "disable_ipv6_desc": "Ispustite sve DNS upite za IPv6 adrese (upišite AAAA).",
+    "disable_ipv6_desc": "Ignorirajte sve DNS zahtjeve adresa IPv6 (tipa AAAA) i uklonite IPv6 podatke iz HTTPS odgovora.",
    "fastest_addr": "Najbrža IP adresa",
    "fastest_addr_desc": "Ispitajte sve DNS poslužitelje i vratite najbržu IP adresu među svim odgovorima. To usporava DNS upite jer AdGuard Home mora čekati odgovore svih DNS poslužitelja, ali poboljšava ukupnu povezanost.",
    "autofix_warning_text": "Ako pritisnete \"Popravi\", AdGuard Home će postaviti vaš sustav da koristi AdGuardHome DNS poslužitelj.",
@@ -645,7 +673,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 imati najmanje {{value}} znakova",
+    "form_error_password_length": "Lozinka mora sadržavati od {{min}} do {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Isključi zaštitu na {{count}} sati",
    "disable_notify_for_hours_plural": "Isključi zaštitu na {{count}} sati",
    "disable_notify_until_tomorrow": "Isključi zaštitu do sutra",
-    "enable_protection_timer": "Zaštita će biti omogućena u {{time}}"
+    "enable_protection_timer": "Zaštita će biti omogućena u {{time}}",
+    "custom_retention_input": "Unesite zadržavanje u satima",
+    "custom_rotation_input": "Unesite rotaciju u satima",
+    "protection_section_label": "Zaštita",
+    "log_and_stats_section_label": "Zapisnik upita i statistika",
+    "ignore_query_log": "Zanemari ovog klijenta u zapisniku upita",
+    "ignore_statistics": "Ignorirajte ovog klijenta u statistici",
+    "schedule_services": "Pauziraj blokiranje servisa",
+    "schedule_services_desc": "Konfiguriranje rasporeda pauziranja filtra za blokiranje servisa",
+    "schedule_services_desc_client": "Konfiguriranje rasporeda pauziranja filtra za blokiranje servisa za ovog klijenta",
+    "schedule_desc": "Postavljanje razdoblja neaktivnosti za blokirane servise",
+    "schedule_invalid_select": "Vrijeme početka mora biti prije vremena završetka",
+    "schedule_select_days": "Odabir dana",
+    "schedule_timezone": "Odabir vremenske zone",
+    "schedule_current_timezone": "Trenutna vremenska zona: {{value}}",
+    "schedule_time_all_day": "Cijeli dan",
+    "schedule_modal_description": "Ovaj raspored zamijenit će sve postojeće rasporede za isti dan u tjednu. Svaki dan u tjednu može imati samo jedno razdoblje neaktivnosti.",
+    "schedule_modal_time_off": "Blokiranje usluga je onemogućeno:",
+    "schedule_new": "Novi raspored",
+    "schedule_edit": "Uredi raspored",
+    "schedule_save": "Spremi raspored",
+    "schedule_add": "Dodaj raspored",
+    "schedule_remove": "Ukloni raspored",
+    "schedule_from": "Od",
+    "schedule_to": "Do",
+    "sunday": "Nedjelja",
+    "monday": "Ponedjeljak",
+    "tuesday": "Utorak",
+    "wednesday": "Srijeda",
+    "thursday": "Četvrtak",
+    "friday": "Petak",
+    "saturday": "Subota",
+    "sunday_short": "Ned",
+    "monday_short": "Pon",
+    "tuesday_short": "Uto",
+    "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"
 }
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Terheléselosztás",
    "load_balancing_desc": "Egyszerre csak egy szerverről történjen lekérdezés. Az AdGuard Home egy súlyozott, véletlenszerű algoritmust fog használni a megfelelő szerver kiválasztására, így a leggyorsabb szervert fogja a leggyakrabban használni.",
    "bootstrap_dns": "Bootstrap DNS kiszolgálók",
-    "bootstrap_dns_desc": "A Bootstrap DNS szerverek a DoH/DoT feloldók IP-címeinek feloldására szolgálnak.",
+    "bootstrap_dns_desc": "A DNS-kiszolgálók IP-címei, amelyek a DoH/DoT-feloldók IP-címeinek feloldására szolgálnak, amelyeket upstreamként megadott. Megjegyzések nem megengedettek.",
+    "fallback_dns_title": "Tartalék DNS-szerverek",
+    "fallback_dns_desc": "Azoknak a tartalék DNS-szervereknek a listája, amelyeket akkor használnak, ha a felsőbbrendű DNS-szerverek nem válaszolnak. A szintaxis ugyanaz, mint a fő felsőbbrendű mezőben.",
+    "fallback_dns_placeholder": "Adjon meg egy alternatív DNS szervert soronként",
    "local_ptr_title": "Privát DNS szerverek",
    "local_ptr_desc": "Azok a DNS szerverek, amiket az AdGuard Home a helyi PTR kérésekhez használ. ",
    "local_ptr_default_resolver": "Alapesetben az AdGuard Home a következő reverse DNS feloldókat használja: {{ip}}.",
    "local_ptr_no_default_resolver": "Az AdGuard Home nem tudta meghatározni a privát reverse DNS feloldókat ehhez a rendszerhez.",
-    "local_ptr_placeholder": "Adjon meg soronként egy kiszolgáló címet",
+    "local_ptr_placeholder": "Adjon meg egy IP-címet soronként",
    "resolve_clients_title": "Kliensek IP címeinek fordított feloldása",
    "resolve_clients_desc": "Fordítva oldja fel a kliensek IP címeit a hosztneveikre azáltal, hogy PTR lekérdezéseket küld a megfelelő feloldóknak (privát DNS szerverek a helyi kliensek számára, upstream szerverek a nyilvános IP címmel rendelkező kliensek számára).",
    "use_private_ptr_resolvers_title": "Privát reverse DNS feloldók használata",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Blokkolt kártevő/adathalászat",
    "stats_adult": "Blokkolt felnőtt tartalom",
    "stats_query_domain": "Leglátogatottabb domainek",
-    "for_last_24_hours": "az utóbbi 24 órában",
+    "for_last_hours": "az utolsó {{count}} órában",
+    "for_last_hours_plural": "az utolsó {{count}} ó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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Legaktívabb kliensek",
    "no_clients_found": "Nem található kliens",
    "general_statistics": "Általános statisztikák",
+    "top_upstreams": "Top upstream szerverek",
+    "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_24_hours": "Az elmúlt 24 órában feldolgozott DNS lekérdezések száma",
+    "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_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ő",
    "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.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Beállítva itt: {{path}}",
    "test_upstream_btn": "Upstreamek tesztelése",
    "upstreams": "Upstream-ek",
+    "upstream": "Upstream szerver",
    "apply_btn": "Alkalmaz",
    "disabled_filtering_toast": "Szűrés letiltva",
    "enabled_filtering_toast": "Szűrés engedélyezve",
@@ -167,6 +180,7 @@
    "enabled_parental_toast": "Szülői felügyelet engedélyezve",
    "disabled_safe_search_toast": "Biztonságos keresés letiltva",
    "enabled_save_search_toast": "Biztonságos keresés engedélyezve",
+    "updated_save_search_toast": "A Biztonságos keresés beállításai frissítve",
    "enabled_table_header": "Engedélyezve",
    "name_table_header": "Név",
    "list_url_table_header": "Lista URL-je",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "rate_limit": "Kérések korlátozása",
    "edns_enable": "EDNS kliens alhálózat engedélyezése",
    "edns_cs_desc": "Adja hozzá az EDNS Client Subnet beállítást (ECS) a felfelé irányuló kérésekhez, és naplózza a kliensek által küldött értékeket a lekérdezési naplóban.",
+    "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",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Biztosan törölni szeretné a(z) \"{{key}}\" klienst?",
    "list_confirm_delete": "Biztosan törölni kívánja ezt a listát?",
    "auto_clients_title": "Futási idejű kliensek",
-    "auto_clients_desc": "Ezek az eszközök nem szerepelnek a fenntartott kliensek listáján, de használják az AdGuard Home-ot",
+    "auto_clients_desc": "Az AdGuard Home-ot használó vagy esetleg használó eszközök IP-címeire vonatkozó információk. Ezeket az információkat több forrásból gyűjtik, beleértve a hosts fájlokat, a fordított DNS-t stb.",
    "access_title": "Hozzáférési beállítások",
    "access_desc": "Itt konfigurálhatja az AdGuard Home DNS-kiszolgáló hozzáférési szabályait",
    "access_allowed_title": "Engedélyezett kliensek",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Ahhoz, hogy a <1>DNS-over-HTTPS</1> vagy a <1>DNS-over-TLS</1> valamelyikét használja, muszáj <0>beállítania a titkosítást</0> az AdGuard Home beállításaiban.",
    "rewrite_added": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen hozzáadva",
    "rewrite_deleted": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen törölve",
+    "rewrite_updated": "A DNS újraírása sikeresen frissítve",
    "rewrite_add": "DNS átírás hozzáadása",
+    "rewrite_edit": "DNS újraírás szerkesztése",
    "rewrite_not_found": "Nem találhatók DNS átírások",
    "rewrite_confirm_delete": "Biztosan törölni szeretné a DNS átírást ehhez: \"{{key}}\"?",
    "rewrite_desc": "Lehetővé teszi, hogy egyszerűen beállítson egyéni DNS választ egy adott domain névhez.",
@@ -488,7 +519,7 @@
    "form_error_answer_format": "Érvénytelen válasz formátum",
    "configure": "Beállítás",
    "main_settings": "Fő beállítások",
-    "block_services": "Speciális szolgáltatások blokkolása",
+    "block_services": "Adott szolgáltatások blokkolása",
    "blocked_services": "Blokkolt szolgáltatások",
    "blocked_services_desc": "Lehetővé teszi a népszerű oldalak és szolgáltatások blokkolását.",
    "blocked_services_saved": "Blokkolt szolgáltatások sikeresen mentve",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Biztos benne, hogy megváltoztatja a statisztika megőrzési idejét? Ha csökkentette az értéket, a megadottnál korábbi adatok elvesznek",
    "statistics_cleared": "A statisztikák sikeresen vissza lettek állítva",
    "statistics_enable": "Statisztikák engedélyezése",
+    "ignore_domains": "Figyelmen kívül hagyott domainek (újsorral elválasztva)",
+    "ignore_domains_title": "Figyelmen kívül hagyott domainek",
+    "ignore_domains_desc_stats": "Az ezeknek a szabályoknak megfelelő lekérdezések nem kerülnek be a statisztikákba",
+    "ignore_domains_desc_query": "Az ezeknek a szabályoknak megfelelő lekérdezések nem kerülnek a lekérdezési naplóba",
    "interval_hours": "{{count}} óra",
    "interval_hours_plural": "{{count}} óra",
    "filters_configuration": "Szűrők beállításai",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: speciális érték, megtartja az upstream felől érkező <0>A</0> rekordokat",
    "rewrite_AAAA": "<0>AAAA</0>: speciális érték, megtartja az upstream felől érkező <0>AAAA</0> rekordokat",
    "disable_ipv6": "IPv6 címek feloldásának tiltása",
-    "disable_ipv6_desc": "Összes DNS kérés eldobása az IPv6 címekhez (AAAA típus).",
+    "disable_ipv6_desc": "Dobja el az IPv6-címekre vonatkozó összes DNS-lekérdezést (AAAA típusú), és távolítsa el az IPv6-tippeket a HTTPS-válaszokból.",
    "fastest_addr": "Leggyorsabb IP-cím",
    "fastest_addr_desc": "Kérdezze le az összes DNS-kiszolgálót, és adja vissza a leggyorsabb IP-címet a válaszok közül. Ez lelassítja a DNS-lekérdezéseket, mivel az összes DNS-kiszolgáló esetében meg kell várnunk a válaszokat, de javítja az összeköttetést.",
    "autofix_warning_text": "Ha a \"Javítás\" lehetőségre kattint, az AdGuard Home megpróbálja beállítani a rendszerét, hogy használja az AdGuard Home DNS szervert.",
@@ -638,9 +673,69 @@
    "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ó legalább {{value}} karakter hosszú kell, hogy legyen",
+    "form_error_password_length": "A jelszó legyen {{min}} és {{max}} karakter között",
    "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",
-    "clear_cache": "Gyorsítótár törlése"
+    "clear_cache": "Gyorsítótár törlése",
+    "make_static": "Statikussá tétel",
+    "theme_auto_desc": "Automatikus (az eszköz színsémájától függően)",
+    "theme_dark_desc": "Sötét téma",
+    "theme_light_desc": "Világos téma",
+    "disable_for_seconds": "{{count}} másodpercig",
+    "disable_for_seconds_plural": "{{count}} másodpercig",
+    "disable_for_minutes": "{{count}} percig",
+    "disable_for_minutes_plural": "{{count}} percig",
+    "disable_for_hours": "{{count}} óráig",
+    "disable_for_hours_plural": "{{count}} óráig",
+    "disable_until_tomorrow": "Holnapig",
+    "disable_notify_for_seconds": "Kapcsolja ki a védelmet {{count}} másodpercre",
+    "disable_notify_for_seconds_plural": "Kapcsolja ki a védelmet {{count}} másodpercre",
+    "disable_notify_for_minutes": "Kapcsolja ki a védelmet {{count}} percre",
+    "disable_notify_for_minutes_plural": "Kapcsolja ki a védelmet {{count}} percre",
+    "disable_notify_for_hours": "Kapcsolja ki a védelmet {{count}} órára",
+    "disable_notify_for_hours_plural": "Kapcsolja ki a védelmet {{count}} órára",
+    "disable_notify_until_tomorrow": "Holnapig kapcsolja ki a védelmet",
+    "enable_protection_timer": "A védelem {{time}}-kor aktiválódik",
+    "custom_retention_input": "Adja meg a megőrzést órákban",
+    "custom_rotation_input": "Írja be a forgatást órákban",
+    "protection_section_label": "Védelem",
+    "log_and_stats_section_label": "Lekérdezési napló és statisztikák",
+    "ignore_query_log": "Figyelmen kívül hagyja ezt az ügyfelet a lekérdezési naplóban",
+    "ignore_statistics": "Hagyja figyelmen kívül ezt az ügyfelet a statisztikákban",
+    "schedule_services": "A szolgáltatás blokkolásának szüneteltetése",
+    "schedule_services_desc": "Állítsa be a szolgáltatásblokkoló szűrő szüneteltetési ütemezését",
+    "schedule_services_desc_client": "Állítsa be a szolgáltatásblokkoló szűrő szüneteltetési ütemezését ehhez az ügyfélhez",
+    "schedule_desc": "Inaktivitási időszakok beállítása a blokkolt szolgáltatásokhoz",
+    "schedule_invalid_select": "A kezdési időpontnak a befejezési időpont előtt kell lennie",
+    "schedule_select_days": "Napok kiválasztása",
+    "schedule_timezone": "Válasszon időzónát",
+    "schedule_current_timezone": "Jelenlegi időzóna: {{value}}",
+    "schedule_time_all_day": "Egész nap",
+    "schedule_modal_description": "Ez az ütemezés felváltja a hét ugyanazon napjára vonatkozó meglévő ütemezéseket. A hét minden napján csak egy inaktivitási időszak lehet.",
+    "schedule_modal_time_off": "Nincs szolgáltatás blokkolás:",
+    "schedule_new": "Új ütemezés",
+    "schedule_edit": "Ütemezés szerkesztése",
+    "schedule_save": "Ütemezés mentése",
+    "schedule_add": "Ütemezés hozzáadása",
+    "schedule_remove": "Ütemezés eltávolítása",
+    "schedule_from": "Ettől:",
+    "schedule_to": "Eddig:",
+    "sunday": "Vasárnap",
+    "monday": "Hétfő",
+    "tuesday": "Kedd",
+    "wednesday": "Szerda",
+    "thursday": "Csütörtök",
+    "friday": "Péntek",
+    "saturday": "Szombat",
+    "sunday_short": "Vas",
+    "monday_short": "Hét",
+    "tuesday_short": "Kedd",
+    "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"
 }
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Penyeimbang beban",
    "load_balancing_desc": "Permintaan satu server pada satu waktu. AdGuard Home akan menggunakan algoritma acak tertimbang untuk memilih server sehingga server tercepat akan lebih sering digunakan.",
    "bootstrap_dns": "Server DNS bootstrap",
-    "bootstrap_dns_desc": "Server Bootstrap DNS dapat digunakan untuk meresolve alamat IP pada DoH/DoT resolvers yang Anda tentukan sebagai upstreams.",
+    "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 DNS hulu tidak merespons. Sintaksnya sama dengan bidang 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 server per baris",
+    "local_ptr_placeholder": "Masukkan satu alamat IP 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",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Malware/phishing diblokir",
    "stats_adult": "Situs dewasa diblokir",
    "stats_query_domain": "Kueri domain teratas",
-    "for_last_24_hours": "untuk 24 jam terakhir",
+    "for_last_hours": "selama {{count}} jam terakhir",
+    "for_last_hours_plural": "selama {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Klien teratas",
    "no_clients_found": "Tidak ditemukan klien",
    "general_statistics": "Statistik umum",
+    "top_upstreams": "Top servers upstream",
+    "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_24_hours": "Jumlah kueri DNS diproses selama 24 jam 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": "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": "Waktu respons server upstream rata-rata",
+    "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 di pengaturan <a>Penyaringan</a>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Diatur dalam {{path}}",
    "test_upstream_btn": "Uji hulu",
    "upstreams": "Upstream",
+    "upstream": "Server upstream",
    "apply_btn": "Terapkan",
    "disabled_filtering_toast": "Penyaringan nonaktif",
    "enabled_filtering_toast": "Penyaringan aktif",
@@ -167,6 +180,7 @@
    "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",
@@ -256,12 +270,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": "Retensi kueri log",
+    "query_log_retention": "Rotasi 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 retensi kueri log? Jika Anda menurunkan nilai interval, beberapa data akan hilang",
+    "query_log_retention_confirm": "Apakah Anda yakin ingin mengubah rotasi 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",
@@ -275,6 +289,9 @@
    "custom_ip": "Custom IP",
    "blocking_ipv4": "Blokiran IPv4",
    "blocking_ipv6": "Blokiran IPv6",
+    "blocked_response_ttl": "Respon TLL diblokir",
+    "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",
@@ -290,7 +307,19 @@
    "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 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/",
@@ -393,7 +422,7 @@
    "encryption_issuer": "Penerbit",
    "encryption_hostnames": "Nama host",
    "encryption_reset": "Anda yakin ingin mengatur ulang pengaturan enkripsi?",
-    "encryption_warning": "Perhatian",
+    "encryption_warning": "Peringatan",
    "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",
@@ -441,7 +470,7 @@
    "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": "Perangkat yang tidak ada dalam daftar klien Persisten yang mungkin masih menggunakan AdGuard Home",
+    "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.",
    "access_title": "Pengaturan akses",
    "access_desc": "Disini anda dapat mengatur aturan akses untuk server AdGuard Home DNS",
    "access_allowed_title": "Klien yang diizinkan",
@@ -454,6 +483,7 @@
    "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-over-TLS:</0> Memakai <1>{{address}}</1> string.",
    "setup_dns_privacy_2": "<0>DNS-over-TLS:</0> Memakai <1>{{address}}</1> string.",
@@ -474,7 +504,9 @@
    "setup_dns_notice": "Jikalau ingin menggunakan <1>DNS-over-HTTPS</1> atau <1>DNS-over-TLS</1>, Anda perlu <0>mengatur Enkripsi</0> pada pengaturan AdGuard Home.",
    "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": "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}}\"?",
    "rewrite_desc": "Memungkinkan untuk dengan mudah mengkonfigurasi respons DNS kustom untuk nama domain tertentu.",
@@ -522,6 +554,10 @@
    "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",
    "interval_hours_plural": "{{count}} jam",
    "filters_configuration": "Konfigurasi filter",
@@ -554,7 +590,7 @@
    "rewrite_A": "<0>A</0>: nilai khusus, biarkan <0>A</0> merekam dari upstream",
    "rewrite_AAAA": "<0>AAAA</0>: nilai khusus, biarkan <0>AAAA</0> merekam dari upstream",
    "disable_ipv6": "Nonaktifkan penyelesaian alamat IPv6",
-    "disable_ipv6_desc": "Jatuhkan semua kueri DNS untuk alamat IPv6 (ketik AAAA).",
+    "disable_ipv6_desc": "Hapus semua kueri DNS untuk alamat IPv6 (ketik AAAA) dan hapus petunjuk IPv6 dari respons HTTPS.",
    "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.",
@@ -637,9 +673,69 @@
    "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 minimal {{value}} karakter",
+    "form_error_password_length": "Kata sandi harus terdiri dari {{min}} hingga {{max}}",
    "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 dibersihkan",
-    "clear_cache": "Hapus cache"
+    "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",
+    "schedule_desc": "Tetapkan periode tidak aktif untuk layanan yang diblokir",
+    "schedule_invalid_select": "Waktu mulai harus sebelum waktu akhir",
+    "schedule_select_days": "Pilih hari",
+    "schedule_timezone": "Pilih zona waktu",
+    "schedule_current_timezone": "Zona waktu saat ini: {{value}}",
+    "schedule_time_all_day": "Sepanjang hari",
+    "schedule_modal_description": "Jadwal ini akan menggantikan jadwal sekarang untuk hari yang sama. Setiap hari di setiap minggu hanya boleh ada satu periode tidak aktif.",
+    "schedule_modal_time_off": "Tidak ada pemblokiran layanan:",
+    "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 upstream kustom klien ini",
+    "dns_cache_size": "Ukuran cache DNS, dalam byte"
 }
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Bilanciamento del carico",
    "load_balancing_desc": "Interroga un server upstream per volta. AdGuard Home utilizzerà un algoritmo casuale ponderato per la selezione del server, in maniera tale da scegliere spesso il più veloce.",
    "bootstrap_dns": "Server DNS bootstrap",
-    "bootstrap_dns_desc": "I server DNS di bootstrap sono utilizzati per risolvere gli indirizzi IP dei risolutori DoH/DoT specificati come upstream.",
+    "bootstrap_dns_desc": "Indirizzi IP dei server DNS utilizzati per risolvere gli indirizzi IP dei resolver DoH/DoT specificati come upstream. I commenti non sono ammessi.",
+    "fallback_dns_title": "Server DNS di fallback",
+    "fallback_dns_desc": "Elenco dei server DNS fallback utilizzati quando i server DNS upstream non rispondono. La sintassi è la stessa del campo principale upstream sopra.",
+    "fallback_dns_placeholder": "Inserisci un server DNS fallback per riga",
    "local_ptr_title": "Server DNS privati inversi",
    "local_ptr_desc": "I server DNS che AdGuard Home utilizza per le richieste PTR locali. Questi server vengono utilizzati per risolvere i nomi host dei client con indirizzi IP privati, ad esempio \"192.168.12.34\", utilizzando il DNS inverso. Se non è impostato, AdGuard Home utilizzerà gli indirizzi dei resolutori DNS predefiniti del tuo sistema operativo ad eccezione degli indirizzi di AdGuard Home stesso.",
    "local_ptr_default_resolver": "Per impostazione predefinita, AdGuard Home utilizzerà i seguenti risolutori DNS inversi: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home non è stato in grado di determinare i risolutori DNS inversi privati adatti per questo sistema.",
-    "local_ptr_placeholder": "Inserisci un indirizzo server per riga",
+    "local_ptr_placeholder": "Inserisci un indirizzo IP per riga",
    "resolve_clients_title": "Attiva la risoluzione inversa degli indirizzi IP dei client",
    "resolve_clients_desc": "Risolve inversamente gli indirizzi IP dei client nei loro nomi host inviando richieste PTR ai risolutori corrispondenti (server DNS privati per client locali, server upstream per client con indirizzi IP pubblici).",
    "use_private_ptr_resolvers_title": "Utilizza dei resolver rDNS privati",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Malware/phishing bloccati",
    "stats_adult": "Siti per adulti bloccati",
    "stats_query_domain": "Domini maggiormente richiesti",
-    "for_last_24_hours": "nelle ultime 24 ore",
+    "for_last_hours": "per l'ultima {{count}} ora",
+    "for_last_hours_plural": "per le ultime {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Client più utilizzati",
    "no_clients_found": "Nessun client trovato",
    "general_statistics": "Statistiche generali",
+    "top_upstreams": "Top upstream",
+    "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_24_hours": "Numero di richieste DNS elaborate nelle ultime 24 ore",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Configurato su {{path}}",
    "test_upstream_btn": "Testa gli upstream",
    "upstreams": "Upstream",
+    "upstream": "Upstream",
    "apply_btn": "Applica",
    "disabled_filtering_toast": "Disattiva filtri",
    "enabled_filtering_toast": "Attiva filtri",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Il registro richieste è stato correttamente cancellato",
    "query_log_updated": "Il registro richieste è stato correttamente aggiornato",
    "query_log_clear": "Cancella registri richieste",
-    "query_log_retention": "Conservazione dei registri richieste",
+    "query_log_retention": "Rotazione dei registri richieste",
    "query_log_enable": "Attiva registro",
    "query_log_configuration": "Configurazione registri",
    "query_log_disabled": "Il registro richieste è stato disattivato e può essere configurata dalle <0>impostazioni</0>",
    "query_log_strict_search": "Utilizzare le doppie virgolette per una ricerca precisa",
-    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
+    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se si riduce il valore dell'intervallo, alcuni dati andranno persi",
    "anonymize_client_ip": "Anonimizza client IP",
    "anonymize_client_ip_desc": "Non salvare l'indirizzo IP completo del client nel registro o nelle statistiche",
    "dns_config": "Configurazione server DNS",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Sei sicuro di voler eliminare il client \"{{key}}\"?",
    "list_confirm_delete": "Sei sicuro di voler eliminare questo elenco?",
    "auto_clients_title": "Client in tempo reale",
-    "auto_clients_desc": "Dispositivi non presenti nell'elenco dei client Persistenti che possono ancora utilizzare AdGuard Home",
+    "auto_clients_desc": "Informazioni sugli indirizzi IP dei dispositivi che utilizzano o potrebbero utilizzare AdGuard Home. Queste informazioni vengono raccolte da diverse fonti, inclusi file host, DNS inverso, ecc.",
    "access_title": "Impostazioni di accesso",
    "access_desc": "Qui puoi configurare le regole d'accesso per il server DNS di AdGuard Home",
    "access_allowed_title": "Client permessi",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Per utilizzare <1>DNS su HTTPS</1> o <1>DNS su TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
    "rewrite_added": "Riscrittura DNS per \"{{key}}\" aggiunta correttamente",
    "rewrite_deleted": "La riscrittura DNS per \"{{key}}\" è stata eliminata correttamente",
+    "rewrite_updated": "Riscrittura DNS aggiornata correttamente",
    "rewrite_add": "Aggiungi la riscrittura DNS",
+    "rewrite_edit": "Modifica della riscrittura DNS",
    "rewrite_not_found": "Nessuna riscrittura DNS trovata",
    "rewrite_confirm_delete": "Sei sicuro di voler cancellare la riscrittura DNS per \"{{key}}\"?",
    "rewrite_desc": "Consente di configurare facilmente la risposta DNS personalizzata per un nome di dominio specifico.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Attiva statistiche",
    "ignore_domains": "Domini ignorati (separati da nuova riga)",
    "ignore_domains_title": "Domini ignorati",
-    "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",
+    "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",
    "interval_hours": "{{count}} ora",
    "interval_hours_plural": "{{count}} ore",
    "filters_configuration": "Configurazione filtri",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: valore speciale, mantieni registrazioni <0>A</0> dall'upstream",
    "rewrite_AAAA": "<0>AAAA</0>: valore speciale, mantieni registrazioni <0>AAAA</0> dall'upstream",
    "disable_ipv6": "Disattiva risoluzione indirizzi IPv6",
-    "disable_ipv6_desc": "Elimina tutte le richieste DNS per gli indirizzi IPv6 (tipo AAAA).",
+    "disable_ipv6_desc": "Eliminare tutte le query DNS per gli indirizzi IPv6 (tipo AAAA) e rimuovere i suggerimenti IPv6 dalle risposte HTTPS.",
    "fastest_addr": "Indirizzo IP più veloce",
    "fastest_addr_desc": "Interroga tutti i server DNS e restituisci l'indirizzo IP più veloce tra tutte le risposte. Ciò rallenterà le richieste DNS poiché AdGuard Home dovrà attendere le risposte da tutti i server DNS, ma ciò migliorerà complessivamente la connettività.",
    "autofix_warning_text": "Se fai clic su \"Correggi\", AdGuardHome configurerà il tuo sistema per utilizzare il server DNS AdGuardHome.",
@@ -645,7 +673,7 @@
    "parental_control": "Controllo Parentale",
    "safe_browsing": "Navigazione Sicura",
    "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
-    "form_error_password_length": "La password deve contenere almeno {{value}} caratteri",
+    "form_error_password_length": "La password deve contenere da {{min}} a {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Disattiva la protezione per {{count}} ora",
    "disable_notify_for_hours_plural": "Disattiva la protezione per {{count}} ore",
    "disable_notify_until_tomorrow": "Disattiva la protezione fino a domani",
-    "enable_protection_timer": "La protezione verrà attivata in {{time}}"
+    "enable_protection_timer": "La protezione verrà attivata in {{time}}",
+    "custom_retention_input": "Inserisci la conservazione in ore",
+    "custom_rotation_input": "Inserisci la rotazione in ore",
+    "protection_section_label": "Protezione",
+    "log_and_stats_section_label": "Registro richieste e statistiche",
+    "ignore_query_log": "Ignora questo client nel registro delle richieste",
+    "ignore_statistics": "Ignora questo cliente nelle statistiche",
+    "schedule_services": "Sospendere il blocco del servizio",
+    "schedule_services_desc": "Configura la pianificazione della pausa del filtro di blocco dei servizi",
+    "schedule_services_desc_client": "Configura la pianificazione della pausa del filtro di blocco dei servizi per questo client",
+    "schedule_desc": "Impostare periodi di inattività per i servizi bloccati",
+    "schedule_invalid_select": "L'ora di inizio deve essere precedente all'ora di fine",
+    "schedule_select_days": "Selezionare i giorni",
+    "schedule_timezone": "Selezionare un fuso orario",
+    "schedule_current_timezone": "Fuso orario attuale: {{value}}",
+    "schedule_time_all_day": "Tutto il giorno",
+    "schedule_modal_description": "Questo pianificazione sostituirà tutti gli orari esistenti per lo stesso giorno della settimana. Ogni giorno della settimana può avere un solo periodo d'inattività.",
+    "schedule_modal_time_off": "Sospendere il blocco del servizio:",
+    "schedule_new": "Nuovo programma",
+    "schedule_edit": "Modificare programma",
+    "schedule_save": "Salvare programma",
+    "schedule_add": "Aggiungere programma",
+    "schedule_remove": "Rimuovere programma",
+    "schedule_from": "Dal",
+    "schedule_to": "Al",
+    "sunday": "Domenica",
+    "monday": "Lunedi",
+    "tuesday": "Martedì",
+    "wednesday": "Mercoledì",
+    "thursday": "Giovedì",
+    "friday": "Venerdì",
+    "saturday": "Sabato",
+    "sunday_short": "Dom",
+    "monday_short": "Lun",
+    "tuesday_short": "Mar",
+    "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)"
 }
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -1,22 +1,26 @@
 {
    "client_settings": "クライアント設定",
    "example_upstream_reserved": "<0>特定のドメイン</0>に対してDNSアップストリームを指定できます。",
+    "example_multiple_upstreams_reserved": "<0>特定ドメイン</0>のための複数のアップストリームサーバー;",
    "example_upstream_comment": "コメントを追加できます。",
    "upstream_parallel": "並列リクエストを使用する（同時にすべてのアップストリームサーバーに処理要求することで解決スピードが向上）",
    "parallel_requests": "並列リクエスト",
    "load_balancing": "ロードバランシング",
    "load_balancing_desc": "一度に1つのアップストリームサーバに処理要求します。 AdGuard Homeは、重み付きランダムアルゴリズム（weighted random algorithm）を使用してサーバを選択するため、最速のサーバがより頻繁に使用されます。",
    "bootstrap_dns": "ブートストラップDNSサーバ",
-    "bootstrap_dns_desc": "ブートストラップDNSサーバは、上流として指定したDoH／DoTリゾルバのIPアドレスを解決するために使用されます。",
+    "bootstrap_dns_desc": "アップストリームとして指定したDoH/DoTリゾルバのIPアドレスを解決するために使用されるDNSサーバーのIPアドレスです。（コメントは許可されていません）",
+    "fallback_dns_title": "フォールバックDNSサーバー",
+    "fallback_dns_desc": "アップストリームDNSサーバーが応答しない場合に使用されるフォールバックDNSサーバーのリストです。構文は上記のmain upstreamsフィールドと同じです。",
+    "fallback_dns_placeholder": "フォールバックDNSサーバーを1行に1つずつ入力してください。",
    "local_ptr_title": "プライベートリバースDNSサーバー",
    "local_ptr_desc": "AdGuard HomeがローカルPTRクエリに使用するDNSサーバーです。これらのサーバーは、rDNSを使ってプライベートIPアドレス（例えば\"192.168.12.34\"）を持つクライアントのホスト名を解決するために使用されます。設定されていない場合、AdGuard HomeはOSのデフォルトDNSリゾルバーのアドレス（AdGuard Home自体のアドレスを除く）を自動的に使用します。",
    "local_ptr_default_resolver": "デフォルトでは、AdGuard Homeは次のリバースDNSリゾルバを使用します: {{ip}}",
    "local_ptr_no_default_resolver": "AdGuard Homeは、このシステムに適したプライベートリバースDNSリゾルバを特定できませんでした。",
-    "local_ptr_placeholder": "1行に1つのサーバを入力してください。",
+    "local_ptr_placeholder": "IPアドレスを1行に1つずづ入力してください。",
    "resolve_clients_title": "クライアントのIPアドレスの逆解決を有効にする",
-    "resolve_clients_desc": "対応するリゾルバー（ローカルクライアントの場合はプライベートDNSサーバ、パブリックIPを持つクライアントの場合は上流サーバ）にPTRクエリを送信することにより、クライアントのIPアドレスをホストネームに逆解決します。",
+    "resolve_clients_desc": "対応するリゾルバー（ローカルクライアントの場合はプライベートDNSサーバ、パブリックIPを持つクライアントの場合はアップストリームサーバー）にPTRクエリを送信することにより、クライアントのIPアドレスをホストネームに逆解決します。",
    "use_private_ptr_resolvers_title": "プライベートリバースDNSリゾルバを使用",
-    "use_private_ptr_resolvers_desc": "これらの上流サーバを使用して、ローカルで提供されるアドレスのリバースDNSルックアップを実行します。無効にすると、AdGuard Homeは、DHCP, /etc/hosts などから認識されるクライアントを除き、すべてのこのようなPTR要求にNXDOMAINで応答します。",
+    "use_private_ptr_resolvers_desc": "これらのアップストリームサーバーを使用して、ローカルで提供されるアドレスのリバースDNSルックアップを実行します。無効にすると、AdGuard Homeは、DHCP, /etc/hosts などから認識されるクライアントを除き、すべてのこのようなPTR要求にNXDOMAINで応答します。",
    "check_dhcp_servers": "DHCPサーバをチェックする",
    "save_config": "構成を保存する",
    "enabled_dhcp": "DHCPサーバを有効にしました",
@@ -70,7 +74,9 @@
    "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": "すべてのリースをリセットする",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "ブロックされたマルウェア／フィッシング",
    "stats_adult": "ブロックされたアダルトウェブサイト",
    "stats_query_domain": "最も問合せされたドメイン",
-    "for_last_24_hours": "過去24時間以内",
+    "for_last_hours": "過去{{count}}時間",
+    "for_last_hours_plural": "過去{{count}}時間",
    "for_last_days": "過去{{count}}日間以内",
    "for_last_days_plural": "過去{{count}}日間以内",
    "stats_disabled": "統計は無効化されています。<0>設定ページ</0>でオンにすることができます。",
@@ -125,15 +132,20 @@
    "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_24_hours": "過去24時間に処理されたDNSクエリの数",
+    "number_of_dns_query_hours": "過去{{count}}時間に処理されたDNSクエリの数",
+    "number_of_dns_query_hours_plural": "過去{{count}}時間に処理された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": "応答時間",
    "average_processing_time_hint": "DNSリクエストの処理にかかる平均時間（ミリ秒単位）",
    "block_domain_use_filters_and_hosts": "フィルタとhostsファイルを使用してドメインをブロックする",
    "filters_block_toggle_hint": "<a>フィルタ</a>の設定でブロックするルールを設定することができます。",
@@ -153,11 +165,12 @@
    "custom_filtering_rules": "カスタム・フィルタリングルール",
    "encryption_settings": "暗号化設定",
    "dhcp_settings": "DHCP設定",
-    "upstream_dns": "上流DNSサーバ",
-    "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。上流DNSサーバの構成設定について詳しくは<a>こちら</a>でご確認いただけます。",
+    "upstream_dns": "アップストリームDNSサーバー",
+    "upstream_dns_help": "サーバのアドレスは1行に1つずつ入力してください。アップストリームDNSサーバーの構成設定について詳しくは<a>こちら</a>でご確認いただけます。",
    "upstream_dns_configured_in_file": "{{path}} にて設定されています",
-    "test_upstream_btn": "上流サーバをテストする",
-    "upstreams": "上流",
+    "test_upstream_btn": "アップストリームをテストする",
+    "upstreams": "アップストリーム",
+    "upstream": "アップストリーム",
    "apply_btn": "適用する",
    "disabled_filtering_toast": "フィルタリングを無効にしました",
    "enabled_filtering_toast": "フィルタリングを有効にしました",
@@ -220,7 +233,7 @@
    "example_upstream_tcp_port": "レギュラーDNS（over TCP、ポート付き);",
    "example_upstream_tcp_hostname": "通常のDNS（over TCP, ホスト名）。",
    "all_lists_up_to_date_toast": "すべてのリストは既に最新です",
-    "updated_upstream_dns_toast": "上流DNSサーバを保存しました。",
+    "updated_upstream_dns_toast": "アップストリームサーバーを保存しました。",
    "dns_test_ok_toast": "指定されたDNSサーバは正しく動作しています",
    "dns_test_not_ok_toast": "サーバ \"{{key}}\": 使用できませんでした。正しく入力されているかどうかを確認してください",
    "dns_test_warning_toast": "アップストリーム\"{{key}}\"はテストリクエストに応答せず、正しく動作しない可能性があります。",
@@ -257,12 +270,12 @@
    "query_log_cleared": "クエリ・ログの消去に成功しました",
    "query_log_updated": "クエリ・ログの更新が成功しました",
    "query_log_clear": "クエリ・ログを消去する",
-    "query_log_retention": "クエリ・ログの保持",
+    "query_log_retention": "クエリ・ログのローテーション",
    "query_log_enable": "ログを有効にする",
    "query_log_configuration": "ログ設定",
    "query_log_disabled": "クエリ・ログは無効になっており、<0>設定</0>で構成できます",
    "query_log_strict_search": "完全一致検索には二重引用符を使用します",
-    "query_log_retention_confirm": "クエリ・ログの保持を変更してもよろしいですか？ 期間を短くすると、一部のデータが失われます",
+    "query_log_retention_confirm": "クエリ・ログのローテーションを変更してもよろしいですか？ 間隔の値を減らすと、一部のデータが失われます",
    "anonymize_client_ip": "クライアントIPを匿名化する",
    "anonymize_client_ip_desc": "ログと統計にクライアントのフルIPアドレスを保存しないようにします。",
    "dns_config": "DNSサーバ設定",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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アドレスで応答します。",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "クライアント \"{{key}}\" を削除してもよろしいですか？",
    "list_confirm_delete": "このリストを削除してもよろしいですか？",
    "auto_clients_title": "ランタイムクライアント",
-    "auto_clients_desc": "永続的クライアントのリストに未登録で、AdGuard Homeを使用する場合があるデバイスのリスト。",
+    "auto_clients_desc": "AdGuard Home を使用している、または使用する可能性のあるデバイスの IP アドレスに関する情報です。この情報は、hosts ファイル、リバース DNS など、複数の情報源から収集されます。",
    "access_title": "アクセス設定",
    "access_desc": "こちらでは、AdGuard Home DNSサーバーのアクセスルールを設定できます。",
    "access_allowed_title": "許可されたクライアント",
@@ -478,7 +504,9 @@
    "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 を更新完了しました。",
    "rewrite_add": "DNS書き換え情報を追加する",
+    "rewrite_edit": "DNS rewrite を編集する",
    "rewrite_not_found": "DNS書き換え情報はありません",
    "rewrite_confirm_delete": "\"{{key}}\" のDNS書き換え情報を削除してもよろしいですか？",
    "rewrite_desc": "特定のドメイン名に対するDNS応答を簡単にカスタマイズすることを可能にします。",
@@ -528,8 +556,8 @@
    "statistics_enable": "統計を有効にする",
    "ignore_domains": "無視するドメイン（それぞれ改行で区切ってください)",
    "ignore_domains_title": "無視するドメイン",
-    "ignore_domains_desc_stats": "これらのドメインへのクエリは統計に書き込まれません。",
-    "ignore_domains_desc_query": "これらのドメインへのクエリはクエリログに書き込まれません。",
+    "ignore_domains_desc_stats": "これらのルールに一致するクエリは統計に書き込まれません。",
+    "ignore_domains_desc_query": "これらのルールに一致するクエリはクエリログに書き込まれません。",
    "interval_hours": "{{count}}時間",
    "interval_hours_plural": "{{count}}時間",
    "filters_configuration": "フィルタ設定",
@@ -562,7 +590,7 @@
    "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クエリをドロップします。",
+    "disable_ipv6_desc": "IPv6アドレス（タイプAAAA）に対するDNSクエリをすべて破棄し、HTTPS応答から IPv6 hint を削除します。",
    "fastest_addr": "最速のIPアドレス",
    "fastest_addr_desc": "すべてのDNSサーバーに処理要求し、全応答の中で最速のIPアドレスを返します。これにより、AdGuard HomeがすべてのDNSサーバーからの応答を待つ必要があるため、DNSクエリが遅くなりますが、全体的な接続性は向上します。",
    "autofix_warning_text": "「修正」をクリックすると、AdGuardHomeはAdGuardHome DNSサーバを使用するようにシステムを構成します。",
@@ -621,7 +649,7 @@
    "enter_cache_size": "キャッシュサイズ（バイト単位）を入力してください",
    "enter_cache_ttl_min_override": "最小TTL（秒単位）を入力してください",
    "enter_cache_ttl_max_override": "最大TTL（秒単位）を入力してください",
-    "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、上流サーバから受信した短いTTL（秒単位）を延長します。",
+    "cache_ttl_min_override_desc": "DNS応答をキャッシュするとき、アップストリームサーバーから受信した短いTTL（秒単位）を延長します。",
    "cache_ttl_max_override_desc": "DNSキャッシュ内のエントリの最大TTL（秒単位）を設定します。",
    "ttl_cache_validation": "最小キャッシュTTL上書き値は最大値以下にする必要があります",
    "cache_optimistic": "Optimistic cashing (オプティミスティック・キャッシュ)",
@@ -645,7 +673,7 @@
    "parental_control": "ペアレンタルコントロール",
    "safe_browsing": "セーフブラウジング",
    "served_from_cache": "{{value}} <i>(キャッシュから応答)</i>",
-    "form_error_password_length": "パスワードは{{value}}文字以上にしてください",
+    "form_error_password_length": "パスワードの長さは{{min}}〜{{max}}文字にしてください。",
    "anonymizer_notification": "【<0>注意</0>】IPの匿名化が有効になっています。 <1>一般設定</1>で無効にできます。",
    "confirm_dns_cache_clear": "DNS キャッシュをクリアしてもよろしいですか？",
    "cache_cleared": "DNSキャッシュのクリア完了です。",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "保護を {{count}} 時間無効にする",
    "disable_notify_for_hours_plural": "保護を {{count}} 時間無効にする",
    "disable_notify_until_tomorrow": "明日まで保護を無効にする",
-    "enable_protection_timer": "保護は後 {{time}} で有効になります"
+    "enable_protection_timer": "保護は後 {{time}} で有効になります",
+    "custom_retention_input": "保持期間を入力してください（時間単位）",
+    "custom_rotation_input": "ローテーションを入力してください（時間単位）",
+    "protection_section_label": "AdGuardによる保護",
+    "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": "※このスケジュールは、同じ曜日に対する既存スケジュールがある場合、すべて置き換えます。\n各曜日ごとに設定できる非アクティブ期間は一つに限ります。",
+    "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": "Upstream DNS cache configuration（アップストリームDNSキャッシュの構成）",
+    "enable_upstream_dns_cache": "このクライアントのカスタムアップストリーム構成に対してDNSキャッシュを有効にする",
+    "dns_cache_size": "DNSキャッシュサイズ（バイト単位）"
 }
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -1,18 +1,22 @@
 {
    "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": "부트스트랩 DNS 서버",
-    "bootstrap_dns_desc": "부트스트랩 DNS 서버는 업스트림으로 지정한 DoH/DoT 서버의 IP 주소를 확인하는 데 사용합니다.",
+    "bootstrap_dns_desc": "업스트림으로 지정한 DoH/DoT 리졸버의 IP 주소를 확인하는 데 사용되는 DNS 서버의 IP 주소입니다. 주석은 허용되지 않습니다.",
+    "fallback_dns_title": "폴백 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 리졸버의 주소를 사용합니다.",
    "local_ptr_default_resolver": "기본적으로 AdGuard Home에서는 {{ip}} 역방향 DNS 서버를 이용합니다.",
    "local_ptr_no_default_resolver": "AdGuard Home에서 이 시스템에 적합한 사설 역방향 프라이빗 DNS 서버를 결정할 수 없습니다.",
-    "local_ptr_placeholder": "한 줄에 하나씩 서버 주소 입력",
+    "local_ptr_placeholder": "한 줄에 하나씩 IP 주소를 입력하세요.",
    "resolve_clients_title": "클라이언트 IP 주소에 대한 호스트명 확인 활성화",
    "resolve_clients_desc": "해당 서버에 대한 PTR 쿼리를 통해 클라이언트의 도메인 이름을 정의합니다. (로컬 클라이언트의 경우 프라이빗 DNS 서버, 공용 IP 주소가 있는 클라이언트의 경우 업스트림 서버).",
    "use_private_ptr_resolvers_title": "프라이빗 역방향 DNS 리졸버 사용",
@@ -70,7 +74,9 @@
    "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": "모든 임대 초기화",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "차단된 멀웨어/피싱",
    "stats_adult": "차단된 성인 웹사이트",
    "stats_query_domain": "쿼리 도메인",
-    "for_last_24_hours": "지난 24시간 동안",
+    "for_last_hours": "마지막 {{count}} 시간",
+    "for_last_hours_plural": "마지막 {{count}} 시간의 기록",
    "for_last_days": "마지막 {{count}} 일",
    "for_last_days_plural": "마지막 {{count}} 일의 기록",
    "stats_disabled": "통계 기능이 꺼졌습니다. <0>설정 페이지</0>에서 켤 수 있습니다.",
@@ -125,15 +132,20 @@
    "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_24_hours": "최근 24시간 동안 처리된 DNS 쿼리의 수",
+    "number_of_dns_query_hours": "최근 {{count}}시간 동안 처리된 DNS 쿼리의 수",
+    "number_of_dns_query_hours_plural": "최근 {{count}}시간 동안 처리된 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": "응답 시간",
    "average_processing_time_hint": "DNS 요청 처리시 평균 시간(밀리초)",
    "block_domain_use_filters_and_hosts": "필터 및 호스트 파일을 사용하여 도메인 차단",
    "filters_block_toggle_hint": "차단규칙<a>필터</a>을 설정할 수 있습니다.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "{{path}}에서 구성됨",
    "test_upstream_btn": "업스트림 테스트",
    "upstreams": "업스트림",
+    "upstream": "업스트림",
    "apply_btn": "적용",
    "disabled_filtering_toast": "필터링 비활성화됨",
    "enabled_filtering_toast": "필터링 활성화됨",
@@ -257,12 +270,12 @@
    "query_log_cleared": "쿼리 로그를 성공적으로 초기화했습니다",
    "query_log_updated": "질의 로그가 성공적으로 업데이트되었습니다",
    "query_log_clear": "쿼리 로그 비우기",
-    "query_log_retention": "쿼리 로그 저장 기간",
+    "query_log_retention": "쿼리 로그 로테이션",
    "query_log_enable": "로그 활성화",
    "query_log_configuration": "로그 구성",
    "query_log_disabled": "쿼리 로그가 비활성화되어 있으며 <0>설정</0>에서 설정할 수 있습니다",
    "query_log_strict_search": "검색을 제한하려면 쌍따옴표를 사용해주세요",
-    "query_log_retention_confirm": "정말로 쿼리 로그 저장 기간을 변경하시겠습니까? 저장 주기를 낮출 경우, 일부 데이터가 손실됩니다",
+    "query_log_retention_confirm": "쿼리 로그 로테이션을 변경하시겠습니까? 간격 값을 줄이면 일부 데이터가 손실됩니다.",
    "anonymize_client_ip": "클라이언트 IP 익명화",
    "anonymize_client_ip_desc": "클라이언트의 전체 IP 주소를 로그와 통계에 저장하저장하지 마세요",
    "dns_config": "DNS 서버 설정",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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 주소로 응답합니다",
@@ -396,7 +422,7 @@
    "encryption_issuer": "발행자",
    "encryption_hostnames": "호스트 이름",
    "encryption_reset": "암호화 설정을 재설정하시겠습니까?",
-    "encryption_warning": "경고",
+    "encryption_warning": "주의",
    "topline_expiring_certificate": "SSL 인증서가 곧 만료됩니다. 업데이트<0> 암호화 설정</0>.",
    "topline_expired_certificate": "SSL 인증서가 만료되었습니다. 업데이트<0> 암호화 설정</0>.",
    "form_error_port_range": "80-65535 범위의 포트 번호를 입력하세요",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "정말 클라이언트 '{{key}}'을(를) 삭제하시겠습니까?",
    "list_confirm_delete": "정말로 이 목록을 제거하시겠습니까?",
    "auto_clients_title": "런타임 클라이언트",
-    "auto_clients_desc": "AdGuard Home을 계속 사용할 수 있는 영구 클라이언트 목록에 없는 디바이스입니다",
+    "auto_clients_desc": "AdGuard Home을 사용 중이거나 사용할 수 있는 기기의 IP 주소에 대한 정보가 표시됩니다. 이 정보는 호스트 파일, 역방향 DNS 등 여러 소스에서 수집됩니다.",
    "access_title": "접근 설정",
    "access_desc": "여기에서 AdGuard Home DNS 서버에 대한 액세스 규칙을 설정할 수 있습니다",
    "access_allowed_title": "허용된 클라이언트",
@@ -478,7 +504,9 @@
    "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 변경 정보를 찾을 수 없습니다",
    "rewrite_confirm_delete": "'{{key}}'에 대한 DNS 변경 정보를 삭제하시겠습니까?",
    "rewrite_desc": "특정 도메인 이름에 대한 사용자 지정 DNS 응답을 쉽게 구성할 수 있습니다.",
@@ -528,8 +556,8 @@
    "statistics_enable": "통계 활성화",
    "ignore_domains": "무시된 도메인(줄 바꿈으로 구분)",
    "ignore_domains_title": "무시된 도메인",
-    "ignore_domains_desc_stats": "이러한 도메인에 대한 쿼리는 통계에 기록되지 않습니다.",
-    "ignore_domains_desc_query": "이러한 도메인에 대한 쿼리는 쿼리 로그에 기록되지 않습니다.",
+    "ignore_domains_desc_stats": "이러한 규칙과 일치하는 쿼리는 통계에 기록되지 않습니다.",
+    "ignore_domains_desc_query": "이러한 규칙과 일치하는 쿼리는 쿼리 로그에 기록되지 않습니다.",
    "interval_hours": "{{count}} 시간",
    "interval_hours_plural": "{{count}} 시간",
    "filters_configuration": "필터 구성",
@@ -562,7 +590,7 @@
    "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 쿼리가 무시됩니다.",
+    "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 서버를 사용하도록 시스템을 설정합니다.",
@@ -645,7 +673,7 @@
    "parental_control": "자녀 보호",
    "safe_browsing": "세이프 브라우징",
    "served_from_cache": "{{value}} <i>(캐시에서 제공)</i>",
-    "form_error_password_length": "비밀번호는 {{value}}자 이상이어야 합니다",
+    "form_error_password_length": "비밀번호는 {{min}}~{{max}}자 길이여야 합니다.",
    "anonymizer_notification": "<0>참고:</0> IP 익명화가 활성화되었습니다. <1>일반 설정</1>에서 비활성화할 수 있습니다.",
    "confirm_dns_cache_clear": "정말로 DNS 캐시를 지우시겠습니까?",
    "cache_cleared": "DNS 캐시를 성공적으로 지웠습니다",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "{{count}}시간 동안 보호 기능 비활성화",
    "disable_notify_for_hours_plural": "{{count}}시간 동안 보호 기능 비활성화",
    "disable_notify_until_tomorrow": "내일까지 보호 기능 비활성화",
-    "enable_protection_timer": "{{time}}에 보호 기능이 활성화됩니다."
+    "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 캐시 크기(바이트)"
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Volume balanceren",
    "load_balancing_desc": "Eén server per keer bevragen. AdGuard Home gebruikt hiervoor een gewogen willekeurig algoritme om de server te kiezen zodat de snelste server meer zal gebruikt worden.",
    "bootstrap_dns": "Bootstrap DNS-servers",
-    "bootstrap_dns_desc": "Bootstrap DNS-servers worden gebruikt om IP-adressen op te lossen van de DoH / DoT-resolvers die u opgeeft als upstreams.",
+    "bootstrap_dns_desc": "IP-adressen van DNS-servers die worden gebruikt om IP-adressen om te zetten van de DoH/DoT-resolvers die je opgeeft als upstreams. Opmerkingen zijn niet toegestaan.",
+    "fallback_dns_title": "Back-up DNS-servers",
+    "fallback_dns_desc": "Lijst met DNS-back-up-noodservers die worden gebruikt wanneer upstream DNS-servers niet reageren. De syntaxis is hetzelfde als in het veld hoofdstroomopwaarts hierboven.",
+    "fallback_dns_placeholder": "Voer één DNS-back-upserver per regel in",
    "local_ptr_title": "Private omgekeerde DNS-servers",
    "local_ptr_desc": "De DNS-servers die AdGuard Home gebruikt voor lokale PTR-zoekopdrachten. Deze servers worden gebruikt om PTR-verzoeken voor adressen in privé-IP-bereiken op te lossen, bijvoorbeeld \"192.168.12.34\", met behulp van reverse DNS. Indien niet ingesteld, gebruikt AdGuard Home de adressen van de standaard DNS-resolvers van uw besturingssysteem, behalve de adressen van AdGuard Home zelf.",
    "local_ptr_default_resolver": "Standaard gebruikt AdGuard Home de volgende omgekeerde DNS-resolvers: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home kon voor dit systeem geen geschikte private omgekeerde DNS-resolvers bepalen.",
-    "local_ptr_placeholder": "Voer één serveradres per regel in",
+    "local_ptr_placeholder": "Voer één IP-adres per regel in",
    "resolve_clients_title": "Omzetten van hostnamen van clients inschakelen",
    "resolve_clients_desc": "Indien ingeschakeld, zal AdGuard Home proberen om IP-adressen van apparaten te converteren in hun hostnamen door PTR-verzoeken te sturen naar overeenkomstige resolvers (privé-DNS-servers voor lokale apparaten, upstream-server voor apparaten met een openbaar IP-adres).",
    "use_private_ptr_resolvers_title": "Private omgekeerde DNS-resolvers gebruiken",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Geblokkeerde malware/phishing",
    "stats_adult": "Geblokkeerde 18+ websites",
    "stats_query_domain": "Meest bezochte domeinen",
-    "for_last_24_hours": "van de laatste 24-uur",
+    "for_last_hours": "voor het afgelopen {{count}} uur",
+    "for_last_hours_plural": "voor de afgelopen {{count}} uren",
    "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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Top gebruikers",
    "no_clients_found": "Geen gebruikers gevonden",
    "general_statistics": "Algemene statistieken",
+    "top_upstreams": "Top upstreams",
+    "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_24_hours": "Aantal verwerkte DNS aanvragen van de laatste 24 uur",
+    "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_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",
    "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.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Geconfigureerd in {{path}}",
    "test_upstream_btn": "Test upstream",
    "upstreams": "Upstreams",
+    "upstream": "Upstream",
    "apply_btn": "Toepassen",
    "disabled_filtering_toast": "Filters uitgeschakeld",
    "enabled_filtering_toast": "Filters ingeschakeld",
@@ -186,7 +199,7 @@
    "cancel_btn": "Annuleren",
    "enter_name_hint": "Voeg naam toe",
    "enter_url_or_path_hint": "Voer een URL in of het pad van de lijst",
-    "check_updates_btn": "Controleer op updates",
+    "check_updates_btn": "Controleren op updates",
    "new_blocklist": "Nieuwe blokkeerlijst",
    "new_allowlist": "Nieuwe toelatingslijst",
    "edit_blocklist": "Blokkeerlijst beheren",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Het query logboek is succesvol geleegd",
    "query_log_updated": "Het query logboek is succesvol bijgewerkt",
    "query_log_clear": "Leeg query logs",
-    "query_log_retention": "Query logs bewaartermijn",
+    "query_log_retention": "Query logs rotatie",
    "query_log_enable": "Log bestanden inschakelen",
    "query_log_configuration": "Logbestanden instellingen",
    "query_log_disabled": "Het query logboek is uitgeschakeld en kan worden geconfigureerd in de <0>instellingen</0>",
    "query_log_strict_search": "Gebruik dubbele aanhalingstekens voor strikt zoeken",
-    "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
+    "query_log_retention_confirm": "Weet u zeker dat u de rotatie van het querylogboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
    "anonymize_client_ip": "Cliënt IP anonimiseren",
    "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in logboeken en statistiekbestanden",
    "dns_config": "DNS-server configuratie",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Ben je zeker dat je deze gebruiker \"{{key}}\" wilt verwijderen?",
    "list_confirm_delete": "Ben je zeker om deze lijst te verwijderen?",
    "auto_clients_title": "Runtime-clients",
-    "auto_clients_desc": "Apparaten die niet op de lijst van permanente clients staan die mogelijk nog steeds AdGuard Home gebruiken",
+    "auto_clients_desc": "Informatie over IP-adressen van apparaten die AdGuard Home gebruiken of kunnen gebruiken. Deze informatie wordt verzameld uit verschillende bronnen, waaronder hosts-bestanden, reverse DNS, enz.",
    "access_title": "Toegangs instellingen",
    "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen",
    "access_allowed_title": "Toegestane gebruikers",
@@ -456,7 +482,7 @@
    "access_settings_saved": "Toegangsinstellingen succesvol opgeslagen",
    "updates_checked": "Een nieuwe versie van AdGuard Home is beschikbaar\n",
    "updates_version_equal": "AdGuard Home is actueel",
-    "check_updates_now": "Controleer op updates",
+    "check_updates_now": "Nu controleren op updates",
    "version_request_error": "Updatecontrole mislukt. Controleer je internetverbinding.",
    "dns_privacy": "DNS Privacy",
    "setup_dns_privacy_1": "<0>DNS-via-TLS:</0> Gebruik <1>{{address}}</1> string.",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.",
    "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
    "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
+    "rewrite_updated": "DNS-herschrijven succesvol bijgewerkt",
    "rewrite_add": "DNS-herschrijving toevoegen",
+    "rewrite_edit": "DNS-herschrijven bewerken",
    "rewrite_not_found": "Geen DNS-herschrijving gevonden",
    "rewrite_confirm_delete": "Bent u zeker dat u DNS-herschrijving \"{{key}}\" wilt verwijderen?",
    "rewrite_desc": "Hiermee kunt u eenvoudig aangepaste DNS-antwoorden configureren voor een specifieke domeinnaam.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Statistieken inschakelen",
    "ignore_domains": "Genegeerde domeinen (gescheiden door nieuwe regel)",
    "ignore_domains_title": "Genegeerde domeinen",
-    "ignore_domains_desc_stats": "Zoekopdrachten voor deze domeinen worden niet naar de statistieken geschreven",
-    "ignore_domains_desc_query": "Zoekopdrachten voor deze domeinen worden niet naar het zoeklogboek geschreven",
+    "ignore_domains_desc_stats": "Zoekopdrachten die aan deze regels voldoen, worden niet naar de statistieken geschreven",
+    "ignore_domains_desc_query": "Zoekopdrachten die aan deze regels voldoen, worden niet naar het zoeklogboek geschreven",
    "interval_hours": "{{count}} uur",
    "interval_hours_plural": "{{count}} uren",
    "filters_configuration": "Filters instellingen",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: speciale waarde, <0>A</0> records uit de upstream bewaren",
    "rewrite_AAAA": "<0>AAAA</0>: speciale waarde, <0>AAAA</0> records uit de upstream bewaren",
    "disable_ipv6": "Oplossen IPv6-adressen uitschakelen",
-    "disable_ipv6_desc": "Alle DNS-query's voor IPv6-adressen (type AAAA) verwijderen.",
+    "disable_ipv6_desc": "Alle DNS-query's voor IPv6-adressen (type AAAA) verwijderen en IPv6-hints uit HTTPS-antwoorden verwijderen.",
    "fastest_addr": "Snelste IP adres",
    "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat AdGuard Home moet wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
    "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.",
@@ -571,7 +599,7 @@
    "tags_title": "Labels",
    "tags_desc": "Je kunt labels selecteren die overeenkomen met de client. Labels kunnen worden opgenomen in de filterregels om ze \n nauwkeuriger toe te passen. <0>Meer informatie</0>.",
    "form_select_tags": "Client tags selecteren",
-    "check_title": "Controleer de filtering",
+    "check_title": "De filtering controleren",
    "check_desc": "Controleren of een hostnaam wordt gefilterd.",
    "check": "Controleren",
    "form_enter_host": "Voer een hostnaam in",
@@ -645,7 +673,7 @@
    "parental_control": "Ouderlijk toezicht",
    "safe_browsing": "Veilig browsen",
    "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
-    "form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn",
+    "form_error_password_length": "Wachtwoord moet {{min}} tot {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Beveiliging uitschakelen voor {{count}} uur",
    "disable_notify_for_hours_plural": "Beveiliging uitschakelen voor {{count}} uren",
    "disable_notify_until_tomorrow": "Beveiliging uitschakelen tot morgen",
-    "enable_protection_timer": "Bescherming wordt ingeschakeld over {{time}}"
+    "enable_protection_timer": "Bescherming wordt ingeschakeld over {{time}}",
+    "custom_retention_input": "Voer retentie in uren in",
+    "custom_rotation_input": "Voer rotatie in uren in",
+    "protection_section_label": "Bescherming",
+    "log_and_stats_section_label": "Aanvragenlogboek en statistieken",
+    "ignore_query_log": "Deze client negeren in het aanvragenlogboek",
+    "ignore_statistics": "Deze client negeren in de statistieken",
+    "schedule_services": "Serviceblokkering onderbreken",
+    "schedule_services_desc": "Het pauzeschema van het serviceblokkeringsfilter configureren",
+    "schedule_services_desc_client": "Het pauzeschema van het serviceblokkeringsfilter voor deze client configureren",
+    "schedule_desc": "Inactiviteitsperioden instellen voor geblokkeerde services",
+    "schedule_invalid_select": "Begintijd moet vóór eindtijd liggen",
+    "schedule_select_days": "Selecteer dagen",
+    "schedule_timezone": "Selecteer een tijdzone",
+    "schedule_current_timezone": "Huidige tijdzone: {{value}}",
+    "schedule_time_all_day": "De hele dag",
+    "schedule_modal_description": "Dit schema vervangt alle bestaande schema's voor dezelfde dag van de week. Elke dag van de week kan slechts één inactiviteitsperiode hebben.",
+    "schedule_modal_time_off": "Geen serviceblokkering:",
+    "schedule_new": "Nieuw schema",
+    "schedule_edit": "Schema bewerken",
+    "schedule_save": "Schema opslaan",
+    "schedule_add": "Schema toevoegen",
+    "schedule_remove": "Schema verwijderen",
+    "schedule_from": "Van",
+    "schedule_to": "tot",
+    "sunday": "zondag",
+    "monday": "maandag",
+    "tuesday": "dinsdag",
+    "wednesday": "woensdag",
+    "thursday": "donderdag",
+    "friday": "vrijdag",
+    "saturday": "zaterdag",
+    "sunday_short": "zo",
+    "monday_short": "ma",
+    "tuesday_short": "di",
+    "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"
 }
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -7,7 +7,10 @@
    "load_balancing": "Pågangstrykk-utjevning",
    "load_balancing_desc": "Forespør én tjener om gangen. AdGuard Home vil bruke en 'vektlagt tilfeldig valg'-algoritme for å velge tjener, slik at den raskeste tjeneren blir brukt oftere.",
    "bootstrap_dns": "Bootstrap-DNS-tjenere",
-    "bootstrap_dns_desc": "Bootstrap-DNS-tjenere brukes til å oppklare IP-adressene til DoH/DoT-oppklarerene som du har valgt som oppstrømstjenere.",
+    "bootstrap_dns_desc": "IP-adresser til DNS-servere som brukes til å løse IP-adresser til DoH/DoT-løsere du spesifiserer som oppstrøms. Kommentarer er ikke tillatt.",
+    "fallback_dns_title": "Reserve DNS-servere",
+    "fallback_dns_desc": "Liste over reserve-DNS-servere som brukes når oppstrøms DNS-servere ikke svarer. Syntaksen er den samme som i hovedoppstrømsfeltet ovenfor.",
+    "fallback_dns_placeholder": "Angi én reserve-DNS-server per linje",
    "local_ptr_title": "Private DNS-tjenere",
    "local_ptr_desc": "DNS-tjenerne som AdGuard Home bruker for lokale PTR-spørringer. Disse tjenerne brukes til å løse vertsnavnene til klienter med private IP-adresser, for eksempel \"192.168.12.34\", ved bruk av omvendt DNS. Hvis det ikke er angitt, bruker AdGuard Home adressene til standard-DNS-løserne til operativsystemet ditt, bortsett fra adressene til selve AdGuard Home.",
    "local_ptr_default_resolver": "Som standard, bruker AdGuard Home følgende revers-DNS-oppletere: {{ip}}.",
@@ -114,6 +117,8 @@
    "top_clients": "Vanligste klienter",
    "no_clients_found": "Ingen klienter ble funnet",
    "general_statistics": "Generelle statistikker",
+    "top_upstreams": "Topp oppstrøms servere",
+    "no_upstreams_data_found": "Ingen oppstrøms servere data funnet",
    "number_of_dns_query_days": "Antall DNS-spørringer behandlet for de siste {{count}} dagene",
    "number_of_dns_query_days_plural": "Antall DNS-forespørsler som ble behandlet de siste {{count}} dagene",
    "number_of_dns_query_24_hours": "Antall DNS-forespørsler som ble behandlet de siste 24 timene",
@@ -147,6 +152,7 @@
    "upstream_dns_configured_in_file": "Satt opp i {{path}}",
    "test_upstream_btn": "Test oppstrømstilkoblinger",
    "upstreams": "Oppstrømstjenere",
+    "upstream": "Oppstrøms server",
    "apply_btn": "Benytt",
    "disabled_filtering_toast": "Skrudde av filtrering",
    "enabled_filtering_toast": "Skrudde på filtrering",
@@ -239,7 +245,7 @@
    "query_log_cleared": "Forespørselsloggen ble vellykket slettet",
    "query_log_updated": "Forespørselsloggen ble vellykket oppdatert",
    "query_log_clear": "Tøm forespørselsloggene",
-    "query_log_retention": "Beholding av forespørselsloggføringene",
+    "query_log_retention": "Rotasjon av forespørselsloggføringene",
    "query_log_enable": "Skru på loggføring",
    "query_log_configuration": "Loggføringskonfigurasjon",
    "query_log_disabled": "Forespørselsloggen er skrudd av og kan bli satt opp i <0>innstillingene</0>",
@@ -282,6 +288,8 @@
    "blocking_mode_null_ip": "Null IP: Svar med en 0-IP-adresse (0.0.0.0 for A; :: for AAAA)",
    "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt valgt IP-adresse",
    "theme_auto": "Auto",
+    "theme_light": "Lyst tema",
+    "theme_dark": "Mørkt tema",
    "upstream_dns_client_desc": "Hvis dette feltet holdes tomt, vil AdGuard Home bruke tjenerne som er satt opp i <0>DNS-innstillingene</0>.",
    "tracker_source": "Sporerkilde",
    "source_label": "Kilde",
@@ -421,7 +429,7 @@
    "client_confirm_delete": "Er du sikker på at du vil slette klienten «{{key}}»?",
    "list_confirm_delete": "Er du sikker på at du vil slette denne listen?",
    "auto_clients_title": "Klienter (kjørende)",
-    "auto_clients_desc": "Loggføring over klientene som bruker AdGuard Home, men som ikke har blitt lagret i oppsettet",
+    "auto_clients_desc": "Informasjon om IP-adresser til enheter som bruker eller kan bruke AdGuard Home. Denne informasjonen er samlet inn fra flere kilder, inkludert vertsfiler, omvendt DNS, etc.",
    "access_title": "Tilgangsinnstillinger",
    "access_desc": "Her kan du sette opp tilgangsregler for AdGuard Home-DNS-tjeneren.",
    "access_allowed_title": "Tillatte klienter",
@@ -455,7 +463,9 @@
    "setup_dns_notice": "For å benytte <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, må du <0>sette opp Kryptering</0> i AdGuard Home-innstillingene.",
    "rewrite_added": "DNS-omdirigeringen for «{{key}}» ble vellykket lagt til",
    "rewrite_deleted": "DNS-omdirigeringen for «{{key}}» ble vellykket slettet",
+    "rewrite_updated": "DNS-omskriving ble oppdatert",
    "rewrite_add": "Legg til DNS-omdirigering",
+    "rewrite_edit": "Rediger DNS-omskriving",
    "rewrite_not_found": "Ingen DNS-omdirigeringer ble funnet",
    "rewrite_confirm_delete": "Er du sikker på at du vil slette DNS-omdirigeringen for «{{key}}»?",
    "rewrite_desc": "Lar deg enkelt konfigurere selvvalgte DNS-tilbakemeldinger for et spesifikt domenenavn.",
@@ -489,6 +499,7 @@
    "interval_days": "{{count}} dag",
    "interval_days_plural": "{{count}} dager",
    "domain": "Domene",
+    "ecs": "ECS",
    "punycode": "Punycode",
    "answer": "Svar",
    "filter_added_successfully": "Filteret har blitt vellykket lagt til",
@@ -534,7 +545,7 @@
    "rewrite_A": "<0>A</0>: spesialverdi, behold <0>A</0>-statutter fra oppstrømstjeneren",
    "rewrite_AAAA": "<0>AAAA</0>: spesialverdi, behold <0>AAAA</0>-statutter fra oppstrømstjeneren",
    "disable_ipv6": "Skru av IPv6",
-    "disable_ipv6_desc": "Hvis dette er skrudd på, vil alle DNS-forespørslene til IPv6-adresser (AAAA-type) bli droppet.",
+    "disable_ipv6_desc": "Slipp alle DNS-spørringer for IPv6-adresser (type AAAA) og fjern IPv6-hint fra HTTPS-svar.",
    "fastest_addr": "Raskeste IP-adresse",
    "fastest_addr_desc": "Forespør alle DNS-tjenerne og hent den raskeste IP-adressen blant alle svarene. Dette vil gjøre DNS-forespørslene tregere, siden vi må vente på svar fra alle DNS-tjenerne, men det vil forbedre tilkoblingen generelt.",
    "autofix_warning_text": "Hvis du klikker på «Fiks», vil AdGuard Home sette opp systemet ditt til å bruke 'AdGuard Home'-DNS-tjeneren.",
@@ -614,5 +625,45 @@
    "use_saved_key": "Bruk den tidligere lagrede nøkkelen",
    "parental_control": "Foreldrekontroll",
    "safe_browsing": "Sikker surfing",
-    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>"
+    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>",
+    "theme_dark_desc": "Mørkt tema",
+    "theme_light_desc": "Lyst tema",
+    "disable_notify_until_tomorrow": "Deaktiver beskyttelsen til i morgen",
+    "enable_protection_timer": "Beskyttelse vil være aktivert i {{time}}",
+    "custom_retention_input": "Angi oppbevaring i timer",
+    "custom_rotation_input": "Angi rotasjon i timer",
+    "protection_section_label": "Beskyttelse",
+    "ignore_statistics": "Ignorer denne klienten i statistikken",
+    "schedule_services": "Sett blokkering av tjenesten på pause",
+    "schedule_services_desc": "Konfigurer pauseplanen for tjenesteblokkeringsfilteret",
+    "schedule_services_desc_client": "Konfigurer pauseplanen for tjenesteblokkeringsfilteret for denne klienten",
+    "schedule_desc": "Angi inaktivitetsperioder for blokkerte tjenester",
+    "schedule_invalid_select": "Starttid må være før sluttid",
+    "schedule_select_days": "Velg dager",
+    "schedule_timezone": "Velg en tidssone",
+    "schedule_current_timezone": "Gjeldende tidssone: {{value}}",
+    "schedule_time_all_day": "Hele dagen",
+    "schedule_modal_description": "Denne tidsplanen vil erstatte alle eksisterende tidsplaner for samme ukedag. Hver dag i uken kan bare ha én inaktivitetsperiode.",
+    "schedule_modal_time_off": "Ingen tjenesteblokkering:",
+    "schedule_new": "Ny tidsplan",
+    "schedule_edit": "Endre tidsplan",
+    "schedule_save": "Lagre tidsplan",
+    "schedule_add": "Legg til tidsplan",
+    "schedule_remove": "Fjern tidsplanen",
+    "schedule_from": "Fra",
+    "schedule_to": "Til",
+    "sunday": "Søndag",
+    "monday": "Mandag",
+    "tuesday": "Tirsdag",
+    "wednesday": "Onsdag",
+    "thursday": "Torsdag",
+    "friday": "Fredag",
+    "saturday": "Lørdag",
+    "sunday_short": "søn",
+    "monday_short": "man",
+    "tuesday_short": "tir",
+    "wednesday_short": "ons",
+    "thursday_short": "tor",
+    "friday_short": "fre",
+    "saturday_short": "lør"
 }
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Równoważenie obciążenia",
    "load_balancing_desc": "Wysyłaj zapytania do jednego serwera nadrzędnego na raz. AdGuard Home używa swojego losowego algorytmu ważonego, aby wybrać serwer, tak aby najszybszy serwer był używany częściej.",
    "bootstrap_dns": "Serwery DNS Bootstrap",
-    "bootstrap_dns_desc": "Serwery DNS Bootstrap są używane do ustalenia adresu IP serwerów DoH/DoT, które oznaczysz jako główne serwery DNS.",
+    "bootstrap_dns_desc": "Adresy IP serwerów DNS używanych do rozpoznawania adresów IP programów rozpoznawania nazw DoH/DoT określonych jako nadrzędne. Komentarze są niedozwolone.",
+    "fallback_dns_title": "Rezerwowe serwery DNS",
+    "fallback_dns_desc": "Lista rezerwowych serwerów DNS używanych, gdy nadrzędne serwery DNS nie odpowiadają. Składnia jest taka sama jak w głównym polu powyżej.",
+    "fallback_dns_placeholder": "Wprowadź jeden rezerwowy serwer DNS w każdym wierszu",
    "local_ptr_title": "Prywatne odwrotne serwery DNS",
    "local_ptr_desc": "Serwery DNS, których AdGuard Home używa do lokalnych zapytań PTR. Serwery te są używane do rozpoznawania nazw hostów klientów z prywatnymi adresami IP, na przykład „192.168.12.34”, przy użyciu odwrotnego DNS. Jeśli nie jest ustawiona, AdGuard Home używa adresów domyślnych resolwerów DNS systemu operacyjnego, z wyjątkiem adresów samego AdGuard Home.",
    "local_ptr_default_resolver": "Domyślnie AdGuard Home używa następujących odwrotnych resolwerów DNS: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home nie mógł określić odpowiednich prywatnych resolwerów DNS dla tego systemu.",
-    "local_ptr_placeholder": "Wprowadź po jednym adresie serwera w każdym wierszu",
+    "local_ptr_placeholder": "Wprowadź po jednym adresie IP w każdym wierszu",
    "resolve_clients_title": "Włącz odwrotne rozpoznawanie adresów IP klientów",
    "resolve_clients_desc": "Odwróć adresy IP klientów na ich nazwy hostów, wysyłając zapytania PTR do odpowiednich programów tłumaczących (prywatne serwery DNS dla klientów lokalnych, serwery nadrzędne dla klientów z publicznymi adresami IP).",
    "use_private_ptr_resolvers_title": "Użyj prywatnych odwrotnych resolwerów DNS",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "przez ostatnie 24 godziny",
+    "for_last_hours": "w ciągu ostatniej {{count}} godziny",
+    "for_last_hours_plural": "w ciągu ostatnich {{count}} godzin",
    "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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Główni klienci",
    "no_clients_found": "Nie znaleziono klienta",
    "general_statistics": "Ogólne statystyki",
+    "top_upstreams": "Często żądane serwery nadrzędne",
+    "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_24_hours": "Liczba zapytań DNS przetworzonych w ciągu ostatnich 24 godzin",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Skonfigurowano w {{path}}",
    "test_upstream_btn": "Test głównych serwerów DNS",
    "upstreams": "Główne serwery DNS",
+    "upstream": "Serwer nadrzędny",
    "apply_btn": "Zastosuj",
    "disabled_filtering_toast": "Wyłączone filtrowanie",
    "enabled_filtering_toast": "Włączone filtrowanie",
@@ -167,6 +180,7 @@
    "enabled_parental_toast": "Włączona Kontrola Rodzicielska",
    "disabled_safe_search_toast": "Wyłączone bezpieczne wyszukiwanie",
    "enabled_save_search_toast": "Włączone bezpieczne wyszukiwanie",
+    "updated_save_search_toast": "Zaktualizowano ustawienia bezpiecznego wyszukiwania",
    "enabled_table_header": "Włączone",
    "name_table_header": "Nazwa",
    "list_url_table_header": "Adres URL listy",
@@ -221,7 +235,7 @@
    "all_lists_up_to_date_toast": "Wszystkie listy są już aktualne",
    "updated_upstream_dns_toast": "Serwery nadrzędne zostały pomyślnie zapisane",
    "dns_test_ok_toast": "Określone serwery DNS działają poprawnie",
-    "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie można go użyć, sprawdź, czy napisałeś go poprawnie",
+    "dns_test_not_ok_toast": "Serwer \"{{key}}\": 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",
@@ -256,12 +270,12 @@
    "query_log_cleared": "Dziennik zapytań został pomyślnie wyczyszczony",
    "query_log_updated": "Dziennik zapytań został zaktualizowany",
    "query_log_clear": "Wyczyść dzienniki zapytań",
-    "query_log_retention": "Przechowywanie dzienników zapytań",
+    "query_log_retention": "Rotacja dzienników zapytań",
    "query_log_enable": "Włącz dziennik",
    "query_log_configuration": "Konfiguracja dzienników",
    "query_log_disabled": "Dziennik zapytań jest wyłączony i można go skonfigurować w <0>ustawieniach</0>",
    "query_log_strict_search": "Używaj podwójnych cudzysłowów do ścisłego wyszukiwania",
-    "query_log_retention_confirm": "Czy na pewno chcesz zmienić sposób przechowywania dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
+    "query_log_retention_confirm": "Czy na pewno chcesz zmienić rotację dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
    "anonymize_client_ip": "Anonimizuj adres IP klienta",
    "anonymize_client_ip_desc": "Nie zapisuj pełnego adresu IP w dziennikach i statystykach",
    "dns_config": "Konfiguracja serwera DNS",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "rate_limit": "Limit ilościowy",
    "edns_enable": "Włącz podsieć klienta EDNS",
    "edns_cs_desc": "Dodaj opcję podsieci klienta EDNS (ECS) do żądań nadrzędnych i rejestruj wartości wysyłane przez klientów w dzienniku zapytań.",
+    "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",
@@ -343,7 +372,7 @@
    "install_devices_windows_list_2": "Przejdź do kategorii Sieć i Internet, a następnie do Centrum sieci i udostępniania.",
    "install_devices_windows_list_3": "W lewym panelu kliknij \"Zmień ustawienia adaptera\".",
    "install_devices_windows_list_4": "Kliknij prawym przyciskiem myszy aktywne połączenie i wybierz Właściwości.",
-    "install_devices_windows_list_5": "Znajdź na liście \"Protokół internetowy w wersji 4 (TCP/IPv4)\" (lub w przypadku IPv6 \"Protokół internetowy w wersji 6 (TCP/IPv6)\"), zaznacz go i ponownie kliknij na Właściwości.",
+    "install_devices_windows_list_5": "Znajdź na liście \"Protokół internetowy w wersji 4 (TCP/IPv4)\" (lub w przypadku IPv6 \"Protokół internetowy w wersji 6 (TCP/IPv6)\"), zaznacz go i ponownie kliknij Właściwości.",
    "install_devices_windows_list_6": "Wybierz opcję \"Użyj następujących adresów serwerów DNS\" i wprowadź adresy serwerów AdGuard Home.",
    "install_devices_macos_list_1": "Kliknij ikonę Apple i przejdź do Preferencje systemowe.",
    "install_devices_macos_list_2": "Kliknij Sieć.",
@@ -393,7 +422,7 @@
    "encryption_issuer": "Zgłaszający",
    "encryption_hostnames": "Nazwy hostów",
    "encryption_reset": "Czy na pewno chcesz zresetować ustawienia szyfrowania?",
-    "encryption_warning": "Uwaga!",
+    "encryption_warning": "Ostrzeżenie",
    "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",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Czy na pewno chcesz usunąć klienta \"{{key}}\"?",
    "list_confirm_delete": "Czy na pewno chcesz usunąć tę listę?",
    "auto_clients_title": "Uruchomieni klienci",
-    "auto_clients_desc": "Urządzenia, których nie ma na liście stałych klientów, które mogą nadal korzystać z AdGuard Home",
+    "auto_clients_desc": "Informacje o adresach IP urządzeń korzystających lub mogących korzystać z AdGuard Home. Te informacje są gromadzone z wielu źródeł takich jak pliki hosta, odwrotna translacja DNS, itp.",
    "access_title": "Ustawienia dostępu",
    "access_desc": "Tutaj możesz skonfigurować reguły dostępu dla serwera DNS AdGuard Home",
    "access_allowed_title": "Dozwoleni klienci",
@@ -467,7 +496,7 @@
    "setup_dns_privacy_ios_2": "Aplikacja <0>AdGuard dla iOS</0> obsługuje <1>DNS-over-HTTPS</1> i <1>DNS-over-TLS</1>.",
    "setup_dns_privacy_other_title": "Inne implementacje",
    "setup_dns_privacy_other_1": "Sam AdGuard Home może być bezpiecznym klientem DNS na dowolnej platformie.",
-    "setup_dns_privacy_other_2": "<0>dnsproxy</0> obsługuje wszystkie znane bezpieczne protokoły DNS.\n\n",
+    "setup_dns_privacy_other_2": "<0>dnsproxy</0> obsługuje wszystkie znane bezpieczne protokoły DNS.",
    "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> obsługuje <1>DNS-over-HTTPS</1>.",
    "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> obsługuje <1>DNS-over-HTTPS</1>.",
    "setup_dns_privacy_other_5": "Znajdziesz więcej implementacji <0>tutaj</0> i <1>tutaj</1>.",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Aby skorzystać z <1>DNS-over-HTTPS</1> lub <1>DNS-over-TLS</1>, musisz w ustawieniach AdGuard Home <0>skonfigurować szyfrowanie</0>.",
    "rewrite_added": "Pomyślnie dodano przepisanie DNS dla „{{key}}”",
    "rewrite_deleted": "Przepisanie DNS dla „{{key}}” zostało pomyślnie usunięte",
+    "rewrite_updated": "Pomyślnie zaktualizowano przepisywanie DNS",
    "rewrite_add": "Dodaj przepisywanie DNS",
+    "rewrite_edit": "Edytuj przepisywanie DNS",
    "rewrite_not_found": "Nie znaleziono przepisywania DNS",
    "rewrite_confirm_delete": "Czy na pewno chcesz usunąć przepisywanie DNS dla „{{key}}”?",
    "rewrite_desc": "Pozwala łatwo skonfigurować niestandardową odpowiedź DNS dla określonej nazwy domeny.",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Czy chcesz zmienić sposób przechowania statystyk? Jeżeli obniżysz wartość interwału, niektóre dane będą utracone",
    "statistics_cleared": "Statystyki zostały pomyślnie wyczyszczone",
    "statistics_enable": "Włącz statystyki",
+    "ignore_domains": "Ignorowane domeny (każda w nowym wierszu)",
+    "ignore_domains_title": "Ignorowane domeny",
+    "ignore_domains_desc_stats": "Zapytania pasujące do tych reguł nie są zapisywane w statystykach",
+    "ignore_domains_desc_query": "Zapytania pasujące do tych reguł nie są zapisywane w dzienniku zapytań",
    "interval_hours": "{{count}} godzina",
    "interval_hours_plural": "{{count}} godziny",
    "filters_configuration": "Konfiguracja filtrów",
@@ -535,7 +570,7 @@
    "password_placeholder": "Wpisz hasło",
    "sign_in": "Zaloguj się",
    "sign_out": "Wyloguj się",
-    "forgot_password": "Zapomniałeś hasła?",
+    "forgot_password": "Zapomniano hasła?",
    "forgot_password_desc": "Wykonaj <0>te kroki</0>, aby utworzyć nowe hasło do konta użytkownika.",
    "location": "Lokalizacja",
    "orgname": "Nazwa firmy",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: wartość specjalna, zachowaj rekord <0>A</0> z głównego serwera DNS",
    "rewrite_AAAA": "<0>AAAA</0>: wartość specjalna, zachowaj rekord <0>AAAA</0> z głównego serwera DNS",
    "disable_ipv6": "Wyłącz rozwiązywanie adresów IPv6",
-    "disable_ipv6_desc": "Usuń wszystkie zapytania DNS dla adresów IPv6 (typ AAAA).",
+    "disable_ipv6_desc": "Ignorować wszystkie zapytania DNS dotyczące adresów IPv6 (typ AAAA) i usuwać dane IPv6 z odpowiedzi HTTPS.",
    "fastest_addr": "Najszybszy adres IP",
    "fastest_addr_desc": "Zapytaj wszystkie serwery DNS i zwróć najszybszy adres IP spośród wszystkich odpowiedzi. Spowalnia to zapytania DNS, ponieważ AdGuard Home musi czekać na odpowiedzi ze wszystkich serwerów DNS, ale poprawia ogólną łączność.",
    "autofix_warning_text": "Jeśli klikniesz „Napraw”, AdGuardHome skonfiguruje system do korzystania z serwera DNS AdGuardHome.",
@@ -638,9 +673,69 @@
    "parental_control": "Kontrola rodzicielska",
    "safe_browsing": "Bezpieczne przeglądanie",
    "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",
+    "form_error_password_length": "Hasło musi zawierać od {{min}} do {{max}} 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",
-    "clear_cache": "Wyczyść pamięć podręczną"
+    "clear_cache": "Wyczyść pamięć podręczną",
+    "make_static": "Ustaw adres statyczny",
+    "theme_auto_desc": "Automatycznie (na podstawie schematu kolorów Twojego urządzenia)",
+    "theme_dark_desc": "Ciemny motyw",
+    "theme_light_desc": "Jasny motyw",
+    "disable_for_seconds": "Na {{count}} sekundę",
+    "disable_for_seconds_plural": "Na {{count}} sekund",
+    "disable_for_minutes": "Na {{count}} minutę",
+    "disable_for_minutes_plural": "Na {{count}} minut",
+    "disable_for_hours": "Na {{count}} godzinę",
+    "disable_for_hours_plural": "Na {{count}} godziny",
+    "disable_until_tomorrow": "Do jutra",
+    "disable_notify_for_seconds": "Wyłącz ochronę na {{count}} sekundę",
+    "disable_notify_for_seconds_plural": "Wyłącz ochronę na {{count}} sekund",
+    "disable_notify_for_minutes": "Wyłącz ochronę na {{count}} minutę",
+    "disable_notify_for_minutes_plural": "Wyłącz ochronę na {{count}} minut",
+    "disable_notify_for_hours": "Wyłącz ochronę na {{count}} godzinę",
+    "disable_notify_for_hours_plural": "Wyłącz ochronę na {{count}} godziny",
+    "disable_notify_until_tomorrow": "Wyłącz ochronę do jutra",
+    "enable_protection_timer": "Ochrona zostanie włączona za {{time}}",
+    "custom_retention_input": "Wprowadź retencję w godzinach",
+    "custom_rotation_input": "Wprowadź rotację w godzinach",
+    "protection_section_label": "Ochrona",
+    "log_and_stats_section_label": "Dziennik zapytań i statystyki",
+    "ignore_query_log": "Zignoruj tego klienta w dzienniku zapytań",
+    "ignore_statistics": "Ignoruj tego klienta w statystykach",
+    "schedule_services": "Wstrzymanie blokowania serwisów",
+    "schedule_services_desc": "Ustawianie harmonogramu wstrzymywania filtru blokowania serwisów",
+    "schedule_services_desc_client": "Ustawianie harmonogramu wstrzymywania filtru blokowania serwisów dla tego klienta",
+    "schedule_desc": "Ustawianie okresów bezczynności dla zablokowanych serwisów",
+    "schedule_invalid_select": "Czas rozpoczęcia musi być przed czasem zakończenia",
+    "schedule_select_days": "Wybierz dni",
+    "schedule_timezone": "Wybierz strefę czasową",
+    "schedule_current_timezone": "Aktualna strefa czasowa: {{value}}",
+    "schedule_time_all_day": "Cały dzień",
+    "schedule_modal_description": "Ten harmonogram zastąpi wszystkie istniejące harmonogramy na ten sam dzień tygodnia. Każdy dzień tygodnia może mieć tylko jeden okres bezczynności.",
+    "schedule_modal_time_off": "Blokowanie serwisu jest wyłączone:",
+    "schedule_new": "Nowy harmonogram",
+    "schedule_edit": "Edytuj harmonogram",
+    "schedule_save": "Zapisz harmonogram",
+    "schedule_add": "Dodaj harmonogram",
+    "schedule_remove": "Usuń harmonogram",
+    "schedule_from": "Od",
+    "schedule_to": "Do",
+    "sunday": "Niedziela",
+    "monday": "Poniedziałek",
+    "tuesday": "Wtorek",
+    "wednesday": "Środa",
+    "thursday": "Czwartek",
+    "friday": "Piątek",
+    "saturday": "Sobota",
+    "sunday_short": "Ndz",
+    "monday_short": "Pon",
+    "tuesday_short": "Wt",
+    "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"
 }
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -1,18 +1,22 @@
 {
    "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 oss servidores DNS primário",
+    "upstream_parallel": "Usar consultas paralelas para acelerar a resolução consultando simultaneamente todos os servidores DNS primário",
    "parallel_requests": "Solicitações paralelas",
    "load_balancing": "Balanceamento de carga",
    "load_balancing_desc": "Consulte um servidor DNS primário por vez. O AdGuard Home usa seu algoritmo aleatório ponderado para escolher o servidor para que o servidor mais rápido seja usado com mais frequência.",
    "bootstrap_dns": "Servidores DNS de inicialização",
-    "bootstrap_dns_desc": "Servidores DNS de inicialização são usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams.",
+    "bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
+    "fallback_dns_title": "Servidores DNS Fallback",
+    "fallback_dns_desc": "Lista de servidores DNS Fallback usados quando os servidores DNS primários não estão respondendo. A sintaxe é a mesma dos campos de servidores principais na seção acima.",
+    "fallback_dns_placeholder": "Insira um servidor DNS fallback por linha",
    "local_ptr_title": "Servidores DNS reversos privados",
    "local_ptr_desc": "Os servidores DNS que o AdGuard Home usa para consultas PTR locais. Esses servidores são usados para resolver solicitações de PTR para endereços em intervalos de IP privados, por exemplo \"192.168.12.34\", usando DNS reverso. Se não estiver definido, o AdGuard Home usa os endereços dos resolvedores de DNS padrão do seu sistema operacional, exceto os endereços do próprio AdGuard Home.",
    "local_ptr_default_resolver": "Por padrão, o AdGuard Home usa os seguintes resolvedores de DNS reverso: {{ip}}.",
    "local_ptr_no_default_resolver": "A página inicial do AdGuard não conseguiu determinar resolvedores DNS reversos privados adequados para este sistema.",
-    "local_ptr_placeholder": "Insira um endereço de servidor por linha",
+    "local_ptr_placeholder": "Insira um endereço IP por linha",
    "resolve_clients_title": "Ativar resolução reversa de endereços IP de clientes",
    "resolve_clients_desc": "Resolva reversamente os endereços IP dos clientes em seus nomes de host, enviando consultas PTR aos resolvedores correspondentes (servidores DNS privados para clientes locais, servidores upstream para clientes com endereços IP públicos).",
    "use_private_ptr_resolvers_title": "Usar resolvedores DNS reversos privados",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Bloqueado malware/phishing",
    "stats_adult": "Bloqueado sites adultos",
    "stats_query_domain": "Principais domínios consultados",
-    "for_last_24_hours": "nas últimas 24 horas",
+    "for_last_hours": "na última {{count}} hora",
+    "for_last_hours_plural": "nas últimas {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Principais clientes",
    "no_clients_found": "Nenhuma cliente encontrado",
    "general_statistics": "Estatísticas gerais",
+    "top_upstreams": "Melhores servidores DNS primários",
+    "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_24_hours": "O número de consultas DNS processadas nas últimas 24 horas",
+    "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_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",
    "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>.",
@@ -154,10 +166,11 @@
    "encryption_settings": "Configurações de criptografia",
    "dhcp_settings": "Configurações de DHCP",
    "upstream_dns": "Servidores DNS primário",
-    "upstream_dns_help": "Insira um endereço de servidor. um por linha. <a>Saber mais</a> sobre a configuração de servidores DNS primários.",
+    "upstream_dns_help": "Insira o endereço de servidor, um por linha. <a>Saber mais</a> sobre a configuração de servidores DNS primários.",
    "upstream_dns_configured_in_file": "Configurado em {{path}}",
    "test_upstream_btn": "Testar DNS primário",
    "upstreams": "DNS primário",
+    "upstream": "Servidor DNS primário",
    "apply_btn": "Aplicar",
    "disabled_filtering_toast": "Filtragem desativada",
    "enabled_filtering_toast": "Filtragem ativada",
@@ -257,12 +270,12 @@
    "query_log_cleared": "O registro de consulta foi limpo com sucesso",
    "query_log_updated": "O registro da consulta foi atualizado com sucesso",
    "query_log_clear": "Limpar registros de consulta",
-    "query_log_retention": "Arquivamento de registros de consultas",
+    "query_log_retention": "Rotação de registros de consulta",
    "query_log_enable": "Ativar registro",
    "query_log_configuration": "Configuração de registros",
    "query_log_disabled": "O registro de consulta está desativado e pode ser configurado em <0>configurações</0>",
    "query_log_strict_search": "Use aspas duplas para uma pesquisa mais criteriosa",
-    "query_log_retention_confirm": "Você tem certeza de que deseja alterar o arquivamento do registro de consulta? Se diminuir o valor de intervalo, alguns dados serão perdidos",
+    "query_log_retention_confirm": "Tem a certeza de que quer alterar a rotação do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
    "anonymize_client_ip": "Tornar anônimo o IP do cliente",
    "anonymize_client_ip_desc": "Não salva o endereço de IP completo do cliente em registros ou estatísticas",
    "dns_config": "Configuração do servidor DNS",
@@ -276,6 +289,9 @@
    "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",
@@ -287,13 +303,23 @@
    "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 taxa limite",
-    "rate_limit": "Taxa limite",
+    "form_enter_rate_limit": "Insira a velocidade limite",
+    "rate_limit": "Velocidade 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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Você tem certeza de que deseja excluir o cliente \"{{key}}\"?",
    "list_confirm_delete": "Você tem certeza de que deseja excluir essa lista?",
    "auto_clients_title": "Clientes ativos",
-    "auto_clients_desc": "Dispositivo não está na lista de dispositivos persistentes que podem ser utilizados no AdGuard Home",
+    "auto_clients_desc": "Informações sobre endereços IP de dispositivos que usam ou podem usar o AdGuard Home. Essas informações são coletadas de várias fontes, incluindo arquivos de hosts, DNS reverso, etc.",
    "access_title": "Configurações de acessos",
    "access_desc": "Aqui você pode configurar as regras de acesso para o servidores de DNS do AdGuard Home",
    "access_allowed_title": "Clientes permitidos",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, você precisa <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
    "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
    "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
+    "rewrite_updated": "Reconfiguração de DNS atualizada com êxito",
    "rewrite_add": "Adicionar reescrita de DNS",
+    "rewrite_edit": "Editar reconfiguração de DNS",
    "rewrite_not_found": "Nenhuma reescrita de DNS foi encontrada",
    "rewrite_confirm_delete": "Você tem certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Ativar estatísticas",
    "ignore_domains": "Domínios ignorados (separados por nova linha)",
    "ignore_domains_title": "Domínios ignorados",
-    "ignore_domains_desc_stats": "As consultas para esses domínios não são gravadas nas estatísticas",
-    "ignore_domains_desc_query": "As consultas para esses domínios não são gravadas no log de consulta",
+    "ignore_domains_desc_stats": "As consultas que correspondem a essas regras não são gravadas nas estatísticas",
+    "ignore_domains_desc_query": "As consultas que correspondem a essas regras não são gravadas no registro de consultas",
    "interval_hours": "{{count}} hora",
    "interval_hours_plural": "{{count}} horas",
    "filters_configuration": "Configuração de filtros",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registros do upstream",
    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registros do servidor DNS primário",
    "disable_ipv6": "Desativar resolução de endereços IPv6",
-    "disable_ipv6_desc": "Descarta todas as consultas DNS para endereços IPv6 (tipo AAAA).",
+    "disable_ipv6_desc": "Descarta todas as consultas DNS para endereços IPv6 (tipo AAAA) e remove dicas de IPv6 das respostas HTTPS.",
    "fastest_addr": "Endereço de IP mais rápido",
    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso torna as consultas DNS mais lentas, pois o AdGuard Home tem que esperar pelas respostas de todos os servidores DNS, mas melhora a conectividade geral.",
    "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
@@ -645,7 +673,7 @@
    "parental_control": "Controle parental",
    "safe_browsing": "Navegação segura",
    "served_from_cache": "{{value}} <i>(servido do cache)</i>",
-    "form_error_password_length": "A senha deve ter pelo menos {{value}} caracteres",
+    "form_error_password_length": "A senha deve ter entre {{min}} e {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Desativar proteção por {{count}} hora",
    "disable_notify_for_hours_plural": "Desativar proteção por {{count}} horas",
    "disable_notify_until_tomorrow": "Desativar a proteção até amanhã",
-    "enable_protection_timer": "A proteção será ativada em {{time}}"
+    "enable_protection_timer": "A proteção será ativada em {{time}}",
+    "custom_retention_input": "Insira a retenção em horas",
+    "custom_rotation_input": "Insira a rotação em horas",
+    "protection_section_label": "Proteção",
+    "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_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",
+    "schedule_invalid_select": "O horário de início deve ser antes do horário de término",
+    "schedule_select_days": "Selecionar dias",
+    "schedule_timezone": "Selecione um fuso horário",
+    "schedule_current_timezone": "Fuso horário atual: {{value}}",
+    "schedule_time_all_day": "O dia todo",
+    "schedule_modal_description": "Este agendamento substituirá qualquer agendamento existente para o mesmo dia da semana. Cada dia da semana pode ter apenas um período de inatividade.",
+    "schedule_modal_time_off": "Sem bloqueio de serviço:",
+    "schedule_new": "Novo agendamento",
+    "schedule_edit": "Editar agendamento",
+    "schedule_save": "Salvar agendamento",
+    "schedule_add": "Adicionar agendamento",
+    "schedule_remove": "Remover agendamento",
+    "schedule_from": "De",
+    "schedule_to": "Para",
+    "sunday": "Domingo",
+    "monday": "Segunda-feira",
+    "tuesday": "Terça-feira",
+    "wednesday": "Quarta-feira",
+    "thursday": "Quinta-feira",
+    "friday": "Sexta-feira",
+    "saturday": "Sábado",
+    "sunday_short": "Dom",
+    "monday_short": "Seg",
+    "tuesday_short": "Ter",
+    "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"
 }
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Balanceamento de carga",
    "load_balancing_desc": "Consulte um servidor DNS primário por vez. O AdGuard Home usa seu algoritmo aleatório ponderado para escolher o servidor para que o servidor mais rápido seja usado com mais frequência.",
    "bootstrap_dns": "Servidores DNS de arranque",
-    "bootstrap_dns_desc": "Servidores DNS de inicialização são usados para resolver endereços IP dos resolvedores DoH/DoT que especifica como upstreams.",
+    "bootstrap_dns_desc": "Endereços IP de servidores DNS usados para resolver endereços IP dos resolvedores DoH/DoT que você especifica como upstreams. Comentários não são permitidos.",
+    "fallback_dns_title": "Servidores DNS de fallback",
+    "fallback_dns_desc": "Lista de servidores DNS de fallback usados quando os servidores DNS upstream não estão respondendo. A sintaxe é a mesma do campo principal de upstreams acima.",
+    "fallback_dns_placeholder": "Insira um servidor DNS de fallback por linha",
    "local_ptr_title": "Servidores DNS reversos privados",
    "local_ptr_desc": "Os servidores DNS que o AdGuard Home usa para consultas PTR locais. Esses servidores são usados para resolver solicitações de PTR para endereços em intervalos de IP privados, por exemplo \"192.168.12.34\", usando DNS reverso. Se não estiver definido, o AdGuard Home usa os endereços dos resolvedores de DNS padrão do seu sistema operacional, exceto os endereços do próprio AdGuard Home.",
    "local_ptr_default_resolver": "Por predefinição, o AdGuard Home usa os seguintes resolvedores de DNS reverso: {{ip}}.",
    "local_ptr_no_default_resolver": "A página inicial do AdGuard não conseguiu determinar resolvedores DNS reversos privados adequados para este sistema.",
-    "local_ptr_placeholder": "Insira um endereço de servidor por linha",
+    "local_ptr_placeholder": "Insira um endereço IP por linha",
    "resolve_clients_title": "Ativar resolução reversa de endereços IP de clientes",
    "resolve_clients_desc": "Resolva reversamente os endereços IP dos clientes em seus nomes de host, enviando consultas PTR aos resolvedores correspondentes (servidores DNS privados para clientes locais, servidores upstream para clientes com endereços IP públicos).",
    "use_private_ptr_resolvers_title": "Usar resolvedores DNS reversos privados",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Malware/phishing bloqueados",
    "stats_adult": "Sítios adultos bloqueados",
    "stats_query_domain": "Principais domínios consultados",
-    "for_last_24_hours": "nas últimas 24 horas",
+    "for_last_hours": "na última {{count}} hora",
+    "for_last_hours_plural": "nas últimas {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Principais clientes",
    "no_clients_found": "Nenhum cliente foi encontrado",
    "general_statistics": "Estatísticas gerais",
+    "top_upstreams": "Melhores servidores DNS primários",
+    "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_24_hours": "O número de consultas DNS processadas nas últimas 24 horas",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Configurado em {{path}}",
    "test_upstream_btn": "Testar DNS primário",
    "upstreams": "DNS primário",
+    "upstream": "Servidor DNS primário",
    "apply_btn": "Aplicar",
    "disabled_filtering_toast": "Filtragem desativada",
    "enabled_filtering_toast": "Filtragem ativada",
@@ -257,12 +270,12 @@
    "query_log_cleared": "O registo de consulta foi limpo com sucesso",
    "query_log_updated": "O registo da consulta foi atualizado com sucesso",
    "query_log_clear": "Limpar registos de consulta",
-    "query_log_retention": "Retenção de registos de consulta",
+    "query_log_retention": "Rotação de registros de consulta",
    "query_log_enable": "Ativar registo",
    "query_log_configuration": "Definições do registo",
    "query_log_disabled": "O registo de consulta está desativado e pode ser configurado em <0>definições</0>",
    "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
-    "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
+    "query_log_retention_confirm": "Tem a certeza de que quer alterar a rotação do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
    "anonymize_client_ip": "Tornar anónimo o IP do cliente",
    "anonymize_client_ip_desc": "Não gurda o endereço de IP completo do cliente em registo ou estatísticas",
    "dns_config": "Definição do servidor DNS",
@@ -276,6 +289,9 @@
    "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",
@@ -287,13 +303,23 @@
    "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 taxa",
-    "rate_limit": "Limite de taxa",
+    "form_enter_rate_limit": "Insira o limite de velocidade",
+    "rate_limit": "Limite de velocidade",
    "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",
@@ -396,7 +422,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": "Aviso",
+    "encryption_warning": "Cuidado",
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Tem a certeza de que deseja excluir o cliente \"{{key}}\"?",
    "list_confirm_delete": "Você tem certeza de que deseja excluir essa lista?",
    "auto_clients_title": "Clientes ativos",
-    "auto_clients_desc": "Dispositivo não está na lista de dispositivos persistentes que podem ser utilizados no AdGuard Home",
+    "auto_clients_desc": "Informações sobre endereços IP de dispositivos que estão a utilizar ou podem utilizar o AdGuard Home. Estas informações são recolhidas a partir de várias fontes, incluindo ficheiros hosts, DNS reverso etc.",
    "access_title": "Definições de acesso",
    "access_desc": "Aqui pode configurar as regras de acesso para o servidores de DNS do AdGuard Home",
    "access_allowed_title": "Clientes permitidos",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, precisa de <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
    "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
    "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
+    "rewrite_updated": "Reedição de DNS atualizada com sucesso",
    "rewrite_add": "Adicionar reescrita de DNS",
+    "rewrite_edit": "Editar reedição de DNS",
    "rewrite_not_found": "Nenhuma reescrita de DNS foi encontrada",
    "rewrite_confirm_delete": "Tem a certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Ativar estatísticas",
    "ignore_domains": "Domínios ignorados (separados por nova linha)",
    "ignore_domains_title": "Domínios ignorados",
-    "ignore_domains_desc_stats": "As consultas para estes domínios não aparecem nas estatísticas",
-    "ignore_domains_desc_query": "As consultas para estes domínios nãoaparecem no registo de consultas",
+    "ignore_domains_desc_stats": "As consultas que correspondem a essas regras não são gravadas nas estatísticas",
+    "ignore_domains_desc_query": "As consultas que correspondem a essas regras não são gravadas no registo de consultas",
    "interval_hours": "{{count}} hora",
    "interval_hours_plural": "{{count}} horas",
    "filters_configuration": "Definição dos filtros",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: valor especial, mantenha <0>A</0> nos registos do upstream",
    "rewrite_AAAA": "<0>AAAA</0>: valor especial, mantenha <0>AAAA</0> nos registos do servidor DNS primário",
    "disable_ipv6": "Desativar resolução de endereços IPv6",
-    "disable_ipv6_desc": "Descarta todas as consultas DNS para endereços IPv6 (tipo AAAA).",
+    "disable_ipv6_desc": "Descarte todas as consultas DNS para endereços IPv6 (tipo AAAA) e remova as dicas IPv6 das respostas HTTPS.",
    "fastest_addr": "Endereço de IP mais rápido",
    "fastest_addr_desc": "Consulta todos os servidores DNS e retorna o endereço IP mais rápido entre todas as respostas. Isso torna as consultas DNS mais lentas, pois o AdGuard Home tem que esperar pelas respostas de todos os servidores DNS, mas melhora a conectividade geral.",
    "autofix_warning_text": "Se clicar em \"Corrigir\", o AdGuardHome irá configurar o seu sistema para utilizar o servidor DNS do AdGuardHome.",
@@ -645,7 +673,7 @@
    "parental_control": "Controlo parental",
    "safe_browsing": "Navegação segura",
    "served_from_cache": "{{value}} <i>(servido do cache)</i>",
-    "form_error_password_length": "A palavra-passe deve ter pelo menos {{value}} caracteres",
+    "form_error_password_length": "A palavra-passe deve ter {{min}} a {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Desativar proteção por {{count}} hora",
    "disable_notify_for_hours_plural": "Desativar proteção por {{count}} horas",
    "disable_notify_until_tomorrow": "Desativar a proteção até amanhã",
-    "enable_protection_timer": "A proteção será habilitada em {{time}}"
+    "enable_protection_timer": "A proteção será habilitada em {{time}}",
+    "custom_retention_input": "Insira a retenção em horas",
+    "custom_rotation_input": "Insira a rotação em horas",
+    "protection_section_label": "Proteção",
+    "log_and_stats_section_label": "Log de consulta e estatísticas",
+    "ignore_query_log": "Ignorar este cliente no log de consulta",
+    "ignore_statistics": "Ignorar este cliente nas estatísticas",
+    "schedule_services": "Pausar bloqueio de serviço",
+    "schedule_services_desc": "Configure o agendamento de pausa do filtro de bloqueio de serviço",
+    "schedule_services_desc_client": "Configure o agendamento de pausa do filtro de bloqueio de serviço para este cliente",
+    "schedule_desc": "Defina períodos de inatividade para serviços bloqueados",
+    "schedule_invalid_select": "O horário de início deve ser antes do horário de término",
+    "schedule_select_days": "Selecione os dias",
+    "schedule_timezone": "Selecione um fuso horário",
+    "schedule_current_timezone": "Fuso horário atual: {{value}}",
+    "schedule_time_all_day": "O dia todo",
+    "schedule_modal_description": "Este horário substituirá quaisquer horários existentes para o mesmo dia da semana. Cada dia da semana só pode ter um período de inatividade.",
+    "schedule_modal_time_off": "Sem bloqueio de serviço:",
+    "schedule_new": "Novo agendamento",
+    "schedule_edit": "Editar agendamento",
+    "schedule_save": "Salvar agendamento",
+    "schedule_add": "Adicionar agendamento",
+    "schedule_remove": "Remover agendamento",
+    "schedule_from": "De",
+    "schedule_to": "Para",
+    "sunday": "Domingo",
+    "monday": "Segunda-feira",
+    "tuesday": "Terça-feira",
+    "wednesday": "Quarta-feira",
+    "thursday": "Quinta-feira",
+    "friday": "Sexta-feira",
+    "saturday": "Sábado",
+    "sunday_short": "Domingo",
+    "monday_short": "Seg",
+    "tuesday_short": "Terça",
+    "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"
 }
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Echilibrare-sarcini",
    "load_balancing_desc": "Interoghează câte un server în amonte la un moment dat. AdGuard Home utilizează un algoritm de randomizare ponderat pentru a alege serverul, astfel încât cel mai rapid server să fie utilizat mai des.",
    "bootstrap_dns": "Serverele DNS Bootstrap",
-    "bootstrap_dns_desc": "Serverele DNS Bootstrap sunt folosite pentru a rezolva adresele IP ale rezolvatorilor DoH/DoT indicați ca upstreams.",
+    "bootstrap_dns_desc": "Adresele IP ale serverelor DNS utilizate pentru a rezolva adresele IP ale soluțiilor DoH/DoT pe care le specificați ca fiind în amonte. Comentariile nu sunt permise.",
+    "fallback_dns_title": "Servere DNS de rezervă",
+    "fallback_dns_desc": "Lista serverelor DNS de rezervă utilizate atunci când serverele DNS din amonte nu răspund. Sintaxa este aceeași ca în câmpul principal din amonte de mai sus.",
+    "fallback_dns_placeholder": "Introduceți un server DNS de rezervă pe linie",
    "local_ptr_title": "Servere DNS inverse private",
    "local_ptr_desc": "Serverele DNS pe care AdGuard Home le utilizează pentru interogările PTR locale. Aceste servere sunt utilizate pentru a rezolva solicitările PTR pentru adrese din intervale IP private, de exemplu „192.168.12.34”, utilizând DNS invers. Dacă nu este configurat, AdGuard Home utilizează adresele rezolvatorilor DNS impliciți ai sistemului dvs. de operare, cu excepția adreselor AdGuard Home în sine.",
    "local_ptr_default_resolver": "În mod implicit, AdGuard Home utilizează următorii rezolvatori DNS inverși: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home nu a putut determina rezolvatorii DNS privați adecvați pentru acest sistem.",
-    "local_ptr_placeholder": "Introduceți o adresă de server per linie",
+    "local_ptr_placeholder": "Introduceți o adresă IP per linie",
    "resolve_clients_title": "Permiteți rezolvarea inversa a adreselor IP ale clienților",
    "resolve_clients_desc": "Rezolvă invers adresele IP ale clienților în numele lor de gazde prin trimiterea interogărilor PTR la rezolvatorii corespunzători (servere DNS private pentru clienți locali, servere în amonte pentru clienți cu adrese IP publice).",
    "use_private_ptr_resolvers_title": "Utilizați rezolvatori DNS inverși privați",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "în ultimele 24 ore",
+    "for_last_hours": "în ultima {{count}} oră",
+    "for_last_hours_plural": "în ultimele {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Clienți de top",
    "no_clients_found": "Nu au fost găsiți clienți",
    "general_statistics": "Statistici generale",
+    "top_upstreams": "Top servere în amonte",
+    "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_24_hours": "Numărul de interogări DNS procesate în ultimele 24 de ore",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Configurat în {{path}}",
    "test_upstream_btn": "Testați upstreams",
    "upstreams": "Upstreams",
+    "upstream": "Server în amonte",
    "apply_btn": "Aplică",
    "disabled_filtering_toast": "Filtrare dezactivată",
    "enabled_filtering_toast": "Filtrare activată",
@@ -167,6 +180,7 @@
    "enabled_parental_toast": "Control Parental activat",
    "disabled_safe_search_toast": "Căutare protejată dezactivată",
    "enabled_save_search_toast": "Căutare protejată activată",
+    "updated_save_search_toast": "Setări Căutare sigură actualizate",
    "enabled_table_header": "Activat",
    "name_table_header": "Nume",
    "list_url_table_header": "Lista URL",
@@ -256,12 +270,12 @@
    "query_log_cleared": "Jurnalul de interogare a fost șters cu succes",
    "query_log_updated": "Jurnalul de solicitări a fost actualizat cu succes",
    "query_log_clear": "Curăță jurnalele",
-    "query_log_retention": "Retenție jurnale interogare",
+    "query_log_retention": "Interogarea jurnalelor de rotație",
    "query_log_enable": "Activați jurnal",
    "query_log_configuration": "Configurația jurnalelor",
    "query_log_disabled": "Jurnalul de interogare este dezactivat și poate fi configurat în <0>setări</0>",
    "query_log_strict_search": "Utilizați ghilimele duble pentru căutare strictă",
-    "query_log_retention_confirm": "Sunteți sigur că doriți să schimbați retenția jurnalului de interogare? Reducând valoarea intervalului, unele date vor fi pierdute",
+    "query_log_retention_confirm": "Sigur doriți să modificați rotația jurnalului de interogări? Dacă micșorați valoarea intervalului, unele date se vor pierde",
    "anonymize_client_ip": "Anonimizare client IP",
    "anonymize_client_ip_desc": "Nu salvați adresa IP completă a clientului în jurnale și statistici",
    "dns_config": "Configurația serverului DNS",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "rate_limit": "Limita ratei",
    "edns_enable": "Activați subrețeaua de clienți EDNS",
    "edns_cs_desc": "Adaugă opțiunea EDNS Client Subnet (ECS) la solicitările în amonte și înregistrează valorile trimise de clienți în jurnalul de interogare.",
+    "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",
@@ -393,7 +422,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": "Avertisment",
+    "encryption_warning": "Atenție",
    "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",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Sunteți sigur că doriți să ștergeți clientul \"{{key}}\"?",
    "list_confirm_delete": "Sigur doriți să ștergeți această listă?",
    "auto_clients_title": "Clienți runtime",
-    "auto_clients_desc": "Dispozitivele care nu se află pe lista de clienți Persistent care pot utiliza în continuare AdGuard Home",
+    "auto_clients_desc": "Informații despre adresele IP ale dispozitivelor care utilizează sau pot utiliza AdGuard Home. Aceste informații sunt colectate din mai multe surse, inclusiv din fișiere hosts, DNS inversat etc.",
    "access_title": "Setări de acces",
    "access_desc": "Aici puteți configura regulile de acces pentru serverul DNS AdGuard Home",
    "access_allowed_title": "Clienți autorizați",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Pentru a utiliza <1>DNS-over-HTTPS</1> sau <1>DNS-over-TLS</1>, trebuie să <0>configurați Criptarea</0> în setările AdGuard Home.",
    "rewrite_added": "Rescriere DNS pentru \"{{key}}\" adăugată cu succes",
    "rewrite_deleted": "Rescriere DNS pentru \"{{key}}\" ștearsă cu succes",
+    "rewrite_updated": "DNS rescrie actualizat cu succes",
    "rewrite_add": "Adăugați rescriere DNS",
+    "rewrite_edit": "Editați rescrierea DNS",
    "rewrite_not_found": "Nu s-au găsit rescrieri DNS",
    "rewrite_confirm_delete": "Sunteți sigur că doriți să ștergeți rescrierea DNS pentru \"{{key}}\"?",
    "rewrite_desc": "Permite configurarea cu ușurință a răspunsului personalizat DNS pentru un nume de domeniu specific.",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Sunteți sigur că doriți să schimbați păstrarea statisticilor? Dacă reduceți valoarea intervalului, unele date vor fi pierdute",
    "statistics_cleared": "Statisticile au fost șterse cu succes",
    "statistics_enable": "Activați statisticile",
+    "ignore_domains": "Domenii ignorate (separate prin linie nouă)",
+    "ignore_domains_title": "Domenii ignorate",
+    "ignore_domains_desc_stats": "Interogările care corespund acestor reguli nu sunt scrise în statistici",
+    "ignore_domains_desc_query": "Interogările care corespund acestor reguli nu sunt scrise în jurnalul de interogări",
    "interval_hours": "{{count}} oră",
    "interval_hours_plural": "{{count}} ore",
    "filters_configuration": "Configurația filtrelor",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: valoare specială, păstrați <0>A</0> înregistrări din amonte",
    "rewrite_AAAA": "<0>AAAA</0>: valoare specială, păstrați <0>AAAA</0> înregistrări din amonte",
    "disable_ipv6": "Dezactivați rezolvarea adreselor IPv6",
-    "disable_ipv6_desc": "Anulați toate interogările DNS pentru adresele IPv6 (tip AAAA).",
+    "disable_ipv6_desc": "Renunțați la toate interogările DNS pentru adresele IPv6 (tip AAAA) și eliminați indicațiile IPv6 din răspunsurile HTTPS.",
    "fastest_addr": "Cea mai rapidă adresă IP",
    "fastest_addr_desc": "Interoghează toate serverele DNS și întoarce adresa IP cea mai rapidă din răspunsuri. Acest lucru încetinește interogările DNS, deoarece AdGuard Home trebuie să aștepte răspunsuri de la toate serverele DNS, dar îmbunătățește conectivitatea generală.",
    "autofix_warning_text": "Dacă clicați pe \"Fix\", AdGuardHome va configura sistemul dvs. pentru a utiliza serverul DNS AdGuardHome.",
@@ -638,9 +673,69 @@
    "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ă cel puțin {{value}} caractere",
+    "form_error_password_length": "Parola trebuie să aibă între {{min}} și {{max}} 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",
-    "clear_cache": "Goliți memoria cache"
+    "clear_cache": "Goliți memoria cache",
+    "make_static": "Faceți static",
+    "theme_auto_desc": "Auto (pe baza schemei de culori a dispozitivului dvs.)",
+    "theme_dark_desc": "Temă întunecată",
+    "theme_light_desc": "Temă luminoasă",
+    "disable_for_seconds": "Timp de {{count}} secundă",
+    "disable_for_seconds_plural": "Timp de {{count}} secunde",
+    "disable_for_minutes": "Timp de {{count}} minut",
+    "disable_for_minutes_plural": "Timp de {{count}} minute",
+    "disable_for_hours": "Timp de {{count}} oră",
+    "disable_for_hours_plural": "Timp de {{count}} ore",
+    "disable_until_tomorrow": "Până mâine",
+    "disable_notify_for_seconds": "Dezactivați protecția timp de {{count}} secundă",
+    "disable_notify_for_seconds_plural": "Dezactivați protecția timp de {{count}} secunde",
+    "disable_notify_for_minutes": "Dezactivați protecția timp de {{count}} minut",
+    "disable_notify_for_minutes_plural": "Dezactivați protecția timp de {{count}} minute",
+    "disable_notify_for_hours": "Dezactivează protecția timp de {{count}} oră",
+    "disable_notify_for_hours_plural": "Dezactivați protecția timp de {{count}} ore",
+    "disable_notify_until_tomorrow": "Dezactivează protecția până mâine",
+    "enable_protection_timer": "Protecția va fi activată în {{time}}",
+    "custom_retention_input": "Introduceți reținerea în ore",
+    "custom_rotation_input": "Introduceți rotația în ore",
+    "protection_section_label": "Protecție",
+    "log_and_stats_section_label": "Jurnal de interogări și statistici",
+    "ignore_query_log": "Ignorați acest client în jurnalul de interogări",
+    "ignore_statistics": "Ignorați acest client în statistici",
+    "schedule_services": "Întrerupeți blocarea serviciului",
+    "schedule_services_desc": "Configurați programul de pauză al filtrului de blocare a serviciului",
+    "schedule_services_desc_client": "Configurați programul de pauză al filtrului de blocare a serviciului pentru acest client",
+    "schedule_desc": "Setați perioade de inactivitate pentru serviciile blocate",
+    "schedule_invalid_select": "Ora de început trebuie să fie înaintea orei de sfârșit",
+    "schedule_select_days": "Selectați zile",
+    "schedule_timezone": "Selectați un fus orar",
+    "schedule_current_timezone": "Fus orar curent: {{value}}",
+    "schedule_time_all_day": "Toată ziua",
+    "schedule_modal_description": "Acest program va înlocui orice program existent pentru aceeași zi a săptămânii. Fiecare zi a săptămânii poate avea o singură perioadă de inactivitate.",
+    "schedule_modal_time_off": "Fără blocare a serviciului:",
+    "schedule_new": "Program nou",
+    "schedule_edit": "Editare program",
+    "schedule_save": "Salvați programul",
+    "schedule_add": "Adăugați program",
+    "schedule_remove": "Înlăturați programul",
+    "schedule_from": "De",
+    "schedule_to": "Până",
+    "sunday": "Duminică",
+    "monday": "Luni",
+    "tuesday": "Marți",
+    "wednesday": "Miercuri",
+    "thursday": "Joi",
+    "friday": "Vineri",
+    "saturday": "Sâmbătă",
+    "sunday_short": "du",
+    "monday_short": "lu",
+    "tuesday_short": "ma",
+    "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"
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -1,20 +1,24 @@
 {
    "client_settings": "Настройки клиентов",
    "example_upstream_reserved": "DNS-сервер <0>для конкретных доменов</0>;",
+    "example_multiple_upstreams_reserved": "несколько DNS-серверов <0>для конкретных доменов</0>;",
    "example_upstream_comment": "комментарий.",
    "upstream_parallel": "Использовать параллельные запросы ко всем серверам одновременно для ускорения обработки запроса.",
    "parallel_requests": "Параллельные запросы",
    "load_balancing": "Распределение нагрузки\n",
    "load_balancing_desc": "Запрашивать по одному серверу за раз. AdGuard Home использует алгоритм взвешенного случайного выбора сервера, так что самый быстрый сервер используется чаще.",
    "bootstrap_dns": "Bootstrap DNS-серверы",
-    "bootstrap_dns_desc": "Bootstrap DNS-серверы используются для поиска IP-адресов DoH/DoT серверов, которые вы указали.",
+    "bootstrap_dns_desc": "IP-адреса DNS-серверов, используемых для поиска IP-адресов DoH/DoT upstream-серверов, которые вы указали. Комментарии не допускаются.",
+    "fallback_dns_title": "Резервные DNS-серверы",
+    "fallback_dns_desc": "Список резервных DNS-серверов, используемых в тех случаях, когда вышестоящие DNS-серверы недоступны. Синтаксис такой же, как и в поле Upstream DNS-серверы выше.",
+    "fallback_dns_placeholder": "Введите один резервный DNS-сервер в каждой строке",
    "local_ptr_title": "Приватные серверы для обратного DNS",
    "local_ptr_desc": "DNS-серверы, которые AdGuard Home использует для локальных PTR-запросов. Эти серверы используются, чтобы получить доменные имена клиентов с приватными IP-адресами, например «192.168.12.34», с помощью обратного DNS. Если список пуст, AdGuard Home использует DNS-серверы по умолчанию вашей ОС.",
    "local_ptr_default_resolver": "По умолчанию AdGuard Home использует следующие обратные DNS-резолверы: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home не смог определить подходящие приватные обратные DNS-резолверы для этой системы.",
    "local_ptr_placeholder": "Введите по одному адресу на строчку",
    "resolve_clients_title": "Включить запрашивание доменных имён для IP-адресов клиентов",
-    "resolve_clients_desc": "Определять доменные имена клиентов через PTR-запросы к соответствующим серверам (приватные DNS-серверы для локальных клиентов, upstream-сервер для клиентов с публичным IP-адресом).",
+    "resolve_clients_desc": "Определять доменные имена клиентов через PTR-запросы к соответствующим серверам (приватные DNS-серверы для локальных клиентов, upstream-серверы для клиентов с публичным IP-адресом).",
    "use_private_ptr_resolvers_title": "Использовать приватные обратные DNS-резолверы",
    "use_private_ptr_resolvers_desc": "Посылать обратные DNS-запросы для локально обслуживаемых адресов на указанные серверы. Если отключено, AdGuard Home будет отвечать NXDOMAIN на все подобные PTR-запросы, кроме запросов о клиентах, уже известных по DHCP, /etc/hosts и так далее.",
    "check_dhcp_servers": "Проверить DHCP-серверы",
@@ -70,7 +74,9 @@
    "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": "Сбросить все аренды",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Заблокированные вредоносные и фишинговые сайты",
    "stats_adult": "Заблокированные «взрослые» сайты",
    "stats_query_domain": "Часто запрашиваемые домены",
-    "for_last_24_hours": "за 24 часа",
+    "for_last_hours": "за последний {{count}} час",
+    "for_last_hours_plural": "за последние {{count}} часов",
    "for_last_days": "за последний {{count}} день",
    "for_last_days_plural": "за последние {{count}} дней",
    "stats_disabled": "Статистика отключена. Вы можете включить её на <0>странице настроек</0>.",
@@ -125,17 +132,22 @@
    "top_clients": "Частые клиенты",
    "no_clients_found": "Клиентов не найдено",
    "general_statistics": "Общая статистика",
+    "top_upstreams": "Часто запрашиваемые upstream-серверы",
+    "no_upstreams_data_found": "Нет данных об upstream-серверах",
    "number_of_dns_query_days": "Количество DNS-запросов за последний {{count}} день",
    "number_of_dns_query_days_plural": "Количество DNS запросов, обработанных за последние {{count}} дней",
-    "number_of_dns_query_24_hours": "Количество DNS-запросов за последние 24 часа",
+    "number_of_dns_query_hours": "Количество DNS-запросов, обработанных за последний {{count}} час",
+    "number_of_dns_query_hours_plural": "Количество DNS-запросов, обработанных за последние {{count}} часов",
    "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": "Время ответа",
    "average_processing_time_hint": "Среднее время для обработки запроса DNS  в миллисекундах",
-    "block_domain_use_filters_and_hosts": "Блокировать домены с использованием фильтров и файлов хостов",
+    "block_domain_use_filters_and_hosts": "Блокировать домены с использованием фильтров и файлов hosts",
    "filters_block_toggle_hint": "Вы можете настроить правила блокировки в <a>«Фильтрах»</a>.",
    "use_adguard_browsing_sec": "Включить Безопасную навигацию AdGuard",
    "use_adguard_browsing_sec_hint": "AdGuard Home проверит, включён ли домен в веб-службу безопасности браузера. Он будет использовать API, чтобы выполнить проверку: на сервер отправляется только короткий префикс имени домена SHA256.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Настроен в {{path}}",
    "test_upstream_btn": "Тест upstream серверов",
    "upstreams": "Upstreams",
+    "upstream": "Upstream-сервер",
    "apply_btn": "Применить",
    "disabled_filtering_toast": "Фильтрация выкл.",
    "enabled_filtering_toast": "Фильтрация вкл.",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Журнал запросов успешно очищен",
    "query_log_updated": "Журнал запросов успешно обновлён",
    "query_log_clear": "Очистить журнал запросов",
-    "query_log_retention": "Сохранение журнала запросов",
+    "query_log_retention": "Частота ротации журнала запросов",
    "query_log_enable": "Включить журнал",
    "query_log_configuration": "Настройка журнала",
    "query_log_disabled": "Журнал запросов выключен, его можно включить в <0>настройках</0>",
    "query_log_strict_search": "Используйте двойные кавычки для строгого поиска",
-    "query_log_retention_confirm": "Вы уверены, что хотите изменить срок хранения запросов? При сокращении интервала данные могут быть утеряны",
+    "query_log_retention_confirm": "Вы уверены, что хотите изменить частоту ротации журнала запросов? При сокращении срока данные могут быть утеряны",
    "anonymize_client_ip": "Анонимизировать IP-адрес клиента",
    "anonymize_client_ip_desc": "Не сохранять полный IP-адрес клиента в журналах и статистике",
    "dns_config": "Настройки DNS-сервера",
@@ -276,6 +289,9 @@
    "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",
@@ -294,9 +310,19 @@
    "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-адресом, указанным в правиле, когда заблокировано правилом в стиле /etc/hosts-style",
+    "blocking_mode_default": "Стандартный: Отвечает с нулевым IP-адресом, (0.0.0.0 для A; :: для AAAA) когда заблокировано правилом в стиле Adblock; отвечает с IP-адресом, указанным в правиле, когда заблокировано правилом в стиле файлов hosts",
    "blocking_mode_refused": "REFUSED: Отвечает с кодом REFUSED",
    "blocking_mode_nxdomain": "NXDOMAIN: Отвечает с кодом NXDOMAIN\n",
    "blocking_mode_null_ip": "Нулевой IP: Отвечает с нулевым IP-адресом (0.0.0.0 для A; :: для AAAA)",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Вы уверены, что хотите удалить клиента «{{key}}»?",
    "list_confirm_delete": "Вы уверены, что хотите удалить этот список?",
    "auto_clients_title": "Клиенты (runtime)",
-    "auto_clients_desc": "Несохранённые клиенты, которые могут пользоваться AdGuard Home",
+    "auto_clients_desc": "Информация об IP-адресах устройств, которые используют или могут использовать AdGuard Home. Эта информация собирается из нескольких источников, включая файлы hosts, обратный DNS и так далее.",
    "access_title": "Настройки доступа",
    "access_desc": "Здесь вы можете настроить правила доступа к DNS-серверу AdGuard Home",
    "access_allowed_title": "Разрешённые клиенты",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Чтобы использовать <1>DNS-over-HTTPS</1> или <1>DNS-over-TLS</1>, вам нужно <0>настроить шифрование</0> в настройках AdGuard Home.",
    "rewrite_added": "Правило перезаписи DNS-запросов для «{{key}}» успешно добавлено",
    "rewrite_deleted": "Правило перезаписи DNS-запросов для «{{key}}» успешно удалено",
+    "rewrite_updated": "Правило перезаписи DNS-запросов успешно обновлено",
    "rewrite_add": "Добавить правило перезаписи DNS-запросов",
+    "rewrite_edit": "Редактировать правило перезаписи DNS-запросов",
    "rewrite_not_found": "Не найдено правил перезаписи DNS-запросов",
    "rewrite_confirm_delete": "Вы уверены, что хотите удалить правило перезаписи DNS-запросов для «{{key}}»?",
    "rewrite_desc": "Позволяет легко настроить пользовательский DNS-ответ для определеннного домена.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Включить статистику",
    "ignore_domains": "Игнорируемые домены (построчно)",
    "ignore_domains_title": "Игнорируемые домены",
-    "ignore_domains_desc_stats": "Запросы для этих доменов не записываются в статистику",
-    "ignore_domains_desc_query": "Запросы для этих доменов не записываются в журнал запросов",
+    "ignore_domains_desc_stats": "Запросы, соответствующие этим правилам, не записываются в статистику",
+    "ignore_domains_desc_query": "Запросы, соответствующие этим правилам, не записываются в журнал запросов",
    "interval_hours": "{{count}} час",
    "interval_hours_plural": "{{count}} часов",
    "filters_configuration": "Настройка фильтров",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: специальное значение, хранить записи <0>A</0> с upstream-сервера",
    "rewrite_AAAA": "<0>AAAA</0>: специальное значение, хранить записи <0>AAAA</0> с upstream-сервера",
    "disable_ipv6": "Отключить обработку IPv6-адресов",
-    "disable_ipv6_desc": "Игнорировать все DNS-запросы адресов IPv6 (тип AAAA).",
+    "disable_ipv6_desc": "Игнорировать все DNS-запросы адресов IPv6 (тип AAAA) и удалять IPv6-данные из ответов типа HTTPS.",
    "fastest_addr": "Самый быстрый IP-адрес",
    "fastest_addr_desc": "Опросить все DNS-серверы и вернуть самый быстрый IP-адрес из полученных ответов. Это замедлит DNS-запросы, так как нужно будет дождаться ответов со всех DNS-серверов, но улучшит соединение.",
    "autofix_warning_text": "При нажатии «Исправить» AdGuard Home настроит вашу систему на использование DNS-сервера AdGuard Home.",
@@ -645,7 +673,7 @@
    "parental_control": "Родительский контроль",
    "safe_browsing": "Безопасный интернет",
    "served_from_cache": "{{value}} <i>(получено из кеша)</i>",
-    "form_error_password_length": "Пароль должен быть длиной не меньше {{value}} символов",
+    "form_error_password_length": "Пароль должен содержать от {{min}} до {{max}} символов",
    "anonymizer_notification": "<0>Внимание:</0> включена анонимизация IP-адресов. Вы можете отключить её в разделе <1>Основные настройки</1>.",
    "confirm_dns_cache_clear": "Вы уверены, что хотите очистить кеш DNS?",
    "cache_cleared": "Кеш DNS успешно очищен",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Отключить защиту на {{count}} час",
    "disable_notify_for_hours_plural": "Отключить защиту на {{count}} часов",
    "disable_notify_until_tomorrow": "Отключить защиту до завтра",
-    "enable_protection_timer": "Защита будет включена в {{time}}"
+    "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": "Конфигурация кеша upstream DNS-серверов",
+    "enable_upstream_dns_cache": "Включить кеширование для пользовательской конфигурации upstream-серверов этого клиента",
+    "dns_cache_size": "Размер DNS-кеша в байтах"
 }
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -4,20 +4,20 @@
    "parallel_requests": "සමාන්තර ඉල්ලීම්",
    "load_balancing": "ධාරිතාව තුලනය",
    "local_ptr_title": "පෞද්ගලික ප්‍රතිවර්ත ව.නා.ප. සේවාදායක",
-    "local_ptr_desc": "ස්ථානීය PTR විමසුම් සඳහා ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන ව.නා.ප. සේවාදායක. මෙම සේවාදායක පුද්ගලික අ.ජා.කෙ. ලිපින සහිත අනුග්‍රාහකවල සත්කාරක නාම විසඳීමට භාවිතා කරයි, උදාහරණයක් ලෙස ප්‍රතිවර්ත ව.නා.ප. භාවිතයෙන් \"192.168.12.34\". නැති නම්, ඇඩ්ගාර්ඩ් හෝම් හි ලිපින සඳහා හැරුනු විට ඔබගේ මෙහෙයුම් පද්ධතියේ පෙරනිමි ව.නා.ප. විසදුම්වල ලිපින භාවිතා කරයි.",
-    "local_ptr_default_resolver": "පෙරනිමි ලෙස, ඇඩ්ගාර්ඩ් හෝම් පහත ප්‍රතිවර්තත ව.නා.ප. පිළිවිසඳු භාවිතා කරයි: {{ip}}.",
+    "local_ptr_desc": "ස්ථානීය PTR විමසුම් සඳහා ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන ව.නා.ප. සේවාදායක. මෙම සේවාදායක පුද්ගලික අ.ජා.කෙ. ලිපින පරාසවල PTR විමසුම් විසඳීමට භාවිතා කරයි, උදාහරණයක් ලෙස ප්‍රතිවර්ත ව.නා.ප. භාවිතයෙන් \"192.168.12.34\". මෙය සකසා නැති නම්, ඇඩ්ගාර්ඩ් හෝම් හි ලිපින සඳහා හැරුනු විට ඔබගේ මෙහෙයුම් පද්ධතියේ පෙරනිමි ව.නා.ප. විසදුම්වල ලිපින භාවිතා කරයි.",
+    "local_ptr_default_resolver": "පෙරනිමි පරිදි, ඇඩ්ගාර්ඩ් හෝම් පහත ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු භාවිතා කරයි: {{ip}}.",
    "local_ptr_no_default_resolver": "ඇඩ්ගාර්ඩ් හෝම් හට මෙම පද්ධතිය සඳහා සුදුසු පුද්ගලික ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු නිශ්චය කරගත නොහැකි විය.",
    "local_ptr_placeholder": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් යොදන්න",
    "resolve_clients_title": "අනුග්‍රාහකවල අ.ජා.කෙ. ලිපින ප්‍රතිවර්ත විසඳීම සබල කරන්න",
    "use_private_ptr_resolvers_title": "පෞද්. ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු භාවිතය",
-    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායක සඳහා පරීක්‍ෂා කරන්න",
+    "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායක පරීක්‍ෂා කරන්න",
    "save_config": "වින්‍යාසය සුරකින්න",
    "enabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය සබල කෙරිණි",
    "disabled_dhcp": "ග.ධා.වි.කෙ. සේවාදායකය අබල කෙරිණි",
    "unavailable_dhcp": "ග.ධා.වි.කෙ. නැත",
    "unavailable_dhcp_desc": "ඇඩ්ගාර්ඩ් හෝම් හට ඔබගේ මෙහෙයුම් පද්ධතියේ ග.ධා.වි.කෙ. සේවාදායකයක් ධාවනය කිරීමට නොහැකිය",
    "dhcp_title": "ග.ධා.වි.කෙ. සේවාදායකය (පර්යේෂණාත්මක!)",
-    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට ඇඩ්ගාර්ඩ් හි තිළෑලි ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කළ හැකිය.",
+    "dhcp_description": "ඔබගේ මාර්ගකාරකය ග.ධා.වි.කෙ. (DHCP) සැකසුම් ලබා නොදෙන්නේ නම්, ඔබට ඇඩ්ගාර්ඩ් තිළෑලි ග.ධා.වි.කෙ. සේවාදායකය භාවිතා කිරීමට හැකිය.",
    "dhcp_enable": "ග.ධා.වි.කෙ. සේවාදායකය සබල කරන්න",
    "dhcp_disable": "ග.ධා.වි.කෙ. සේවාදායකය අබල කරන්න",
    "dhcp_not_found": "ඇඩ්ගාර්ඩ් හෝම් සඳහා ජාලයෙහි කිසිදු ක්‍රියාත්මක ග.ධා.වි.කෙ. සේවාදායකයක් හමු නොවූ නිසා තිළෑලි සේවාදායකය සබල කිරීම ආරක්‍ෂිත වේ. කෙසේ වෙතත්, ස්වයංක්‍රීය ඒෂණය ඉතා නිවැරදි නොවිය හැකි බැවින් ඔබ එය අතින් නැවත පරීක්‍ෂා කළ යුතුය.",
@@ -26,11 +26,11 @@
    "dhcp_static_leases": "ස්ථිර ග.ධා.වි.කෙ. කල්පැවරීම",
    "dhcp_leases_not_found": "ග.ධා.වි.කෙ. කල්පැවරීම් නැත",
    "dhcp_config_saved": "ග.ධා.වි.කෙ. වින්‍යාසය සාර්ථකව සුරකින ලදි",
-    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. අ.ජා.කෙ. 4 සැකසුම්",
-    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අ.ජා.කෙ. 6 සැකසුම්",
+    "dhcp_ipv4_settings": "ග.ධා.වි.කෙ. IPv4 සැකසුම්",
+    "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. IPv6 සැකසුම්",
    "form_error_required": "ඇවැසි ක්‍ෂේත්‍රයකි",
    "form_error_ip4_format": "IPv4 ලිපිනය වලංගු නොවේ",
-    "form_error_ip6_format": "වලංගු නොවන අ.ජා.කෙ.6 ලිපිනයකි",
+    "form_error_ip6_format": "වලංගු නොවන IPv6 ලිපිනයකි",
    "form_error_ip_format": "අ.ජා.කෙ. (IP) ලිපිනය වලංගු නොවේ",
    "form_error_mac_format": "මා.ප්‍ර.පා. ලිපිනය වලංගු නොවේ",
    "form_error_client_id_format": "අනුග්‍රාහකයේ හැඳු. වලංගු නොවේ",
@@ -41,7 +41,7 @@
    "lower_range_start_error": "පරාසය ආරම්භයට වඩා අඩු විය යුතුය",
    "greater_range_start_error": "පරාසය ආරම්භයට වඩා වැඩි විය යුතුය",
    "subnet_error": "ලිපින එක් අනුජාලයක තිබිය යුතුය",
-    "dhcp_form_range_title": "අ.ජා. කෙ. (IP) ලිපින පරාසය",
+    "dhcp_form_range_title": "අ.ජා.කෙ. (IP) ලිපින පරාසය",
    "dhcp_form_range_start": "පරාසය ආරම්භය",
    "dhcp_form_range_end": "පරාසය අවසානය",
    "dhcp_form_lease_title": "ග.ධා.වි.කෙ. කල්පැවරීම (තත්. වලින්)",
@@ -50,7 +50,7 @@
    "dhcp_hardware_address": "දෘඩාංග ලිපිනය",
    "dhcp_ip_addresses": "අ.ජා.කෙ. (IP) ලිපින",
    "ip": "අ.ජා.කෙ. (IP)",
-    "dhcp_table_hostname": "ධාරක නාමය",
+    "dhcp_table_hostname": "සත්කාරක නාමය",
    "dhcp_table_expires": "කල් ඉකුත් වීම",
    "dhcp_warning": "ඔබට කෙසේ හෝ ග.ධා.වි.කෙ. සේවාදායකය සබල කිරීමට අවශ්‍ය නම්, ඔබගේ ජාලයේ වෙනත් ක්‍රියාකාරී ග.ධා.වි.කෙ. සේවාදායකයක් නැති බව තහවුරු කරගන්න. මෙය සම්බන්ධිත උපාංග සඳහා අන්තර්ජාලය බිඳ දැමිය හැකිය!",
    "dhcp_error": "ජාලයේ තවත් ක්‍රියාත්මක ග.ධා.වි.කෙ. සේවාදායකයක් තිබේද යන්න නිශ්චය කළ නොහැකි විය",
@@ -62,13 +62,13 @@
    "dhcp_static_leases_not_found": "ග.ධා.වි.කෙ. ස්ථිර කල්පැවරීම් නැත",
    "dhcp_add_static_lease": "ස්ථිර කල්පැවරීමක් යොදන්න",
    "dhcp_reset_leases": "කල්පැවරීම් යළි සකසන්න",
-    "dhcp_reset_leases_confirm": "සියළු කල්පැවරීම් යළි සැකසීමට වුවමනා ද?",
+    "dhcp_reset_leases_confirm": "සියළුම කල්පැවරීම් යළි සැකසීමට වුවමනා ද?",
    "dhcp_reset_leases_success": "ග.ධා.වි.කෙ. කල්පැවරීම් යළි සැකසිණි",
    "dhcp_reset": "ග.ධා.වි.කෙ. වින්‍යාසය යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
    "country": "රට",
    "city": "නගරය",
    "delete_confirm": "\"{{key}}\" මකා දැමීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
-    "form_enter_hostname": "ධාරක නාමය ඇතුල් කරන්න",
+    "form_enter_hostname": "සත්කාරක නාමය යොදන්න",
    "error_details": "දෝෂ විස්තර",
    "response_details": "ප්‍රතිචාරයෙහි විස්තර",
    "request_details": "ඉල්ලීමෙහි විස්තර",
@@ -116,11 +116,11 @@
    "number_of_dns_query_days": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
    "number_of_dns_query_days_plural": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
    "number_of_dns_query_24_hours": "පසුගිය පැය 24 සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ ධාරක වාරණ ලැයිස්තු මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
+    "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ සත්කාරක වාරණ ලැයිස්තු මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
    "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ ඒකකය මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
    "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි ගණන",
-    "enforced_save_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ",
-    "number_of_dns_query_to_safe_search": "ආරක්ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
+    "enforced_save_search": "ආරක්‍ෂිත සෙවීම බලාත්මක කළ",
+    "number_of_dns_query_to_safe_search": "ආරක්‍ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
    "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
    "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
    "block_domain_use_filters_and_hosts": "පෙරහන් හා සත්කාරක ගොනු භාවිතයෙන් වසම් අවහිර කරන්න",
@@ -128,7 +128,7 @@
    "use_adguard_browsing_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව භාවිතා කරන්න",
    "use_adguard_browsing_sec_hint": "ඇඩ්ගාර්ඩ් හෝම් විසින් පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මගින් වසම අවහිර කර ඇත්දැයි පරීක්‍ෂා කරයි. එය සිදු කිරීමට රහස්‍යතා-හිතකාමී බැලීමේ යෙ.ක්‍ර.මු. භාවිතා කෙරේ: වසමේ කෙටි උපසර්ගයක SHA256 පූරකයක් පමණක් සේවාදායකය වෙත යවනු ලැබේ.",
    "use_adguard_parental": "ඇඩ්ගාර්ඩ් දෙමාපිය පාලන වියමන සේවාව භාවිතා කරන්න",
-    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්ෂා කරනු ඇත. එය පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
+    "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්‍ෂා කරනු ඇත. එය පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
    "enforce_safe_search": "ආරක්‍ෂිත සෙවුම භාවිතා කරන්න",
    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් පහත සෙවුම් යන්ත්‍ර තුළ ආරක්‍ෂිත සෙවුම බලාත්මක කරනු ඇත: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
    "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
@@ -144,6 +144,7 @@
    "upstream_dns": "Upstream ව.නා.ප. සේවාදායක",
    "upstream_dns_help": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් ඇතුල් කරන්න. upstream ව.නා.ප. (DNS) \n සේවාදායක වින්‍යාසගත කිරීම ගැන <a>තව දැනගන්න</a>.",
    "upstream_dns_configured_in_file": "{{path}} හි වින්‍යාසගත කර ඇත",
+    "test_upstream_btn": "අත්හදා බලන්න",
    "apply_btn": "යොදන්න",
    "disabled_filtering_toast": "පෙරීම අබල කෙරිණි",
    "enabled_filtering_toast": "පෙරීම සබල කෙරිණි",
@@ -153,6 +154,7 @@
    "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) ලැයිස්තුව",
@@ -163,7 +165,7 @@
    "edit_table_action": "සංස්කරණය කරන්න",
    "delete_table_action": "මකන්න",
    "elapsed": "ගත වූ කාලය",
-    "filters_and_hosts_hint": "ඇඩ්ගාර්ඩ් හෝම් මූලික දැන්වීම් වාරණ නීති සහ ධාරක ගොනු පද ගැලපුම් තේරුම් ගනී.",
+    "filters_and_hosts_hint": "ඇඩ්ගාර්ඩ් හෝම් මූලික දැන්වීම් වාරණ නීති සහ සත්කාරක ගොනු පද ගැලපුම් තේරුම් ගනී.",
    "no_blocklist_added": "අවහිර කිරීමේ ලැයිස්තු එකතු කර නැත",
    "no_whitelist_added": "ඉඩ දීමේ ලැයිස්තු එකතු කර නැත",
    "add_blocklist": "අවහිර කිරී‌‌‌‌‌මේ ලැයිස්තුවක් එකතු කරන්න",
@@ -183,11 +185,11 @@
    "form_error_url_format": "වලංගු නොවන ඒ.ස.නි.(URL) ආකෘතියකි",
    "form_error_url_or_path_format": "වලංගු නොවන ඒ.ස.නි.(URL) හෝ ස්ථීර මාර්ගයකි",
    "custom_filter_rules": "අභිරුචි පෙරීමේ නීති",
-    "custom_filter_rules_hint": "පේළියකට එක් නීතියක් බැගින් ඇතුල් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ ධාරක ගොනු පද ගැලපුම් භාවිතා කළ හැකිය.",
+    "custom_filter_rules_hint": "පේළියකට එක් නීතියක් බැගින් ඇතුල් කරන්න. ඔබට දැන්වීම් අවහිර කිරීමේ නීති හෝ සත්කාරක ගොනු පද ගැලපුම් භාවිතා කිරීමට හැකිය.",
    "system_host_files": "පද්ධතියේ සත්කාරක ගොනු",
    "examples_title": "උදාහරණ",
-    "example_meaning_filter_block": "උදාහරණය.ලංකා වසමට සහ එහි සියළු උප වසම් වලට ප්‍රවේශය අවහිර කරයි;",
-    "example_meaning_filter_whitelist": "උදාහරණය.ලංකා වසමට සහ එහි සියළු උප වසම් වලට ප්‍රවේශය අනවහිර කරයි;",
+    "example_meaning_filter_block": "උදාහරණය.ලංකා වසමට සහ එහි සියළුම උප වසම් වලට ප්‍රවේශය අවහිර කරයි;",
+    "example_meaning_filter_whitelist": "උදාහරණය.ලංකා වසමට සහ එහි සියළුම උප වසම් වලට ප්‍රවේශය අනවහිර කරයි;",
    "example_meaning_host_block": "උදාහරණය.ලංකා වසම සඳහා 127.0.0.1 සමඟ ප්‍රතිචාර දක්වයි (නමුත් එහි උප ලිපින සඳහා නොවේ);",
    "example_comment": "! මෙතැන අදහස් දැක්වීමක්.",
    "example_comment_meaning": "අදහසක්;",
@@ -231,18 +233,18 @@
    "updated_custom_filtering_toast": "අභිරුචි නීති සාර්ථකව සුරකින ලදි",
    "rule_removed_from_custom_filtering_toast": "අභිරුචි පෙරීමේ නීති තුළින් නීතියක් ඉවත් කෙරිණි: {{rule}}",
    "rule_added_to_custom_filtering_toast": "අභිරුචි පෙරීමේ නීති තුළට මෙම නීතිය එකතු කෙරිණි: {{rule}}",
-    "query_log_response_status": "තත්වය: {{value}}",
+    "query_log_response_status": "තත්‍වය: {{value}}",
    "query_log_filtered": "{{filter}} මගින් පෙරිණි",
    "query_log_confirm_clear": "සමස්ථ විමසුම් සටහන හිස් කිරීමට ඇවැසි බව ඔබට විශ්වාසද?",
    "query_log_cleared": "විමසුම් සටහන සාර්ථකව හිස් කර ඇත",
    "query_log_updated": "විමසුම් සටහන සාර්ථකව යාවත්කාල කෙරිණි",
    "query_log_clear": "විමසුම් සටහන් හිස් කරන්න",
-    "query_log_retention": "විමසුම් සටහන් රඳවා තබා ගැනීම",
+    "query_log_retention": "විමසුම් සටහන් රැඳවීම",
    "query_log_enable": "සටහන සබල කරන්න",
    "query_log_configuration": "සටහන් වින්‍යාසය",
    "query_log_disabled": "විමසුම් සටහන අබල කර ඇති අතර එය <0>සැකසුම්</0> තුළ වින්‍යාසගත කළ හැකිය",
    "query_log_strict_search": "ඉතා නිවැරදිව සෙවීමට ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
-    "query_log_retention_confirm": "විමසුම් සටහන රඳවා තබා ගැනීම වෙනස් කිරීමට ඇවැසි බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
+    "query_log_retention_confirm": "විමසුම් සටහන රඳවා තබා ගැනීම වෙනස් කිරීමට වුවමනා ද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
    "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා.කෙ. (IP) නිර්නාමික කරන්න",
    "anonymize_client_ip_desc": "සටහන් සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ පූර්ණ අ.ජා.කෙ. ලිපිනය සුරකින්න එපා",
    "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
@@ -254,8 +256,8 @@
    "refused": "REFUSED",
    "null_ip": "අභිශූන්‍යය අ.ජා.කෙ.",
    "custom_ip": "අභිරුචි අ.ජා.කෙ.",
-    "blocking_ipv4": "අ.ජා.කෙ.4 අවහිර කිරීම",
-    "blocking_ipv6": "අ.ජා.කෙ.6 අවහිර කිරීම",
+    "blocking_ipv4": "IPv4 අවහිර කිරීම",
+    "blocking_ipv6": "IPv6 අවහිර කිරීම",
    "dnscrypt": "DNSCrypt",
    "dns_over_https": "HTTPS-මගින්-ව.නා.ප.",
    "dns_over_tls": "TLS-මගින්-ව.නා.ප.",
@@ -270,15 +272,20 @@
    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුල් කරන්න",
    "rate_limit": "අනුපාත සීමාව",
    "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
+    "edns_use_custom_ip": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. යොදාගන්න",
+    "edns_use_custom_ip_desc": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. භාවිතයට ඉඩදෙන්න",
    "rate_limit_desc": "එක් අනුග්‍රාහකයකට ඉඩ දී ඇති තත්පරයට ඉල්ලීම් ගණන. එය 0 ලෙස සැකසීම යනුවෙන් අදහස් කරන්නේ සීමාවක් නැති බවයි.",
    "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
    "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
-    "blocking_mode_default": "පොදු: දැන්වීම් අවහිර කරන ආකාරයේ නීතියක් මගින් අවහිර කළ විට REFUSED සමඟ ප්‍රතිචාර දක්වයි; /etc/host-style ආකාරයේ නීතියක් මගින් අවහිර කළ විට නීතියේ දක්වා ඇති අ.ජා. කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි",
+    "blocking_mode_default": "පොදු: දැන්වීම් අවහිර කරන ආකාරයේ නීතියක් මගින් අවහිර කළ විට REFUSED සමඟ ප්‍රතිචාර දක්වයි; /etc/host-style ආකාරයේ නීතියක් මගින් අවහිර කළ විට නීතියේ දක්වා ඇති අ.ජා.කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_refused": "REFUSED: REFUSED කේතය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_nxdomain": "නොපවතින වසම: NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා.කෙ.: ශුන්‍ය අ.ජා.කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායක භාවිතා කරනු ඇත.",
+    "theme_auto": "ස්වයං",
+    "theme_light": "දීප්ත",
+    "theme_dark": "අඳුරු",
+    "upstream_dns_client_desc": "ඔබ මෙම ක්‍ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායක ඇඩ්ගාර්ඩ් හෝම් විසින් භාවිතා කරනු ඇත.",
    "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
    "source_label": "මූලාශ්‍රය",
    "found_in_known_domain_db": "දැනුවත් වසම් දත්ත ගබඩාවේ හමු විය.",
@@ -288,38 +295,38 @@
    "unknown_filter": "{{filterId}} නොදන්නා පෙරහනකි",
    "known_tracker": "දැනුවත් ලුහුබැඳීමකි",
    "install_welcome_title": "ඇඩ්ගාර්ඩ් හෝම් වෙත සාදරයෙන් පිළිගනිමු!",
-    "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා ඇති දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකයකි. ඔබගේ මුළු ජාලය සහ සියළුම උපාංග පාලනය කිරීමට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශවීය වැඩසටහනක් භාවිතා කිරීම අවශ්‍ය නොවේ.",
+    "install_welcome_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු ජාලය පුරා දැන්වීම් සහ ලුහුබැඳීම අවහිර කරන ව.නා.ප. සේවාදායකයකි. ඔබගේ සමස්ත ජාලය සහ සියළුම උපාංග පාලනයට ඉඩ සලසා දීම එහි පරමාර්ථය යි, එයට අනුග්‍රාහක පාර්ශ්ව වැඩසටහනක් වුවමනා නොවේ.",
    "install_settings_title": "පරිපාලක වියමන අතුරු මුහුණත",
    "install_settings_listen": "සවන් දෙන අතුරු මුහුණත",
    "install_settings_port": "තොට",
    "install_settings_interface_link": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලක වියමන අතුරු මුහුණතට පහත ලිපින වලින් ප්‍රවේශ වීමට හැකිය:",
    "form_error_port": "වලංගු තොටක අගයක් යොදන්න",
    "install_settings_dns": "ව.නා.ප. සේවාදායකය",
-    "install_settings_dns_desc": "පහත ලිපිනයන්හි ව.නා.ප. සේවාදායකය භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ මාර්ගකාරකය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
-    "install_settings_all_interfaces": "සියළු අතුරුමුහුණත්",
+    "install_settings_dns_desc": "ව.නා.ප. සේවාදායකය පහත ලිපිනවල භාවිතා කිරීම සඳහා ඔබගේ උපාංග හෝ මාර්ගකාරකය වින්‍යාසගත කිරීමට අවශ්‍ය වනු ඇත:",
+    "install_settings_all_interfaces": "සියළුම අතුරුමුහුණත්",
    "install_auth_title": "සත්‍යාපනය",
-    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලන වියමන අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කළ යුතුය. එය ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ විය හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්ෂා කර ගැනීම වැදගත් ය.",
-    "install_auth_username": "පරිශීලක නාමය",
+    "install_auth_desc": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් පරිපාලන වියමන අතුරු මුහුණතට මුරපද සත්‍යාපනය වින්‍යාසගත කළ යුතුය. ඔබගේ ස්ථානීය ජාල‌යෙන් පමණක් ප්‍රවේශ වීමට හැකි වුවද, එය තව දුරටත් සීමා රහිත ප්‍රවේශයකින් ආරක්‍ෂා කර ගැනීම වැදගත් ය.",
+    "install_auth_username": "පරිශ්‍රීලක නාමය",
    "install_auth_password": "මුරපදය",
    "install_auth_confirm": "මුරපදය තහවුරු කරන්න",
-    "install_auth_username_enter": "පරිශීලක නාමය යොදන්න",
+    "install_auth_username_enter": "පරිශ්‍රීලක නාමය යොදන්න",
    "install_auth_password_enter": "මුරපදය ඇතුල් කරන්න",
    "install_step": "පියවර",
    "install_devices_title": "ඔබගේ උපාංග වින්‍යාසගත කරන්න",
-    "install_devices_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීම ආරම්භයට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කළ යුතුය.",
+    "install_devices_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීමට, ඔබගේ උපාංග එය පරිශ්‍රීලනයට වින්‍යාසගත කළ යුතුය.",
    "install_submit_title": "සුභ පැතුම්!",
-    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ දැන් ඇඩ්ගාර්ඩ් හෝම් භාවිතය ආරම්භ කිරීමට සූදානම්ය.",
+    "install_submit_desc": "පිහිටුවීමේ ක්‍රියා පටිපාටිය අවසන් වී ඇති අතර ඔබ දැන් ඇඩ්ගාර්ඩ් හෝම් භාවිතා කිරීමට සූදානම් ය.",
    "install_devices_router": "මාර්ගකාරකය",
    "install_devices_router_desc": "මෙම පිහිටුම ඔබගේ නිවසේ මාර්ගකාරකයට සම්බන්ධිත සියළුම උපාංග ස්වයංක්‍රීයව ආවරණය කරන අතර ඔබට ඒ සෑම එකක්ම අතින් වින්‍යාසගත කිරීමට අවශ්‍ය නොවේ.",
    "install_devices_address": "ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය පහත ලිපිනයන්ට සවන් දෙමින් පවතී",
-    "install_devices_router_list_1": "ඔබගේ මාර්ගකාරකයෙහි අභිප්‍රේත විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ අතිරික්සුවෙන් ඒ.ස.නි.(URL) ක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) ප්‍රවේශ විය හැකිය. මුරපදය ඇතුල් කිරීමට සිදු විය හැකි නමුත් එය මතක නැතිනම් බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසීමට හැකිය. නමුත් මෙම ක්‍රියා පටිපාටිය තෝරා ගන්නේ නම්, බොහෝ විට ඔබගේ මාර්ගකාරකයේ සමස්ථ වින්‍යාසය අහිමි වනු ඇති බව මතක තබා ගන්න. මෙය පිහිටුවීමට ඔබගේ මාර්ගකාරකයට යෙදුමක් ඇවැසි නම්, කරුණාකර එය ඔබගේ පරිගණකයේ හෝ දුරකථනයේ ස්ථාපනය කර මාර්ගකාරකයේ සැකසුම් වෙත ප්‍රවේශ වීමට භාවිතා කරන්න.",
-    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. අංක කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්ෂේත්‍රයක් අසල ඇති ව.නා.ප. අකුරු බලන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
+    "install_devices_router_list_1": "ඔබගේ මාර්ගකාරකයෙහි අභිප්‍රේත විවෘත කරන්න. සාමාන්‍යයෙන්, එය ඔබගේ අතිරික්සුවෙන් ඒ.ස.නි.(URL) ක් හරහා (http://192.168.0.1/ හෝ http://192.168.1.1/ වැනි) ප්‍රවේශ වීමට හැකිය. මුරපදය ඇතුල් කිරීමට සිදු විය හැකි නමුත් එය මතක නැතිනම් බොහෝ විට මාර්ගකාරකයේ බොත්තමක් එබීමෙන් මුරපදය නැවත සැකසීමට හැකිය. නමුත් මෙම ක්‍රියා පටිපාටිය තෝරා ගන්නේ නම්, බොහෝ විට ඔබගේ මාර්ගකාරකයේ සමස්ථ වින්‍යාසය අහිමි වනු ඇති බව මතක තබා ගන්න. මෙය පිහිටුවීමට ඔබගේ මාර්ගකාරකයට යෙදුමක් වුවමනා නම්, කරුණාකර එය ඔබගේ පරිගණකයේ හෝ දුරකථනයේ ස්ථාපනය කර මාර්ගකාරකයේ සැකසුම් වෙත ප්‍රවේශ වීමට භාවිතා කරන්න.",
+    "install_devices_router_list_2": "ග.ධා.වි.කෙ. (DHCP)/ ව.නා.ප. (DNS) සැකසුම් සොයා ගන්න. අංක කට්ටල දෙකකට හෝ තුනකට ඉඩ දෙන ක්‍ෂේත්‍රයක් අසල ඇති ව.නා.ප. අකුරු බලන්න, සෑම එකක්ම ඉලක්කම් එකේ සිට තුන දක්වා කාණ්ඩ හතරකට බෙදා ඇත.",
    "install_devices_router_list_3": "ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින එහි ඇතුල් කරන්න.",
-    "install_devices_router_list_4": "සමහර වර්ගයේ මාර්ගකාරක වල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසීමට නොහැකිය. මෙම අවස්ථාවේදී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය උපකාර වනු ඇත. එසේ නැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරකය සඳහා වූ ව.නා.ප. සේවාදායක රිසිකරණය කරන්නේ කෙසේද යන්න පිළිබඳ අත්පොත පරීක්‍ෂා කළ යුතුය.",
+    "install_devices_router_list_4": "සමහර මාර්ගකාරක වර්ගවල අභිරුචි ව.නා.ප. සේවාදායකයක් සැකසීමට නොහැකිය. මෙම අවස්ථාවේ දී ඇඩ්ගාර්ඩ් හෝම් <0>ග.ධා.වි.කෙ. සේවාදායකයක්</0> ලෙස පිහිටුවන්නේ නම් එය විසඳුමක් වනු ඇත. එසේ නැතිනම්, ඔබගේ විශේෂිත මාර්ගකාරකයේ අත්පොත පරීක්‍ෂා කර අභිරුචි ව.නා.ප. සේවාදායක යොදන ආකාරය සොයා ගත  යුතුය.",
    "install_devices_windows_list_1": "පාලන වට්ටෝරුව හෝ වින්ඩෝස් සෙවුම හරහා පාලන මඬල අරින්න.",
    "install_devices_windows_list_2": "ජාල සහ අන්තර්ජාල ප්‍රවර්ගයට ගොස් පසුව ජාල සහ බෙදාගැනීමේ මධ්‍යස්ථානය වෙත යන්න.",
    "install_devices_windows_list_3": "වම් තීරුවෙහි \"උපයුක්තක‌‌‌යෙහි සැකසුම් වෙනස් කිරීම\" ඔබන්න.",
-    "install_devices_windows_list_4": "ඔබගේ ක්‍රියාකාරී සම්බන්ධතාවය මත දකුණු-ක්ලික් කර ගුණාංග තෝරන්න.",
+    "install_devices_windows_list_4": "ඔබගේ සක්‍රිය සම්බන්ධතාවය මත දකුණින් ඔබා ගුණාංග තෝරන්න.",
    "install_devices_windows_list_5": "ලැයිස්තුවෙන් \"අන්තර්ජාල කෙටුම්පත් අනුවාදය 4 (TCP/IPv4)\" (හෝ, IPv6 සඳහා, \"අන්තර්ජාල කෙටුම්පත් අනුවාදය 6 (TCP/IPv6)\") සොයාගෙන එය තෝරා ඉන්පසු ගුණාංග මත නැවත ඔබන්න.",
    "install_devices_windows_list_6": "'පහත සඳහන් ව.නා.ප. සේවාදායක ලිපින භාවිතා කරන්න' යන්න තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
    "install_devices_macos_list_1": "ඇපල් නිරූපකය එබීමෙන් පසු පද්ධතියේ අභිප්‍රේත වෙත යන්න.",
@@ -328,27 +335,27 @@
    "install_devices_macos_list_4": "ව.නා.ප. (DNS) තීරුව තෝරා ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
    "install_devices_android_list_1": "ඇන්ඩ්‍රොයිඩ් මුල් තිරයෙන්, සැකසුම් මත තට්ටු කරන්න.",
    "install_devices_android_list_2": "වට්ටෝරුවෙහි වයි-ෆයි මත තට්ටු කරන්න. පවතින සියළුම ජාල ලේඛන ගතවී තිබෙන තිරය පෙන්වනු ඇත (ජංගම සම්බන්ධතාවය සඳහා අභිරුචි ව.නා.ප. සැකසීමට නොහැකිය).",
-    "install_devices_android_list_3": "සම්බන්ධිත ජාලය මත දිගු වේලාවක් ඔබන්න, ඉන්පසුව ජාලය වෙනස් කිරීම මත තට්ටු කරන්න.",
-    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල සියළු සැකසුම් බැලීමට \"වැඩිදුර\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ඔබගේ ඇන්ඩ්‍රොයිඩ් ව.නා.ප. (DNS) සැකසුම් වෙනස් කිරීමට අ.ජා.කෙ. (IP) සැකසුම්, ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත මාරු කළ යුතුය.",
+    "install_devices_android_list_3": "සම්බන්ධිත ජාලය මත මද වේලාවක් ඔබාගෙන ඉන්න, ඉන්පසුව ජාලය වෙනස් කිරීම මත තට්ටු කරන්න.",
+    "install_devices_android_list_4": "ඔබට සමහර උපාංගවල සියළුම සැකසුම් බැලීමට \"වැඩිදුර\" සඳහා වූ කොටුව සලකුණු කිරීමට අවශ්‍ය විය හැකිය. එමෙන්ම ග.ධා.වි.කෙ. (DHCP) සිට ස්ථිතික වෙත අ.ජා.කෙ. (IP) සැකසුම් මාරු කිරීමෙන් ඔබගේ ඇන්ඩ්‍රොයිඩ් ව.නා.ප. (DNS) සැකසුම් වෙනස් කිරීමට හැකිය.",
    "install_devices_android_list_5": "ව.නා.ප. 1 සහ ව.නා.ප. 2 පිහිටුවීම් අගයන් ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින වලට වෙනස් කරන්න.",
-    "install_devices_ios_list_1": "මුල් තිරයේ සිට, සැකසුම් මත තට්ටු කරන්න.",
-    "install_devices_ios_list_2": "වම්පස මෙනුවෙහි වයි-ෆයි තෝරන්න (ජං. දු.ක. සඳහා ව.නා.ප. වින්‍යාසගත කිරීමට නොහැකිය).",
-    "install_devices_ios_list_3": "දැනට ක්‍රියාකාරී ජාලයයහෙි නම මත තට්ටු කරන්න.",
-    "install_devices_ios_list_4": "ව.නා.ප. (DNS) ක්ෂේත්‍රය තුළ ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
+    "install_devices_ios_list_1": "මුල් තිරයෙන්, සැකසුම් මත තට්ටු කරන්න.",
+    "install_devices_ios_list_2": "වම්පස වට්ටෝරුවෙන් වයි-ෆයි තෝරන්න (ජංගම දුරකථන සඳහා ව.නා.ප. වින්‍යාසගත කිරීමට නොහැකිය).",
+    "install_devices_ios_list_3": "දැනට සක්‍රිය ජාලයේ නම මත තට්ටු කරන්න.",
+    "install_devices_ios_list_4": "ව.නා.ප. (DNS) ක්‍ෂේත්‍රය තුළ ඔබගේ ඇඩ්ගාර්ඩ් හෝම් සේවාදායක ලිපින ඇතුල් කරන්න.",
    "get_started": "පටන් ගන්න",
    "next": "ඊළඟ",
-    "open_dashboard": "උපකරණ පුවරුව විවෘත කරන්න",
+    "open_dashboard": "උපකරණ පුවරුව අරින්න",
    "install_saved": "සාර්ථකව සුරකින ලදි",
    "encryption_title": "සංකේතනය",
-    "encryption_desc": "ගුප්තකේතනය (HTTPS/QUIC/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වියමන අතුරු මුහුණත සහය දක්වයි",
+    "encryption_desc": "සංකේතනය (HTTPS/QUIC/TLS) සඳහා ව.නා.ප. සහ පරිපාලක වියමන අතුරු මුහුණත සහය දක්වයි",
    "encryption_config_saved": "සංකේතන වින්‍යාසය සුරකින ලදි",
    "encryption_server": "සේවාදායක‌‌‌‌යේ නම",
-    "encryption_server_enter": "ඔබගේ වසම් නාමය ඇතුල් කරන්න",
-    "encryption_server_desc": "සැකසා ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් අනුග්‍රාහක හැඳුනුම් හඳුනා ගැනෙයි, සෘ.ද.ඉ. (DDR) විමසුම්වලට ප්‍රතිචාර දක්වයි, සහ අතිරේක සම්බන්ධතා වලංගුකරණය සිදු කරයි. නොඑසේ නම්, මෙම විශේෂාංග අබලව ඇත. සහතිකයේ තිබෙන ව.නා.ප. නම් වලින් එකකට ගැළපිය යුතුය.",
+    "encryption_server_enter": "වසමේ නම ඇතුල් කරන්න",
+    "encryption_server_desc": "සකසා ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් අනුග්‍රාහක හැඳුනුම් හඳුනා ගැනෙයි, සෘ.ද.ඉ. (DDR) විමසුම් වලට ප්‍රතිචාර දක්වයි, සහ අතිරේක සම්බන්ධතා වලංගුකරණය සිදු කරයි. නොඑසේ නම්, මෙම විශේෂාංග අබලව පවතී. සහතිකයේ අඩංගු ව.නා.ප. නම් වලින් එකකට ගැළපිය යුතුය.",
    "encryption_redirect": "ස්වයංක්‍රීයව HTTPS වෙත හරවා යවන්න",
-    "encryption_redirect_desc": "සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් ඔබව ස්වයංක්‍රීයව HTTP සිට HTTPS ලිපින වෙත හරවා යවනු ඇත.",
+    "encryption_redirect_desc": "සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් ඔබව ස්වයංක්‍රීයව HTTP වෙතින් HTTPS ලිපින වෙත හරවා යවනු ඇත.",
    "encryption_https": "HTTPS තොට",
-    "encryption_https_desc": "HTTPS තොට වින්‍යාසගත නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/dns-query' ස්ථානයේ HTTPS-මගින්-ව.නා.ප. ද ලබා දෙනු ඇත.",
+    "encryption_https_desc": "HTTPS තොට වින්‍යාසගත නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණතට HTTPS හරහා ප්‍රවේශ විය හැකි අතර එය '/dns-query' ස්ථානයේ HTTPS-මගින්-ව.නා.ප. ද ලබා දෙනු ඇත.",
    "encryption_dot": "TLS-මගින්-ව.නා.ප. තොට",
    "encryption_dot_desc": "මෙම තොට වින්‍යාසගත නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් මෙම කවුළුව හරහා TLS-මගින්-ව.නා.ප. සේවාදායකයක් ධාවනය කෙරේ.",
    "encryption_doq": "QUIC-මගින්-ව.නා.ප. තොට",
@@ -356,20 +363,21 @@
    "encryption_certificates": "සහතික",
    "encryption_certificates_desc": "සංකේතනය භාවිතයට, ඔබගේ වසම සඳහා වලංගු SSL සහතික දාමයක් සැපයිය යුතුය. <0>{{link}}</0> වෙතින් නොමිලේ සහතිකයක් ලබා ගැනීමට හැකිය හෝ විශ්වාසදායක සහතික අධිකාරියකින් මිලදී ගන්න.",
    "encryption_certificates_input": "ඔබගේ PEM-කේතනය කළ සහතික පිටපත් කර මෙහි අලවන්න.",
-    "encryption_status": "තත්වය",
+    "encryption_status": "තත්‍වය",
    "encryption_expire": "කල් ඉකුත් වීම",
    "encryption_key": "පුද්ගලික යතුර",
    "encryption_key_input": "ඔබගේ සහතිකය සඳහා PEM-කේතනය කළ පුද්ගලික යතුර පිටපත් කර මෙහි අලවන්න.",
    "encryption_enable": "සංකේතනය සබල කරන්න (HTTPS, HTTPS-මගින්-ව.නා.ප. සහ TLS-මගින්-ව.නා.ප.)",
-    "encryption_enable_desc": "සංකේතනය සබල කර ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරනු ඇති අතර ව.නා.ප. සේවාදායකය HTTPS-මගින්-ව.නා.ප. සහ TLS-මගින්-ව.නා.ප. හරහා ලැබෙන ඉල්ලීම් සඳහා සවන් දෙනු ඇත.",
+    "encryption_enable_desc": "සංකේතනය සබල කළ විට, ඇඩ්ගාර්ඩ් හෝම් පරිපාලක අතුරුමුහුණත HTTPS හරහා ක්‍රියා කරන අතර ව.නා.ප. සේවාදායකය HTTPS-මගින්-ව.නා.ප. සහ TLS-මගින්-ව.නා.ප. හරහා ලැබෙන ඉල්ලීම් වලට සවන් දෙනු ඇත.",
    "encryption_chain_valid": "සහතික දාමය වලංගු ය",
    "encryption_chain_invalid": "සහතික දාමය වලංගු නොවේ",
    "encryption_key_valid": "මෙය වලංගු {{type}} පුද්ගලික යතුරකි",
    "encryption_key_invalid": "මෙය වලංගු නොවන {{type}} පුද්ගලික යතුරකි",
    "encryption_subject": "මාතෘකාව",
    "encryption_issuer": "නිකුත් කරන්නා",
-    "encryption_hostnames": "ධාරක නාම",
+    "encryption_hostnames": "සත්කාරක නාම",
    "encryption_reset": "සංකේතාංකන සැකසුම් යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
+    "encryption_warning": "අවවාදයයි",
    "topline_expiring_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත්වීමට ආසන්න වී ඇත. <0>සංකේතන සැකසුම්</0> යාවත්කාල කරන්න.",
    "topline_expired_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත් වී ඇත. <0>සංකේතන සැකසුම්</0> යාවත්කාල කරන්න.",
    "form_error_port_range": "80-65535 පරාසය හි තොටක අගයක් ඇතුල් කරන්න",
@@ -416,18 +424,19 @@
    "clients_not_found": "අනුග්‍රාහක හමු නොවිණි",
    "client_confirm_delete": "\"{{key}}\" අනුග්‍රාහකය ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "list_confirm_delete": "මෙම ලැයිස්තුව ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන නිබැඳි අනුග්‍රාහක තුළ නැති උපාංග",
-    "access_title": "ප්‍රවේශවීමට සැකසුම්",
-    "access_desc": "මෙහිදී ඔබට ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකයට ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කළ හැකිය",
-    "access_allowed_title": "ඉඩ ලත් අනුග්‍රාහකයින්",
-    "access_allowed_desc": "අන.ජා.(CIDR), අ.ජා.කෙ. ලිපින හෝ <a>අනුග්‍රාහක හැඳු.</a> ලේඛනයකි. මෙහි නිවේශිත ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අනුග්‍රාහක වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
-    "access_disallowed_title": "නොඉඩ ලත් අනුග්‍රාහකයින්",
-    "access_disallowed_desc": "අන.ජා.(CIDR), අ.ජා.කෙ. ලිපින හෝ <a>අනුග්‍රාහක හැඳු.</a> ලේඛනයකි. මෙහි නිවේශිත ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් එම අනුග්‍රාහක වලින් ඉල්ලීම් අත්හරිනු ඇත. ඉඩ ලත් අනුග්‍රාහකවල නිවේශිත තිබේ නම්, මෙම ක්‍ෂේත්‍රය නොසලකා හරිනු ඇත.",
-    "access_blocked_title": "නොඉඩ ලත් වසම්",
+    "auto_clients_desc": "ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන හෝ භාවිතයට ඉඩ තිබෙන උපාංගවල අ.ජා.කෙ. (IP) ලිපින පිළිබඳ තොරතුරු. මෙම තොරතුරු සත්කාරක ගොනු, ප්‍රතිවර්ත ව.නා.ප. ආදී මූලාශ්‍ර කිහිපයකින් රැස් කෙරේ.",
+    "access_title": "ප්‍රවේශ සැකසුම්",
+    "access_desc": "මෙහි දී ඔබට ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකයට ප්‍රවේශ වී‌‌‌‌මේ නීති වින්‍යාසගත කිරීමට හැකිය",
+    "access_allowed_title": "ඉඩ දෙන අනුග්‍රාහක",
+    "access_allowed_desc": "අන.ජා.(CIDR), අ.ජා.කෙ. ලිපින හෝ <a>අනුග්‍රාහක හැඳු.</a> ලේඛනයකි. මෙහි නිවේශිත ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් එම අනුග්‍රාහක වලින් පමණක් ඉල්ලීම් පිළිගනු ඇත.",
+    "access_disallowed_title": "ඉඩ නොදෙන අනුග්‍රාහක",
+    "access_disallowed_desc": "අන.ජා.(CIDR), අ.ජා.කෙ. ලිපින හෝ <a>අනුග්‍රාහක හැඳු.</a> ලේඛනයකි. මෙහි නිවේශිත ඇත්නම්, ඇඩ්ගාර්ඩ් හෝම් එම අනුග්‍රාහක වලින් ඉල්ලීම් අත්හරිනු ඇත. ඉඩ දෙන අනුග්‍රාහක කොටසේ නිවේශිත තිබේ නම්, මෙම ක්‍ෂේත්‍රය නොසලකා හරිනු ඇත.",
+    "access_blocked_title": "ඉඩ නොදෙන වසම්",
    "access_settings_saved": "ප්‍රවේශ වීමේ සැකසුම් සාර්ථකව සුරකින ලදි",
    "updates_checked": "ඇඩ්ගාර්ඩ් හෝම් හි නව අනුවාදයක් තිබේ",
    "updates_version_equal": "ඇඩ්ගාර්ඩ් හෝම් යාවත්කාලීනයි",
    "check_updates_now": "දැන් යාවත්කාල පරීක්‍ෂා කරන්න",
+    "version_request_error": "යාවත්කාලීන පරීක්‍ෂාවට අසමත් විය. ඔබගේ අන්තර්ජාල සම්බන්ධතාවය පරීක්‍ෂා කරන්න.",
    "dns_privacy": "ව.නා.ප. රහස්‍යතා",
    "setup_dns_privacy_1": "<0>TLS-මගින්-ව.නා.ප.</0> සඳහා <1>{{address}}</1>.",
    "setup_dns_privacy_2": "<0>HTTPS-මගින්-ව.නා.ප.</0> සඳහා <1>{{address}}</1>.",
@@ -446,12 +455,14 @@
    "setup_dns_notice": "ඔබට <1>HTTPS-මගින්-ව.නා.ප.</1> හෝ <1>DNS-මගින්-ව.නා.ප.</1> භාවිතයට ඇඩ්ගාර්ඩ් හෝම් සැකසුම් තුළ <0>සංකේතනය වින්‍යාසගත</0> කළ යුතුය.",
    "rewrite_added": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම සාර්ථකව එකතු කෙරිණි",
    "rewrite_deleted": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම ඉවත් කෙරිණි",
-    "rewrite_add": "ව.නා.ප. නැවත ලිවීමක් එකතු කරන්න",
+    "rewrite_updated": "ව.නා.ප. නැවත ලිවීම සාර්ථකව යාවත්කාලීන කෙරිණි",
+    "rewrite_add": "ව.නා.ප. නැවත ලිවීමක් යොදන්න",
+    "rewrite_edit": "ව.නා.ප. නැවත ලිවීම සංස්කරණය",
    "rewrite_not_found": "ව.නා.ප. නැවත ලිවීම් හමු නොවිණි",
    "rewrite_confirm_delete": "\"{{key}}\" සඳහා ව.නා.ප. නැවත ලිවීම ඉවත් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද?",
    "rewrite_desc": "නිශ්චිත වසම් නාමයක් සඳහා අභිරුචි ව.නා.ප. ප්‍රතිචාර පහසුවෙන් වින්‍යාසගත කිරීමට ඉඩ දෙයි.",
    "rewrite_applied": "නැවත ලිවීමේ නීතිය යොදා ඇත",
-    "rewrite_hosts_applied": "ධාරක ගොනු නීතිය මගින් නැවත ලියා ඇත",
+    "rewrite_hosts_applied": "සත්කාරක ගොනුවක නීතියකින් නැවත ලියා ඇත",
    "dns_rewrites": "ව.නා.ප. නැවත ලිවීම්",
    "form_answer": "අ.ජා.කෙ. (IP) ලිපිනය ‌හෝ වසම ඇතුල් කරන්න ",
    "form_error_domain_format": "වලංගු නොවන වසම් ආකෘතියකි",
@@ -490,53 +501,57 @@
    "statistics_clear": "සංඛ්‍යාලේඛන හිස් කරන්න",
    "statistics_clear_confirm": "සංඛ්‍යාලේඛන ඉවත් කිරීමට වුවමනා ද?",
    "statistics_retention_confirm": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
-    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව ඉවත් කෙරිණි",
+    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව හිස් කෙරිණි",
    "statistics_enable": "සංඛ්‍යාලේඛන සබල කරන්න",
+    "ignore_domains": "නොසලකන වසම් (පේළියකට එක බැගින්)",
+    "ignore_domains_title": "නොසලකන වසම්",
+    "ignore_domains_desc_stats": "සංඛ්‍යාලේඛනයෙහි මෙම වසම් සඳහා විමසුම් නොලියැවෙයි",
+    "ignore_domains_desc_query": "විමසුම් සටහනෙහි මෙම වසම් සඳහා විමසුම් නොලියැවෙයි",
    "interval_hours": "පැය {{count}}",
    "interval_hours_plural": "පැය {{count}}",
    "filters_configuration": "පෙරහන් වින්‍යාසය",
    "filters_enable": "පෙරහන් සබල කරන්න",
    "filters_interval": "පෙරහන් යාවත්කාල කාල පරතරය",
    "disabled": "අබල කර ඇත",
-    "username_label": "පරිශීලක නාමය",
-    "username_placeholder": "පරිශීලක නාමය යොදන්න",
+    "username_label": "පරිශ්‍රීලක නාමය",
+    "username_placeholder": "පරිශ්‍රීලක නාමය යොදන්න",
    "password_label": "මුරපදය",
    "password_placeholder": "මුරපදය ඇතුල් කරන්න",
    "sign_in": "පුරන්න",
    "sign_out": "වරන්න",
    "forgot_password": "මුරපදය අමතක වුණා ද?",
-    "forgot_password_desc": "ඔබගේ පරිශීලක ගිණුම සඳහා නව මුරපදයක් සෑදීමට කරුණාකර <0>මෙම පියවර</0> අනුගමනය කරන්න.",
+    "forgot_password_desc": "ඔබගේ පරිශ්‍රීලක ගිණුම සඳහා නව මුරපදයක් සෑදීමට කරුණාකර <0>මෙම පියවර</0> අනුගමනය කරන්න.",
    "location": "ස්ථානය",
    "orgname": "සංවිධානයේ නම",
    "netname": "ජාල‌යේ  නම",
    "network": "ජාලය",
    "descr": "සවිස්තරය",
    "whois": "Whois",
-    "filtering_rules_learn_more": "ඔබගේ ම ධාරක ලැයිස්තු සෑදීම පිළිබඳව <0>තව දැනගන්න</0>.",
+    "filtering_rules_learn_more": "ඔබගේ ම සත්කාරක ලැයිස්තු සෑදීම පිළිබඳව <0>තව දැනගන්න</0>.",
    "blocked_by_response": "ප්‍රතිචාරය අන්. නාමයක් (CNAME) හෝ අ.ජා.කෙ. මගින් අවහිර කර ඇත",
    "blocked_by_cname_or_ip": "අන්. නාමයක් (CNAME) හෝ අ.ජා.කෙ. මගින් අවහිර කර ඇත",
    "try_again": "යළි උත්සාහය",
-    "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියන්න.",
+    "example_rewrite_domain": "මෙම වසම් නාමය සඳහා පමණක් ප්‍රතිචාර නැවත ලියයි.",
    "example_rewrite_wildcard": "<0>උදාහරණය.ලංකා</0> සහ එහි සියළුම උප වසම් සඳහා ප්‍රතිචාර නැවත ලියයි.",
-    "rewrite_ip_address": "අ.ජා.කෙ. ලිපිනය: මෙම අ.ජා.කෙ. A හෝ AAAA ප්‍රතිචාරයකට ගන්න",
-    "rewrite_domain_name": "වසම් නාමය: අන්. නාම (CNAME) වාර්තාවක් එක්කරන්න",
-    "disable_ipv6": "අයිපීවී6 ලිපින විසඳීම අබල කරන්න",
-    "disable_ipv6_desc": "අ.ජා.කෙ. අනු.6 ලිපින (AAAA වර්ගය) සඳහා වන සියළුම ව.නා.ප. විමසුම් අතහැර දමයි.",
-    "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය",
-    "fastest_addr_desc": "සියළුම ව.නා.ප. සේවාදායක වලින් විමසා සියළු ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා.කෙ. ලිපිනය ලබා දෙයි. සියළුම ව.නා.ප. ප්‍රතිචාර සඳහා ඇඩ්ගාර්ඩ් හෝම් රැඳී සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
+    "rewrite_ip_address": "අ.ජා.කෙ. ලිපිනය: A හෝ AAAA ප්‍රතිචාරයකට අ.ජා.කෙ. ලිපිනයක් යොදන්න",
+    "rewrite_domain_name": "වසම් නාමය: අන්වර්ථ නාමයක් (CNAME) එක් කරන්න",
+    "disable_ipv6": "IPv6 ලිපින විසඳීම අබල කරන්න",
+    "disable_ipv6_desc": "IPv6 ලිපින (AAAA වර්ගය) සඳහා වන සියළුම ව.නා.ප. විමසුම් අතහැර දමයි. HTTPS ප්‍රතිචාර වලින් IPv6 ඉඟි ඉවත් කරයි.",
+    "fastest_addr": "වේගවත්ම අන්තර්ජාල කෙටුම්පතක (IP) ලිපිනය",
+    "fastest_addr_desc": "සියළුම ව.නා.ප. සේවාදායක වලින් විමසා එම ප්‍රතිචාර අතරින් වේගවත්ම අ.ජා.කෙ. ලිපිනය ලබා දෙයි. සියළුම ව.නා.ප. ප්‍රතිචාර සඳහා ඇඩ්ගාර්ඩ් හෝම් රැඳී සිටිය යුතු බැවින් මෙය ව.නා.ප. විමසුම් මන්දගාමී කරන නමුත් සමස්ත සම්බන්ධතාවය වැඩි දියුණු කරයි.",
    "autofix_warning_text": "ඔබ \"නිරාකරණය\" යන්න එබුවහොත්, ඔබගේ පද්ධතිය ඇඩ්ගාර්ඩ් හෝම් ව.නා.ප. සේවාදායකය භාවිතයට වින්‍යාසගත කෙරෙනු ඇත.",
    "autofix_warning_result": "ප්‍රතිඵලයක් ලෙස ඔබගේ පද්ධතියෙන් ලැබෙන සියළුම ව.නා.ප. ඉල්ලීම් මූලිකවම ඇඩ්ගාර්ඩ් හෝම් විසින් සකසනු ඇත.",
    "tags_title": "අනන්‍යන",
-    "tags_desc": "අනුග්‍රාහකයට අනුරූපව අනන්‍යන ඔබට තෝරා ගත හැකිය. ඒවා වඩාත් නිවැරදිව යෙදීමට \nඅනන්‍යන පෙරහන් නීති වලට ඇතුළත් කරන්න. <0>තව දැන ගන්න</0>.",
+    "tags_desc": "අනුග්‍රාහකයට අනුරූප වන අනන්‍යන ඔබට තේරීමට හැකිය. ඒවා වඩාත් නිවැරදිව යෙදීමට \nඅනන්‍යන පෙරහන් නීති වලට ඇතුළත් කරන්න. <0>තව දැන ගන්න</0>.",
    "form_select_tags": "අනුග්‍රාහක අනන්‍යන තෝරන්න",
    "check_title": "පෙරීම පරීක්‍ෂා කරන්න",
    "check_desc": "සත්කාරක නාමය පෙරෙනවා දැයි පරීක්‍ෂා කරන්න.",
    "check": "පරීක්‍ෂාව",
-    "form_enter_host": "ධාරක නාමයක් ඇතුල් කරන්න",
+    "form_enter_host": "සත්කාරක නාමයක් යොදන්න",
    "filtered_custom_rules": "අභිරුචි පෙරීමේ නීති මගින් පෙරහන් කරන ලදි",
    "choose_from_list": "ලැයිස්තුවෙන් තෝරන්න",
-    "add_custom_list": "අභිරුචි ලැයිස්තුවක් එක්කරන්න",
-    "host_whitelisted": "ධාරකයට ඉඩ දී ඇත",
+    "add_custom_list": "අභිරුචි ලැයිස්තුවක්",
+    "host_whitelisted": "සත්කාරකයට ඉඩ දී ඇත",
    "check_ip": "අ.ජා.කෙ. ලිපින: {{ip}}",
    "check_cname": "අන්. නාමය (CNAME): {{cname}}",
    "check_reason": "හේතුව: {{reason}}",
@@ -548,7 +563,7 @@
    "client_blocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අවහිර කෙරිණි",
    "client_unblocked": "අනුග්‍රාහකය \"{{ip}}\" සාර්ථකව අනවහිර කෙරිණි",
    "static_ip": "ස්ථිතික අ.ජා. කෙ. ලිපිනය",
-    "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් ඇවැසිය. එසේ නැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දිය හැකිය.",
+    "static_ip_desc": "ඇඩ්ගාර්ඩ් හෝම් යනු සේවාදායකයක් බැවින් එය නිසි ලෙස ක්‍රියා කිරීමට ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනයක් ඇවැසිය. එසේ නැතිනම්, යම් අවස්ථාවක දී ඔබගේ මාර්ගකාරකය මෙම උපාංගයට වෙනත් අ.ජා. කෙ. ලිපිනයක් ලබා දීමට ඉඩ තිබේ.",
    "set_static_ip": "ස්ථිතික අ.ජා.කෙ. (IP) ලිපිනයක් සකසන්න",
    "install_static_ok": "සුභ තොරතුරක්! ස්ථිතික අන්තර්ජාල කෙටුම්පත් (IP) ලිපිනය දැනටමත් වින්‍යාසගත කර ඇත",
    "install_static_error": "මෙම ජාල අතුරුමුහුණත සඳහා ඇඩ්ගාර්ඩ් හෝම් හට එය ස්වයංක්‍රීයව වින්‍යාසගත කිරීමට නොහැකිය. මෙය අතින් කරන්නේ කෙසේද යන්න පිළිබඳ උපදෙස් සොයා ගන්න.",
@@ -581,7 +596,7 @@
    "cache_ttl_max_override_desc": "ව.නා.ප. නිහිතයෙහි නිවේශිත සඳහා උපරිම පවත්නා කාලයක අගයක් (තත්.) සකසන්න.",
    "ttl_cache_validation": "නිහිතයෙහි පාගාගෙන යන අවම පව. කා. (TTL) උපරිමයට වඩා අඩු හෝ සමාන විය යුතුය",
    "cache_optimistic": "සර්වශුභවාදී නිහිතගතය",
-    "cache_optimistic_desc": "නිවේශිත කල් ඉකුත් වූ විට පවා ඇඩ්ගාර්ඩ් හෝම් ට නිහිතයෙන් ප්‍රතිචාර දැක්වීමට සලස්වයි එමෙන්ම ඒවා නැවත නැවුම් කිරීමට ද උත්සාහ කරයි.",
+    "cache_optimistic_desc": "නිවේශිත කල් ඉකුත් වූ විට පවා ඇඩ්ගාර්ඩ් හෝම් නිහිතයෙන් ප්‍රතිචාර දැක්වීමට සලස්වයි එමෙන්ම ඒවා නැවත නැවුම් කිරීමට ද උත්සාහ කරයි.",
    "filter_category_general": "පොදු",
    "filter_category_security": "ආරක්‍ෂණ",
    "filter_category_regional": "ප්‍රාදේශීය",
@@ -601,5 +616,55 @@
    "parental_control": "දෙමාපිය පාලනය",
    "safe_browsing": "ආරක්‍ෂිත පිරික්සුම",
    "served_from_cache": "{{value}} <i>(නිහිතයෙන් ගැනිණි)</i>",
-    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි"
+    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි",
+    "anonymizer_notification": "<0>සටහන:</0> අ.ජා.කෙ. නිර්නාමිකකරණය සබලයි. ඔබට එය <1>පොදු සැකසුම්</1> හරහා අබල කිරීමට හැකිය .",
+    "confirm_dns_cache_clear": "ඔබට ව.නා.ප. නිහිතය හිස් කිරීමට වුවමනාද?",
+    "cache_cleared": "ව.නා.ප. නිහිතය හිස් කෙරිණි",
+    "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": "විමසුම් සටහනට මෙම අනුග්‍රාහකය යොදන්න එපා",
+    "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": "අඟහ",
+    "wednesday_short": "බදාදා",
+    "thursday_short": "බ්‍රහස්",
+    "friday_short": "සිකු",
+    "saturday_short": "සෙන"
 }
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Vyrovnávanie záťaže",
    "load_balancing_desc": "Dopytovať len jeden server v danom čase. AdGuard Home použije na výber servera vážený náhodný algoritmus, aby sa najrýchlejší server používal častejšie.",
    "bootstrap_dns": "Bootstrap DNS servery",
-    "bootstrap_dns_desc": "Bootstrap DNS servery sa používajú na rozlíšenie IP adries DoH/DoT rezolverov, ktoré zadáte ako upstreams.",
+    "bootstrap_dns_desc": "IP adresy serverov DNS používaných na rozlíšenie IP adries prekladačov DoH/DoT, ktoré zadáte ako upstream. Komentáre nie sú povolené.",
+    "fallback_dns_title": "Záložné servery DNS",
+    "fallback_dns_desc": "Zoznam záložných serverov DNS, ktoré sa používajú, keď nadradený servery DNS neodpovedajú. Syntax je rovnaká ako v hlavnom poli vyššie.",
+    "fallback_dns_placeholder": "Zadajte jeden záložný server DNS na riadok",
    "local_ptr_title": "Súkromné reverzné DNS servery",
    "local_ptr_desc": "DNS servery, ktoré AdGuard Home používa pre miestne PTR dopyty. Tieto servery sa používajú na rozlíšenie názvov hostiteľov klientov so súkromnými adresami IP, napríklad \"192.168.12.34\", pomocou reverzného DNS. Ak nie je nastavené inak, AdGuard Home použije adresy predvolených prekladačov DNS Vášho operačného systému okrem adries samotného AdGuard Home.",
    "local_ptr_default_resolver": "V predvolenom nastavení používa AdGuard Home nasledujúce reverzné DNS prekladače: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home nemohol určiť vhodné súkromné reverzné DNS prekladače pre tento systém.",
-    "local_ptr_placeholder": "Na každý riadok zadajte adresu jedného servera",
+    "local_ptr_placeholder": "Na každý riadok zadajte IP adresu jedného servera",
    "resolve_clients_title": "Povoliť spätný preklad IP adries klientov",
    "resolve_clients_desc": "Reverzne rozlišuje adresy IP klientov na ich názvy hostiteľov odosielaním PTR dopytov príslušným prekladačom (súkromné DNS servery pre miestnych klientov, servery typu upstream pre klientov s verejnými IP adresami).",
    "use_private_ptr_resolvers_title": "Použiť súkromné reverzné DNS resolvery",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "za posledných 24 hodín",
+    "for_last_hours": "za poslednú {{count}} hodinu",
+    "for_last_hours_plural": "za posledné {{count}} hodiny|za posledných {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Najčastejší klienti",
    "no_clients_found": "Neboli nájdení žiadni klienti",
    "general_statistics": "Všeobecná štatistika",
+    "top_upstreams": "Často požadované upstream servery",
+    "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_24_hours": "Počet DNS dopytov spracovaných za posledných 24 hodín",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Konfigurované v {{path}}",
    "test_upstream_btn": "Test upstreamov",
    "upstreams": "Upstreams",
+    "upstream": "Upstream server",
    "apply_btn": "Použiť",
    "disabled_filtering_toast": "Vypnutá filtrácia",
    "enabled_filtering_toast": "Zapnutá filtrácia",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Denník dopytov bol úspešne vymazaný",
    "query_log_updated": "Denník dopytov bol úspešne aktualizovaný",
    "query_log_clear": "Vymazať denníky dopytov",
-    "query_log_retention": "Obdobie záznamu denníka dopytov",
+    "query_log_retention": "Rotácia denníkov dopytov",
    "query_log_enable": "Zapnúť denník",
    "query_log_configuration": "Konfigurácia denníka",
    "query_log_disabled": "Protokol dopytov je vypnutý a možno ho nakonfigurovať v <0>nastaveniach</0>",
    "query_log_strict_search": "Na prísne vyhľadávanie použite dvojité úvodzovky",
-    "query_log_retention_confirm": "Naozaj chcete zmeniť uchovávanie denníku dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
+    "query_log_retention_confirm": "Naozaj chcete zmeniť rotáciu denníka dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
    "anonymize_client_ip": "Anonymizujte IP klienta",
    "anonymize_client_ip_desc": "Neukladať úplnú IP adresu klienta do protokolov a štatistík",
    "dns_config": "Konfigurácia DNS servera",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -387,7 +413,7 @@
    "encryption_key": "Súkromný kľúč",
    "encryption_key_input": "Skopírujte a prilepte sem svoj súkromný kľúč vo formáte PEM pre Váš certifikát.",
    "encryption_enable": "Zapnite šifrovanie (HTTPS, DNS-cez-HTTPS a DNS-cez-TLS)",
-    "encryption_enable_desc": "Ak je šifrovanie zapnuté, AdGuard Home administrátorské rozhranie bude pracovať cez HTTPS a DNS server bude počúvať požiadavky cez DNS-cez-HTTPS a DNS-cez-TLS.",
+    "encryption_enable_desc": "Ak je šifrovanie zapnuté, AdGuard Home administrátorské rozhranie bude pracovať cez HTTPS a DNS server bude počúvať dopyty cez DNS-cez-HTTPS a DNS-cez-TLS.",
    "encryption_chain_valid": "Certifikačný reťazec je platný",
    "encryption_chain_invalid": "Certifikačný reťazec je neplatný",
    "encryption_key_valid": "Toto je platný {{type}} súkromný kľúč",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Naozaj chcete vymazať \"{{key}}\" klienta?",
    "list_confirm_delete": "Naozaj chcete vymazať tento zoznam?",
    "auto_clients_title": "Runtime klienti",
-    "auto_clients_desc": "Zariadenia, ktoré nie sú na zozname trvalých klientov, ktorí môžu stále používať AdGuard Home",
+    "auto_clients_desc": "Informácie o IP adresách zariadení, ktoré používajú alebo môžu používať AdGuard Home. Tieto informácie sa získavajú z viacerých zdrojov vrátane súborov hosts, reverzného DNS atď.",
    "access_title": "Nastavenia prístupu",
    "access_desc": "Tu môžete konfigurovať pravidlá prístupu pre server DNS AdGuard Home.",
    "access_allowed_title": "Povolení klienti",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Pre použitie <1>DNS-over-HTTPS</1> alebo <1>DNS-over-TLS</1>, potrebujete v nastaveniach AdGuard Home <0>nakonfigurovať šifrovanie</0>.",
    "rewrite_added": "DNS prepísanie pre \"{{key}}\" bolo úspešne pridané",
    "rewrite_deleted": "DNS prepísanie pre \"{{key}}\" bolo úspešne vymazané",
+    "rewrite_updated": "Prepísanie DNS bolo úspešne aktualizované",
    "rewrite_add": "Pridať DNS prepísanie",
+    "rewrite_edit": "Upraviť prepísanie DNS",
    "rewrite_not_found": "Neboli nájdené žiadne DNS prepísania",
    "rewrite_confirm_delete": "Naozaj chcete odstrániť prepísanie DNS pre \"{{key}}\"?",
    "rewrite_desc": "Umožňuje ľahko nakonfigurovať vlastnú odpoveď DNS pre konkrétne meno domény.",
@@ -495,7 +523,7 @@
    "blocked_services": "Blokované služby",
    "blocked_services_desc": "Umožňuje rýchlo blokovať populárne stránky a služby.",
    "blocked_services_saved": "Blokované služby boli úspešne uložené",
-    "blocked_services_global": "Použite globálne blokované služby",
+    "blocked_services_global": "Použiť globálne blokované služby",
    "blocked_service": "Blokované služby",
    "block_all": "Blokovať všetko",
    "unblock_all": "Odblokovať všetko",
@@ -528,8 +556,8 @@
    "statistics_enable": "Zapnúť štatistiku",
    "ignore_domains": "Ignorované domény (oddelené novým riadkom)",
    "ignore_domains_title": "Ignorované domény",
-    "ignore_domains_desc_stats": "Dopyty pre tieto domény sa nezapisujú do štatistík",
-    "ignore_domains_desc_query": "Dopyty pre tieto domény sa nezapisujú do denníka dopytov",
+    "ignore_domains_desc_stats": "Dopyty zodpovedajúce týmto pravidlám sa nezapisujú do štatistík",
+    "ignore_domains_desc_query": "Dopyty zodpovedajúce týmto pravidlám sa nezapisujú do denníka dopytov",
    "interval_hours": "{{count}} hodina",
    "interval_hours_plural": "{{count}} hodín",
    "filters_configuration": "Konfigurácia filtrov",
@@ -552,7 +580,7 @@
    "whois": "WHOIS",
    "filtering_rules_learn_more": "<0>Dozvedieť sa viac</0> o tvorbe vlastných zoznamov hostiteľov.",
    "blocked_by_response": "Blokované pomocou CNAME alebo IP v odpovedi",
-    "blocked_by_cname_or_ip": "Zablokované na základe CNAME alebo IP",
+    "blocked_by_cname_or_ip": "Blokované pomocou CNAME alebo IP",
    "try_again": "Skúste znova",
    "domain_desc": "Zadajte meno domény alebo zástupný znak, ktorý chcete prepísať.",
    "example_rewrite_domain": "prepísať odpovede iba pre toto meno domény.",
@@ -562,14 +590,14 @@
    "rewrite_A": "<0>A</0>: špeciálna hodnota, uchovávajte záznamy <0>A</0> z upstream",
    "rewrite_AAAA": "<0>AAAA</0>: špeciálna hodnota, uchovávajte záznamy <0>AAAA</0> z upstream",
    "disable_ipv6": "Vypnúť rozlišovanie IPv6 adries",
-    "disable_ipv6_desc": "Vynechať všetky dotazy DNS na IPv6 adresy (typ AAAA).",
+    "disable_ipv6_desc": "Ignorovať všetky dotazy DNS na adresy IPv6 (typ AAAA) a odstrániť IPv6 údaje z HTTPS odpovedí.",
    "fastest_addr": "Najrýchlejšia IP adresa",
    "fastest_addr_desc": "Dopytovať všetky servery DNS a vrátiť najrýchlejšiu IP adresu zo všetkých odpovedí. Toto spomalí DNS dopyty, pretože AdGuard Home musí čakať na odpovede zo všetkých serverov DNS, ale zlepší sa celkové pripojenie.",
    "autofix_warning_text": "Ak kliknete na „Opraviť“, AdGuardHome nakonfiguruje Váš systém tak, aby používal DNS server AdGuardHome.",
    "autofix_warning_list": "Bude vykonávať tieto úlohy: <0>Deaktivovať systém DNSStubListener</0> <0>Nastaviť adresu servera DNS na 127.0.0.1</0> <0>Nahradiť cieľový symbolický odkaz /etc/resolv.conf na /run/systemd/resolve/resolv.conf</0> <0>Zastaviť službu DNSStubListener (znova načítať službu systemd-resolved)</0>",
    "autofix_warning_result": "Výsledkom bude, že všetky DNS dopyty z Vášho systému budú štandardne spracované službou AdGuard Home.",
    "tags_title": "Tagy",
-    "tags_desc": "Môžete vybrať značky, ktoré zodpovedajú klientovi. Zahrňte značky do pravidiel filtrovania, aby ste ich použili presnejšie. <0>Viac informácií</0>.",
+    "tags_desc": "Môžete vybrať značky, ktoré zodpovedajú klientovi. Zahrňte značky do pravidiel filtrácie, aby ste ich použili presnejšie. <0>Viac informácií</0>.",
    "form_select_tags": "Zvoľte tagy klienta",
    "check_title": "Skontrolujte filtráciu",
    "check_desc": "Skontrolujte, či je názov hostiteľa filtrovaný.",
@@ -606,7 +634,7 @@
    "show_whitelisted_responses": "Obsiahnuté v bielej listine",
    "show_processed_responses": "Spracované",
    "blocked_safebrowsing": "Zablokované modulom Bezpečné prehliadanie",
-    "blocked_adult_websites": "Zablokovaná stránka pre dospelých",
+    "blocked_adult_websites": "Zablokované Rodičovskou kontrolou",
    "blocked_threats": "Zablokované hrozby",
    "allowed": "Povolené",
    "filtered": "Filtrované",
@@ -645,7 +673,7 @@
    "parental_control": "Rodičovská kontrola",
    "safe_browsing": "Bezpečné prehliadanie",
    "served_from_cache": "{{value}} <i>(prevzatá z cache pamäte)</i>",
-    "form_error_password_length": "Heslo musí mať dĺžku aspoň {{value}} znakov",
+    "form_error_password_length": "Heslo musí mať od {{min}} do {{max}} 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á",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Vypnite ochranu na {{count}} hodinu",
    "disable_notify_for_hours_plural": "Vypnite ochranu na {{count}} hodín",
    "disable_notify_until_tomorrow": "Vypnúť ochranu do zajtra",
-    "enable_protection_timer": "Ochrana bude zapnutá o {{time}}"
+    "enable_protection_timer": "Ochrana bude zapnutá o {{time}}",
+    "custom_retention_input": "Zadajte retenciu v hodinách",
+    "custom_rotation_input": "Zadajte rotáciu v hodinách",
+    "protection_section_label": "Ochrana",
+    "log_and_stats_section_label": "Protokol dopytov a štatistiky",
+    "ignore_query_log": "Ignorovať tohto klienta v denníku dopytov",
+    "ignore_statistics": "Ignorovanie tohto klienta v štatistikách",
+    "schedule_services": "Pozastavenie blokovania služby",
+    "schedule_services_desc": "Konfigurácia plánu pozastavenia filtra blokovania služieb",
+    "schedule_services_desc_client": "Konfigurácia plánu pozastavenia filtra blokovania služieb pre tohto klienta",
+    "schedule_desc": "Nastavenie doby nečinnosti pre blokované služby",
+    "schedule_invalid_select": "Čas začiatku musí byť pred časom ukončenia",
+    "schedule_select_days": "Zvoliť dni",
+    "schedule_timezone": "Vyberte časové pásmo",
+    "schedule_current_timezone": "Aktuálne časové pásmo: {{value}}",
+    "schedule_time_all_day": "Celý deň",
+    "schedule_modal_description": "Tento plán nahradí všetky existujúce plány na rovnaký deň v týždni. Každý deň v týždni môže mať iba jedno obdobie nečinnosti.",
+    "schedule_modal_time_off": "Žiadne blokovanie služby:",
+    "schedule_new": "Nový časový plán",
+    "schedule_edit": "Upraviť časový plán",
+    "schedule_save": "Uložiť časový plán",
+    "schedule_add": "Pridať časový plán",
+    "schedule_remove": "Odstrániť časový plán",
+    "schedule_from": "Od",
+    "schedule_to": "Do",
+    "sunday": "Nedeľa",
+    "monday": "Pondelok",
+    "tuesday": "Utorok",
+    "wednesday": "Streda",
+    "thursday": "Štvrtok",
+    "friday": "Piatok",
+    "saturday": "Sobota",
+    "sunday_short": "Ned",
+    "monday_short": "Pon",
+    "tuesday_short": "Uto",
+    "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"
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Uravnavanje obremenitve",
    "load_balancing_desc": "Poizvedujte po enem strežniku navzgor. AdGuard Home s pomočjo tehtanega naključnega algoritma izbere strežnik, tako da se najpogosteje uporablja najhitrejši strežnik.",
    "bootstrap_dns": "Zagonski DNS strežniki",
-    "bootstrap_dns_desc": "Zagonski DNS strežniki se uporabljajo za razreševanje IP naslovov DoH/DoT reševalcev, ki jih določite kot navzgornje.",
+    "bootstrap_dns_desc": "Naslovi IP strežnikov DNS, ki se uporabljajo za razreševanje naslovov IP razreševalcev DoH/DoT, ki jih določite kot navzgor. Komentarji niso dovoljeni.",
+    "fallback_dns_title": "Rezervni strežniki DNS",
+    "fallback_dns_desc": "Seznam rezervnih strežnikov DNS, ki se uporabljajo, ko se gorvodni strežniki DNS ne odzivajo. Sintaksa je enaka kot v zgornjem gorvodnem polju.",
+    "fallback_dns_placeholder": "Vnesite en rezervni strežnik DNS na vrstico",
    "local_ptr_title": "Zasebni povratni strežniki DNS",
    "local_ptr_desc": "Strežniki DNS, ki jih AdGuard Home uporablja za lokalne PTR poizvedbe. Ti strežniki se uporabljajo za reševanje zahtev PTR za naslove v zasebnih obsegih IP, na primer \"192.168.12.34\", z uporabo obratnega DNS. Če ni nastavljen, AdGuard Home uporablja naslove privzetih razreševalnikov DNS vašega OS, razen naslovov samega AdGuard Home.",
    "local_ptr_default_resolver": "AdGuard Home privzeto uporablja te povratne razreševalnike DNS: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home ni mogel določiti ustreznih zasebnih povratnih reševalcev DNS za ta sistem.",
-    "local_ptr_placeholder": "V vrstico vnesite en naslov strežnika",
+    "local_ptr_placeholder": "Vnesite en naslov IP na vrstico",
    "resolve_clients_title": "Omogoči obratno reševanje naslovov IP gostiteljev",
    "resolve_clients_desc": "Povratno razrešite naslove IP odjemalcev v njihova gostiteljska imena, tako da pošljete poizvedbe PTR ustreznim razreševalcem (zasebni strežniki DNS za lokalne odjemalce, gorvodni strežniki za odjemalce z javnimi naslovi IP).",
    "use_private_ptr_resolvers_title": "Uporabi zasebne povratne razreševalnike rDNS",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "v zadnjih 24 urah",
+    "for_last_hours": "za zadnjo {{count}} uro",
+    "for_last_hours_plural": "za zadnjih {{count}} ur",
    "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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Najpogostejši odjemalci",
    "no_clients_found": "Ni najdenih odjemalcev",
    "general_statistics": "Splošna statistika",
+    "top_upstreams": "Pogosto zahtevani gorvodni strežniki",
+    "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_24_hours": "Število obdelanih poizvedb DNS v zadnjih 24 urah",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Nastavljen v {{path}}",
    "test_upstream_btn": "Preizkusi upstreame",
    "upstreams": "Tokovi navzgor",
+    "upstream": "Gorvodni strežnik",
    "apply_btn": "Uporabi",
    "disabled_filtering_toast": "Onemogočeno filtriranje",
    "enabled_filtering_toast": "Omogočeno filtriranje",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Dnevnik poizvedb je uspešno izbrisan",
    "query_log_updated": "Dnevnik poizvedb je bil uspešno posodobljen",
    "query_log_clear": "Počisti dnevnike poizvedb",
-    "query_log_retention": "Zadrževanje dnevnikov poizvedb",
+    "query_log_retention": "Rotacija dnevnikov poizvedb",
    "query_log_enable": "Omogoči dnevni",
    "query_log_configuration": "Konfiguracija dnevnikov",
    "query_log_disabled": "Dnevnik poizvedb je onemogočen in ga je mogoče konfigurirati v <0>nastavitvah</0>",
    "query_log_strict_search": "Za strogo iskanje uporabite dvojne narekovaje",
-    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
+    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti rotacijo dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
    "anonymize_client_ip": "Anonimiziraj odjemalca IP",
    "anonymize_client_ip_desc": "Ne shrani celotnega naslova IP odjemalca v dnevnikih ali statistiki",
    "dns_config": "Konfiguracija strežnika DNS",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "Ali ste prepričani, da želite izbrisati odjemalca \"{{key}}\"?",
    "list_confirm_delete": "Ali ste prepričani, da želite izbrisati ta seznam?",
    "auto_clients_title": "Odjemalci izvajanja",
-    "auto_clients_desc": "Naprave, ki niso na seznamu trajnih odjemalcev, ki morda še vedno uporabljajo AdGuard Home",
+    "auto_clients_desc": "Informacije o naslovih IP naprav, ki uporabljajo ali bi lahko uporabljale AdGuard Home. Te informacije so zbrane iz več virov, vključno z datotekami gostiteljev, povratnim DNS-jem itd.",
    "access_title": "Nastavitve dostopa",
    "access_desc": "Tukaj lahko nastavite pravila dostopa strežnika DNS AdGuard Home",
    "access_allowed_title": "Dovoljeni odjemalci",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "Za uporabo <1>DNS-prek-HTTPS</1> ali <1>DNS-prek-TLS</1>, morate <0>konfigurirati šifriranje</0> v nastavitvah AdGuard Home.",
    "rewrite_added": "Uspešno je dodano DNS prepisovanje za \"{{key}}\"",
    "rewrite_deleted": "Uspešno je izbrisano DNS prepisovanje za \"{{key}}\"",
+    "rewrite_updated": "DNS prepisovanje uspešno posodobljen",
    "rewrite_add": "Dodaj prepisovanje DNS",
+    "rewrite_edit": "Urejanje prepisa DNS",
    "rewrite_not_found": "Ni bilo najdenih prepisovanj DNS",
    "rewrite_confirm_delete": "Ali ste prepričani, da želite izbrisati prepisovanje DNS za \"{{key}}\"?",
    "rewrite_desc": "Omogoča enostavno konfiguriranje odgovora DNS po meri za določeno ime domene.",
@@ -528,8 +556,8 @@
    "statistics_enable": "Omogoči statistiko",
    "ignore_domains": "Prezrte domene (ločene z novo vrstico)",
    "ignore_domains_title": "Prezrte domene",
-    "ignore_domains_desc_stats": "Poizvedbe za te domene niso zapisane v statistiko",
-    "ignore_domains_desc_query": "Poizvedbe za te domene niso zapisane v dnevnik poizvedb",
+    "ignore_domains_desc_stats": "Poizvedbe, ki ustrezajo tem pravilom, se ne zapišejo v statistiko",
+    "ignore_domains_desc_query": "Poizvedbe, ki ustrezajo tem pravilom, se ne zapišejo v dnevnik poizvedb",
    "interval_hours": "{{count}} ur",
    "interval_hours_plural": "{{count}} ur",
    "filters_configuration": "Nastavitve filtrov",
@@ -562,7 +590,7 @@
    "rewrite_A": ">A</0>: posebna vrednost, obdrži <0>A</0> zapise iz gorvodnega toka",
    "rewrite_AAAA": ">A</0>: posebna vrednost, obdrži <0>AAAA</0> zapise iz gorvodnega toka",
    "disable_ipv6": "Onemogoči reševanje naslovov IPv6",
-    "disable_ipv6_desc": "Spusti vse poizvedbe DNS za naslove IPv6 (vnesite AAAA).",
+    "disable_ipv6_desc": "Spustite vse poizvedbe DNS za naslove IPv6 (tip AAAA) in odstranite namige IPv6 iz odgovorov HTTPS.",
    "fastest_addr": "Najhitrejši IP naslov",
    "fastest_addr_desc": "Zahtevajte vse strežnike DNS in vrne najhitrejši naslov IP med vsemi odgovori. To upočasni zahteve DNS, saj mora AdGuard Home čakati na odgovore vseh strežnikov DNS, vendar izboljša splošno povezljivost.",
    "autofix_warning_text": "Če kliknete 'Popravi', bo AdGuardHome konfiguriral vaš sistem za uporabo strežnika AdGuardHome DNS.",
@@ -645,7 +673,7 @@
    "parental_control": "Starševski nadzor",
    "safe_browsing": "Varno brskanje",
    "served_from_cache": "{{value}} <i>(postreženo iz predpomnilnika)</i>",
-    "form_error_password_length": "Geslo mora vsebovati najmanj {{value}} znakov",
+    "form_error_password_length": "Geslo mora vsebovati od {{min}} do {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Onemogoči zaščito za {{count}} uro",
    "disable_notify_for_hours_plural": "Onemogoči zaščito za {{count}} ur",
    "disable_notify_until_tomorrow": "Onemogoči zaščito do jutri",
-    "enable_protection_timer": "Zaščita bo omogočena ob {{time}}"
+    "enable_protection_timer": "Zaščita bo omogočena ob {{time}}",
+    "custom_retention_input": "Vnesite zadrževanje v urah",
+    "custom_rotation_input": "Vnesite rotacijo v urah",
+    "protection_section_label": "Zaščita",
+    "log_and_stats_section_label": "Dnevnik poizvedb in statistika",
+    "ignore_query_log": "Ignorirajte tega odjemalca v dnevniku poizvedb",
+    "ignore_statistics": "Ignoriranje tega odjemalca v statistiki",
+    "schedule_services": "Začasno ustavi onemogočanje storitve",
+    "schedule_services_desc": "Nastavite rokovnik premora filtra za onemogočanje storitev",
+    "schedule_services_desc_client": "Nastavite rokovnik premora filtra za onemogočanje storitev za tega odjemalca",
+    "schedule_desc": "Nastavite obdobja nedejavnosti onemogočenih storitev",
+    "schedule_invalid_select": "Začetni čas mora biti pred končnim časom",
+    "schedule_select_days": "Izberite dneve",
+    "schedule_timezone": "Izberite časovni pas",
+    "schedule_current_timezone": "Trenutni časovni pas: {{value}}",
+    "schedule_time_all_day": "Ves dan",
+    "schedule_modal_description": "Ta rokovnik bo nadomestil vse obstoječe rokovnike za isti dan v tednu. Vsak dan v tednu ima lahko samo eno obdobje neaktivnosti.",
+    "schedule_modal_time_off": "Brez onemogočanja storitve:",
+    "schedule_new": "Nov rokovnik",
+    "schedule_edit": "Uredi rokovnik",
+    "schedule_save": "Shrani rokovnik",
+    "schedule_add": "Dodaj rokovnik",
+    "schedule_remove": "Odstrani rokovnik",
+    "schedule_from": "Od",
+    "schedule_to": "Do",
+    "sunday": "Nedelja",
+    "monday": "Ponedeljek",
+    "tuesday": "Torek",
+    "wednesday": "Sreda",
+    "thursday": "Četrtek",
+    "friday": "Petek",
+    "saturday": "Sobota",
+    "sunday_short": "Ned",
+    "monday_short": "Pon",
+    "tuesday_short": "Tor",
+    "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"
 }
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Load-balancing",
    "load_balancing_desc": "Koristi jedan upstream server. AdGuard Home koristi najnoviji nasumični algoritam da izabere server tako da se najbrži server češće koristi.",
    "bootstrap_dns": "Bootstrap DNS serveri",
-    "bootstrap_dns_desc": "Bootstrap DNS serveri se koriste da reše IP adrese od DoH/DoT razrešivača koje ste odredili kao upstream.",
+    "bootstrap_dns_desc": "IP adrese DNS servera koje se koriste za rešavanje IP adresa DoH/DoT razrešivača koje navodite kao uzvodne. Komentari nisu dozvoljeni.",
+    "fallback_dns_title": "Odstupajući DNS serveri",
+    "fallback_dns_desc": "Lista povratnih DNS servera koji se koriste kada se uzvodni DNS serveri ne odaziva. Sintaksa je ista kao u glavnom uzvodnom polju iznad.",
+    "fallback_dns_placeholder": "Unesite jedan povratni DNS server po liniji",
    "local_ptr_title": "Private reverse DNS serveri",
    "local_ptr_desc": "DNS serveri koje AdGuard Home koristi za lokalne PTR upite. Ovi serveri se koriste za rešavanje imena domaćina klijenata sa privatnim IP adresama, na primer \"192.168.12.34\", koristeći obrnuti DNS. Ako nije podešen, AdGuard Home koristi adrese podrazumevanih DNS razrešivača vašeg OS-a osim adresa samog AdGuard Home-a.",
    "local_ptr_default_resolver": "Podrazumevano, AdGuard Home koristi sledeće obrnute DNS razrešivače: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home ne može da odredi pogodne privatne obrnute DNS razrešivače za ovaj sistem.",
-    "local_ptr_placeholder": "Unesite jednu adresu servera po redu",
+    "local_ptr_placeholder": "Unesite jednu IP adresu servera po redu",
    "resolve_clients_title": "Uključi obrnuto razrešavanje klijentskih IP adresa",
    "resolve_clients_desc": "Obrnuto razrešite IP adrese klijenata u njihova imena domaćina slanjem PTR upita odgovarajućim razrešivačima (privatni DNS serveri za lokalne klijente, uzvodni serveri za klijente sa javnim IP adresama).",
    "use_private_ptr_resolvers_title": "Koristi privatne obrnute razrešivače",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "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_24_hours": "u poslednja 24 časa",
+    "for_last_hours": "u poslednjih {{count}} sat",
+    "for_last_hours_plural": "u poslednjih {{count}} sati",
    "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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Najčešći klijenti",
    "no_clients_found": "Nema pronađenih klijenata",
    "general_statistics": "Opšte statistike",
+    "top_upstreams": "Često traženi upstream serveri",
+    "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_24_hours": "Broj obrađenih DNS unosa u poslednja 24 časa",
+    "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_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",
    "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.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Konfiguriši u {{path}}",
    "test_upstream_btn": "Testiraj upstreams",
    "upstreams": "Upstreams",
+    "upstream": "Upstream-server",
    "apply_btn": "Primeni",
    "disabled_filtering_toast": "Isključeno filtriranje",
    "enabled_filtering_toast": "Uključeno filtriranje",
@@ -167,6 +180,7 @@
    "enabled_parental_toast": "Uključena roditeljska kontrola",
    "disabled_safe_search_toast": "Isključena sigurna pretraga",
    "enabled_save_search_toast": "Uključeno sigurno pretraživanje",
+    "updated_save_search_toast": "Ažurirane postavke bezbedne pretrage",
    "enabled_table_header": "Uključeno",
    "name_table_header": "Ime",
    "list_url_table_header": "URL do liste",
@@ -256,12 +270,12 @@
    "query_log_cleared": "Dnevnik unosa je uspešno očišćen",
    "query_log_updated": "Dnevnik zapisa je uspešno ažuriran",
    "query_log_clear": "Očisti dnevnike unosa",
-    "query_log_retention": "Zadržavanje dnevnika unosa",
+    "query_log_retention": "Rotacija evidencija upita",
    "query_log_enable": "Uključi dnevnik",
    "query_log_configuration": "Konfiguracija dnevnika",
    "query_log_disabled": "Dnevnik unosa je isključen ali se može konfigurisati u <0>postavkama</0>",
    "query_log_strict_search": "Koristi duple navodnike za striktnu pretragu",
-    "query_log_retention_confirm": "Jeste li sigurni da želite da promenite zadržavanje dnevnika unosa? Ako smanjite vrednost intervala, neki podaci će biti izgubljeni",
+    "query_log_retention_confirm": "Želite li zaista da promenite rotaciju evidencije upita? Ako smanjite vrednost intervala, neki podaci će biti izgubljeni",
    "anonymize_client_ip": "Anonimizuj IP klijenta",
    "anonymize_client_ip_desc": "Ne čuvaj punu IP adresu klijenta u dnevnicima i statistikama",
    "dns_config": "Konfiguracija DNS servera",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "rate_limit": "Ograničenje brzine",
    "edns_enable": "Uključi EDNS Client Subnet",
    "edns_cs_desc": "Dodajte opciju podmreži EDNS klijenta (ECS) uzvodnim zahtevima i evidentirajte vrednosti koje klijenti šalju u evidenciji upita.",
+    "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",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Jeste li sigurni da želite da izbrišete klijenta \"{{key}}\"?",
    "list_confirm_delete": "Jeste li sigurni da želite da izbrišete ovu listu?",
    "auto_clients_title": "Klijenti (runtime)",
-    "auto_clients_desc": "Uređaji koji nisu na listi upornih klijenata koji i dalje mogu da koriste AdGuard Home",
+    "auto_clients_desc": "Podaci o klijentima koji koriste AdGuard Home, ali nisu sačuvani u konfiguraciji",
    "access_title": "Postavke pristupa",
    "access_desc": "Ovde možete konfigurisati pravila pristupa za AdGuard Home DNS server",
    "access_allowed_title": "Dozvoljeni klijenti",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Kako biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, potrebno je da <0>konfigurišete šifrovanje</0> u AdGuard Home postavkama.",
    "rewrite_added": "DNS prepisivanje za \"{{key}}\" je uspešno dodato",
    "rewrite_deleted": "DNS prepisivanje za \"{{key}}\" uspešno izbrisano",
+    "rewrite_updated": "DNS ponovo napisao uspešno ažuriran",
    "rewrite_add": "Dodaj DNS prepisivanje",
+    "rewrite_edit": "Uređivanje DNS prepravke",
    "rewrite_not_found": "DNS prepisivanja nisu pronađena",
    "rewrite_confirm_delete": "Jeste li sigurni da želite da izbrišete DNS prepisivanje za \"{{key}}\"?",
    "rewrite_desc": "Dozvoljava da jednostavno konfigurišete prilagođeni DNS odgovor za određeni domen.",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Jeste li sigurni da želite da promenite zadržavanje statistike? Ako smanjite vrednost intervala, neki podaci će biti izgubljeni",
    "statistics_cleared": "Statistika je uspešno očišćena",
    "statistics_enable": "Uključi statistiku",
+    "ignore_domains": "Zanemari domene (razdvojene novom linijom)",
+    "ignore_domains_title": "Zanemareni domeni",
+    "ignore_domains_desc_stats": "Upiti koji se podudaraju sa ovim pravilima nisu upisani u statistiku",
+    "ignore_domains_desc_query": "Upiti koji se podudaraju sa ovim pravilima nisu upisani u evidenciju upita",
    "interval_hours": "{{count}} čas",
    "interval_hours_plural": "{{count}} časova",
    "filters_configuration": "Konfiguracija filtera",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: posebna vrednost, zadrži <0>A</0> records iz apstrima",
    "rewrite_AAAA": "<0>AAAA</0>: posebna vrednost, zadržite <0>AAAA</0> records iz apstrima",
    "disable_ipv6": "Onemogući rešavanje IPv6 adresa",
-    "disable_ipv6_desc": "Otpustite sve DNS upite za IPv6 adrese (otkucajte AAAA).",
+    "disable_ipv6_desc": "Ignorisanje svih DNS upite za IPv6 adrese (tip AAAA) i uklanjanje IPv6 podataka iz HTTPS odgovora.",
    "fastest_addr": "Najbrža IP adresa",
    "fastest_addr_desc": "Pretražuje sve DNS servere i vraća najbržu IP adresu među svim odgovorima. Ovo će usporiti DNS pretragu jer moramo da čekamo na odgovore od svih DNS servera, ali će poboljšati sveukupnu povezanost.",
    "autofix_warning_text": "Ako kliknete \"Popravi\", AdGuardHome će konfigurisati vaš sistem da koristi AdGuardHome DNS server.",
@@ -638,9 +673,69 @@
    "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 najmanje {{value}} znakova",
+    "form_error_password_length": "Lozinka mora imati od {{min}} do {{max}} 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",
-    "clear_cache": "Obriši keš memoriju"
+    "clear_cache": "Obriši keš memoriju",
+    "make_static": "Učini statičnim",
+    "theme_auto_desc": "Automatski (na osnovu šeme boja uređaja)",
+    "theme_dark_desc": "Tamna tema",
+    "theme_light_desc": "Svetla tema",
+    "disable_for_seconds": "Za {{count}} sekund",
+    "disable_for_seconds_plural": "Za {{count}} sekundi",
+    "disable_for_minutes": "Za {{count}} minut",
+    "disable_for_minutes_plural": "Za {{count}} minuta",
+    "disable_for_hours": "Za {{count}} sat",
+    "disable_for_hours_plural": "Za {{count}} sati",
+    "disable_until_tomorrow": "Do sutra",
+    "disable_notify_for_seconds": "Isključi zaštitu na {{count}} sekund",
+    "disable_notify_for_seconds_plural": "Isključi zaštitu na {{count}} sekundi",
+    "disable_notify_for_minutes": "Isključi zaštitu na {{count}} minut",
+    "disable_notify_for_minutes_plural": "Isključi zaštitu na {{count}} minuta",
+    "disable_notify_for_hours": "Isključi zaštitu na {{count}} sat",
+    "disable_notify_for_hours_plural": "Isključi zaštitu na {{count}} sati",
+    "disable_notify_until_tomorrow": "Isključi zaštitu do sutra",
+    "enable_protection_timer": "Zaštita će biti uključena u {{time}}",
+    "custom_retention_input": "Unesite zadržavanje u časovima",
+    "custom_rotation_input": "Unesite rotaciju u časovima",
+    "protection_section_label": "Zaštita",
+    "log_and_stats_section_label": "Evidencija upita i statistika",
+    "ignore_query_log": "Zanemari ovog klijenta u evidenciji upita",
+    "ignore_statistics": "Zanemari ovog klijenta u statističkim podacima",
+    "schedule_services": "Pauziranje blokiranja usluge",
+    "schedule_services_desc": "Konfigurisanje rasporeda pauziranja filtera za blokiranje usluga",
+    "schedule_services_desc_client": "Konfigurišite raspored pauziranja filtera za blokiranje usluga za ovog klijenta",
+    "schedule_desc": "Podešavanje perioda neaktivnosti za blokirane usluge",
+    "schedule_invalid_select": "Vreme početka mora biti pre vremena završetka",
+    "schedule_select_days": "Izaberite dane",
+    "schedule_timezone": "Izaberite vremensku zonu",
+    "schedule_current_timezone": "Trenutna vremenska zona: {{value}}",
+    "schedule_time_all_day": "Ceo dan",
+    "schedule_modal_description": "Ovaj raspored će zameniti sve postojeće rasporede za isti dan u sedmici. Svaki dan u sedmici može imati samo jedan period neaktivnosti.",
+    "schedule_modal_time_off": "Nema blokiranja usluge:",
+    "schedule_new": "Novi raspored",
+    "schedule_edit": "Uredi raspored",
+    "schedule_save": "Sačuvaj raspored",
+    "schedule_add": "Dodaj raspored",
+    "schedule_remove": "Ukloni raspored",
+    "schedule_from": "Od",
+    "schedule_to": "Do",
+    "sunday": "Nedelja",
+    "monday": "Ponedeljak",
+    "tuesday": "Utorak",
+    "wednesday": "Sreda",
+    "thursday": "Četvrtak",
+    "friday": "Petak",
+    "saturday": "Subota",
+    "sunday_short": "Ned",
+    "monday_short": "Pon",
+    "tuesday_short": "Uto",
+    "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"
 }
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -1,18 +1,22 @@
 {
    "client_settings": "Klientinställningar",
    "example_upstream_reserved": "uppström <0>för en specifik domän</0>;",
-    "example_upstream_comment": "du kan ange en kommentar.",
+    "example_multiple_upstreams_reserved": "flera uppströmsservrar <0>för specifika domäner</0>;",
+    "example_upstream_comment": "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",
    "load_balancing_desc": "Fråga en uppströmsserver åt gången. AdGuard Home använder sin viktade slumpmässiga algoritm för att välja server så att den snabbaste servern används oftare.",
    "bootstrap_dns": "Bootstrap-DNS-servrar",
-    "bootstrap_dns_desc": "Bootstrap-DNS-servrar används för att slå upp DoH/DoT-resolvrarnas IP-adresser som du specificerat som uppström.",
+    "bootstrap_dns_desc": "IP-adresser för DNS-servrar som används för att lösa IP-adresser för de DoH/DoT-resolvers som du anger som uppströms. Kommentarer är inte tillåtna.",
+    "fallback_dns_title": "Reserv-DNS-servrar",
+    "fallback_dns_desc": "Lista över reserv-DNS-servrar som används när uppströms DNS-servrar inte svarar. Syntaxen är densamma som i huvuduppströmsfältet ovan.",
+    "fallback_dns_placeholder": "Ange en reserv-DNS-server per rad",
    "local_ptr_title": "Privata omvända DNS-servrar",
    "local_ptr_desc": "DNS servrarna som AdGuard Home använder för lokala PTR frågor. Dessa servrar används för att lösa värdnamnen på klienter med privata IP-adresser, till exempel \"192.168.12.34\", genom omvänd DNS. Om inga servrar angetts använder AdGuard Home adresserna till standard DNS servrar för ditt operativsystem förutom adresserna till AdGuard Home själv.",
    "local_ptr_default_resolver": "Som standard använder AdGuard Home följande omvända DNS upplösare: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home kunde inte fastställa lämpliga privata omvända DNS upplösare för detta system.",
-    "local_ptr_placeholder": "Ange en serveradress per rad",
+    "local_ptr_placeholder": "Ange en IP-adress per rad",
    "resolve_clients_title": "Aktivera omvänd upplösning av klienters IP-adresser",
    "resolve_clients_desc": "Lös upp klienternas värdnamn med omvänt uppslag av klienternas IP-adresser genom att skicka PTR-frågor till motsvarande upplösare (privata DNS-servrar för lokala klienter, uppströmsservrar för klienter med offentliga IP-adresser).",
    "use_private_ptr_resolvers_title": "Använd privata omvända DNS upplösare",
@@ -70,7 +74,9 @@
    "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",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Blockerad skadekod/phishing",
    "stats_adult": "Blockerade vuxensajter",
    "stats_query_domain": "Mest eftersökta domäner",
-    "for_last_24_hours": "under de senaste 24 timmarna",
+    "for_last_hours": "för den senaste {{count}} timme",
+    "for_last_hours_plural": "för de senaste {{count}} timmar",
    "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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Toppklienter",
    "no_clients_found": "Inga klienter hittade",
    "general_statistics": "Allmän statistik",
+    "top_upstreams": "Topp uppströmsservrar",
+    "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_24_hours": "Antalet DNS-förfrågningar som utfördes under de senaste 24 timmarna",
+    "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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Konfigurerad i {{path}}",
    "test_upstream_btn": "Testa uppströmmar",
    "upstreams": "Uppströms",
+    "upstream": "Uppströms server",
    "apply_btn": "Tillämpa",
    "disabled_filtering_toast": "Filtrering bortkopplad",
    "enabled_filtering_toast": "Filtrering inkopplad",
@@ -167,6 +180,7 @@
    "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",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,18 @@
    "rate_limit": "Förfrågnings gräns",
    "edns_enable": "Aktivera EDNS-klient subnät",
    "edns_cs_desc": "Skicka klienternas subnät till DNS servrarna.",
+    "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",
@@ -441,7 +469,7 @@
    "client_confirm_delete": "Är du säker på att du vill ta bort klient \"{{key}}\"?",
    "list_confirm_delete": "Är du säker på att du vill ta bort den här listan?",
    "auto_clients_title": "Klienter (körtid)",
-    "auto_clients_desc": "Enheter som inte finns på listan över beständiga klienter som fortfarande kan använda AdGuard Home",
+    "auto_clients_desc": "Information om IP-adresser för enheter som använder eller kan använda AdGuard Home. Denna information samlas in från flera källor, inklusive värdfiler, omvänd DNS, etc.",
    "access_title": "Åtkomstinställningar",
    "access_desc": "Här kan du konfigurera åtkomstregler för AdGuard Homes DNS-server",
    "access_allowed_title": "Tillåtna klienter",
@@ -475,7 +503,9 @@
    "setup_dns_notice": "För att kunna använda <1>DNS-över-HTTPS</1> eller <1>DNS-över-TLS</1>, behöver du <0>konfigurera Kryptering</0> i AdGuard Home-inställningar.",
    "rewrite_added": "DNS-omskrivning för \"{{key}}\" lyckad",
    "rewrite_deleted": "DNS-omskrivning för \"{{key}}\" har tagits bort",
+    "rewrite_updated": "DNS-omskrivning har uppdaterats",
    "rewrite_add": "Lägg till DNS omskrivning",
+    "rewrite_edit": "Redigera DNS-omskrivning",
    "rewrite_not_found": "Inga DNS omskrivningar hittades",
    "rewrite_confirm_delete": "Är du säker på att du vill ta bort DNS-omskrivningen för \"{{key}}\"?",
    "rewrite_desc": "Gör det enkelt att konfigurera anpassat DNS svar för ett specifikt domännamn.",
@@ -523,7 +553,10 @@
    "statistics_retention_confirm": "Är du säker på att du vill ändra retentionstiden för statistik? Om du minskar intervallet kommer viss data att gå förlorad",
    "statistics_cleared": "Statistiken har rensats",
    "statistics_enable": "Aktivera statistik",
+    "ignore_domains": "Ignorerade domäner (avgränsade med ny rad)",
    "ignore_domains_title": "Ignorerade domäner",
+    "ignore_domains_desc_stats": "Förfrågningar som matchar dessa regler skrivs inte till statistiken",
+    "ignore_domains_desc_query": "Förfrågningar som matchar dessa regler skrivs inte till förfrågningsloggen",
    "interval_hours": "{{count}} timme",
    "interval_hours_plural": "{{count}} timmar",
    "filters_configuration": "Filterinställningar",
@@ -556,7 +589,7 @@
    "rewrite_A": "<0>A</0>: specialvärde, behåll <0>A</0> poster från uppströms",
    "rewrite_AAAA": "<0>AAAA</0>: specialvärde, behåll <0>AAAA</0> poster från uppströms",
    "disable_ipv6": "Inaktivera upplösning av IPv6 adresser",
-    "disable_ipv6_desc": "Kasta alla DNS-frågor för IPv6-adresser (typ AAAA).",
+    "disable_ipv6_desc": "Släpp alla DNS-frågor för IPv6-adresser (typ AAAA) och ta bort IPv6-tips från HTTPS-svar.",
    "fastest_addr": "Snabbaste IP adressen",
    "fastest_addr_desc": "Fråga alla DNS servrar och returnera den snabbaste IP adressen bland alla svar. Detta saktar ner DNS-frågor eftersom AdGuard Home måste vänta på svar från alla DNS servrar, men förbättrar den övergripande anslutningen.",
    "autofix_warning_text": "Om du klickar på \"Fix\" kommer AdGuard Home att konfigurera ditt system för att använda AdGuard Home DNS server.",
@@ -639,11 +672,13 @@
    "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 minst {{value}} tecken långt",
+    "form_error_password_length": "Lösenordet måste vara {{min}} till {{max}} 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",
    "clear_cache": "Rensa cache",
+    "make_static": "Gör statisk",
+    "theme_auto_desc": "Auto (baserat på färgschemat på din enhet)",
    "theme_dark_desc": "Mörkt tema",
    "theme_light_desc": "Ljust tema",
    "disable_for_seconds": "I {{count}} sekund",
@@ -652,5 +687,54 @@
    "disable_for_minutes_plural": "I {{count}} minuter",
    "disable_for_hours": "I {{count}} timme",
    "disable_for_hours_plural": "I {{count}} timmar",
-    "disable_until_tomorrow": "Tills imorgon"
+    "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",
+    "schedule_services_desc_client": "Konfigurera pausschemat för det tjänsteblockerande filtret för den här klienten",
+    "schedule_desc": "Ange inaktivitetsperioder för blockerade tjänster",
+    "schedule_invalid_select": "Starttid måste vara före sluttid",
+    "schedule_select_days": "Välj dagar",
+    "schedule_timezone": "Välj en tidszon",
+    "schedule_current_timezone": "Aktuell tidszon: {{value}}",
+    "schedule_time_all_day": "Hela dagen",
+    "schedule_modal_description": "Detta schema ersätter alla befintliga scheman för samma veckodag. Varje veckodag kan bara ha en inaktivitetsperiod.",
+    "schedule_modal_time_off": "Ingen blockering av tjänster:",
+    "schedule_new": "Nytt schema",
+    "schedule_edit": "Redigera schema",
+    "schedule_save": "Spara schema",
+    "schedule_add": "Lägg till schema",
+    "schedule_remove": "Ta bort schema",
+    "schedule_from": "Från",
+    "schedule_to": "Till",
+    "sunday": "Söndag",
+    "monday": "Måndag",
+    "tuesday": "Tisdag",
+    "wednesday": "Onsdag",
+    "thursday": "Torsdag",
+    "friday": "Fredag",
+    "saturday": "Lördag",
+    "sunday_short": "Sön",
+    "monday_short": "Mån",
+    "tuesday_short": "Tis",
+    "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"
 }
--- a/client/src/__locales/th.json
+++ b/client/src/__locales/th.json
@@ -172,6 +172,7 @@
    "dnscrypt": "DNSCrypt",
    "dns_over_https": "DNS-over-HTTPS",
    "dns_over_tls": "DNS-over-TLS",
+    "dns_over_quic": "DNS-over-QUIC",
    "form_enter_rate_limit": "ป้อนขีดจำกัดอัตรา",
    "rate_limit": "จำกัดอัตรา",
    "edns_enable": "เปิดใช้งานซับเน็ตไคลเอ็นต์ EDNS",
@@ -392,6 +393,14 @@
    "show_processed_responses": "การประมวลผล",
    "blocked_adult_websites": "ถูกปิดกั้นโดยการควบคุมของผู้ปกครอง",
    "safe_search": "ค้นหาอย่างปลอดภัย",
+    "blocklist": "บัญชีดำ",
    "filter_category_other": "อื่น ๆ",
-    "parental_control": "ควบคุมโดยผู้ปกครอง"
+    "parental_control": "ควบคุมโดยผู้ปกครอง",
+    "sunday_short": "อาทิตย์",
+    "monday_short": "จันทร์",
+    "tuesday_short": "อังคาร",
+    "wednesday_short": "พุธ",
+    "thursday_short": "พฤหัส",
+    "friday_short": "ศุกร์",
+    "saturday_short": "เสาร์"
 }
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -1,18 +1,22 @@
 {
    "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",
    "load_balancing": "Yük dengeleme",
    "load_balancing_desc": "Her seferde bir üst sunucuyu sorgulayın. AdGuard Home, sunucuyu seçmek için ağırlıklı rastgele algoritmasını kullanır, böylece en hızlı sunucu daha sık kullanılır.",
    "bootstrap_dns": "DNS Önyükleme sunucuları",
-    "bootstrap_dns_desc": "DNS Önyükleme sunucuları, belirttiğiniz üst sunucuların DoH/DoT çözümleyicilerine ait IP adreslerinin çözümlemek için kullanılır.",
+    "bootstrap_dns_desc": "Üst kaynak olarak belirttiğiniz DoH/DoT çözümleyicilerin IP adreslerini çözümlemek için kullanılan DNS sunucularının IP adresleri. Yorumlara izin verilmez.",
+    "fallback_dns_title": "Yedek DNS sunucuları",
+    "fallback_dns_desc": "Yukarı akış DNS sunucuları yanıt vermediğinde kullanılan yedek DNS sunucularının listesi. Söz dizimi yukarıdaki ana üst kaynak alanıyla aynıdır.",
+    "fallback_dns_placeholder": "Her satıra bir yedek DNS sunucusu girin",
    "local_ptr_title": "Özel ters DNS sunucuları",
    "local_ptr_desc": "AdGuard Home'un yerel PTR sorguları için kullandığı DNS sunucuları. Bu sunucular, rDNS kullanarak, örneğin \"192.168.12.34\" gibi özel IP aralıklarındaki adresler için PTR isteklerini çözmek için kullanılır. Ayarlanmadığı durumda AdGuard Home, işletim sisteminizin varsayılan DNS çözümleme adreslerini kullanır.",
    "local_ptr_default_resolver": "AdGuard Home, varsayılan olarak aşağıdaki ters DNS çözümleyicilerini kullanır: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home, bu sistem için uygun olan özel ters DNS çözümleyicilerini belirleyemedi.",
-    "local_ptr_placeholder": "Her satıra bir sunucu adresi girin",
+    "local_ptr_placeholder": "Her satıra bir IP adresi girin",
    "resolve_clients_title": "İstemcilerin IP adreslerinin ters çözümlenmesini etkinleştir",
    "resolve_clients_desc": "Karşılık gelen çözümleyicilere (yerel istemciler için özel DNS sunucuları, genel IP adresleri olan istemciler için üst sunucuları) PTR sorguları göndererek istemcilerin IP adreslerini ana makine adlarının tersine çözün.",
    "use_private_ptr_resolvers_title": "Özel ters DNS çözümleyicileri kullan",
@@ -70,7 +74,9 @@
    "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",
@@ -87,12 +93,12 @@
    "client_details": "İstemci ayrıntıları",
    "details": "Ayrıntılar",
    "back": "Geri",
-    "dashboard": "Ana Sayfa",
+    "dashboard": "Pano",
    "settings": "Ayarlar",
    "filters": "Filtreler",
    "filter": "Filtre",
    "query_log": "Sorgu Günlüğü",
-    "compact": "Yoğun",
+    "compact": "Sık",
    "nothing_found": "Hiçbir şey bulunamadı",
    "faq": "SSS",
    "version": "Sürüm",
@@ -114,7 +120,8 @@
    "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_24_hours": "son 24 saat içindekiler",
+    "for_last_hours": "son {{count}} saat için",
+    "for_last_hours_plural": "son {{count}} saat için",
    "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.",
@@ -125,15 +132,20 @@
    "top_clients": "Başlıca istemciler",
    "no_clients_found": "İstemci bulunamadı",
    "general_statistics": "Genel istatistikler",
+    "top_upstreams": "Başlıca üst kaynaklar",
+    "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_24_hours": "Son 24 saat içinde 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_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",
    "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.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "{{path}} dosyasında yapılandırıldı",
    "test_upstream_btn": "Üst sunucuyu test et",
    "upstreams": "Üst kaynak",
+    "upstream": "Üst kaynak",
    "apply_btn": "Uygula",
    "disabled_filtering_toast": "Filtreleme devre dışı",
    "enabled_filtering_toast": "Filtreleme etkin",
@@ -169,7 +182,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ı",
@@ -257,12 +270,12 @@
    "query_log_cleared": "Sorgu günlüğü başarıyla temizlendi",
    "query_log_updated": "Sorgu günlüğü başarıyla güncellendi",
    "query_log_clear": "Sorgu günlüklerini temizle",
-    "query_log_retention": "Sorgu günlüklerini sakla",
+    "query_log_retention": "Sorgu günlükleri rotasyonu",
    "query_log_enable": "Günlüğü etkinleştir",
    "query_log_configuration": "Günlük yapılandırması",
    "query_log_disabled": "Sorgu günlüğü devre dışı bırakıldı, bunu <0>ayarlar</0> kısmından yapılandırılabilirsiniz",
    "query_log_strict_search": "Tam arama için çift tırnak işareti kullanın",
-    "query_log_retention_confirm": "Sorgu günlüğü saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
+    "query_log_retention_confirm": "Sorgu günlüğü rotasyonunu değiştirmek istediğinizden emin misiniz? Aralık değerini düşürürseniz, bazı veriler kaybolacaktır.",
    "anonymize_client_ip": "İstemcinin IP adresini gizle",
    "anonymize_client_ip_desc": "İstemcinin tam IP adresini günlüklere veya istatistiklere kaydetmeyin",
    "dns_config": "DNS sunucu yapılandırması",
@@ -276,6 +289,9 @@
    "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",
@@ -294,9 +310,19 @@
    "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 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_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_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)",
@@ -363,7 +389,7 @@
    "install_devices_ios_list_4": "DNS alanına AdGuard Home sunucunuzun adreslerini girin.",
    "get_started": "Başlayın",
    "next": "Sonraki",
-    "open_dashboard": "Ana Sayfayı Aç",
+    "open_dashboard": "Panoyu 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",
@@ -421,7 +447,7 @@
    "settings_global": "Genel",
    "settings_custom": "Özel",
    "table_client": "İstemci",
-    "table_name": "Ad",
+    "table_name": "AdAdı",
    "save_btn": "Kaydet",
    "client_add": "İstemci Ekle",
    "client_new": "Yeni İstemci",
@@ -435,7 +461,7 @@
    "form_enter_id": "Tanımlayıcı girin",
    "form_add_id": "Tanımlayıcı ekle",
    "form_client_name": "İstemci ismi girin",
-    "name": "Ad",
+    "name": "Adı",
    "client_global_settings": "Genel ayarları kullan",
    "client_deleted": "\"{{key}}\" istemcisi başarıyla silindi",
    "client_added": "\"{{key}}\" istemcisi başarıyla eklendi",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "\"{{key}}\" istemcisini silmek istediğinizden emin misiniz?",
    "list_confirm_delete": "Bu listeyi silmek istediğinizden emin misiniz?",
    "auto_clients_title": "Çalışma zamanı istemcileri",
-    "auto_clients_desc": "Henüz AdGuard Home'u kullanabilecek Kalıcı istemciler listesinde olmayan cihazlar",
+    "auto_clients_desc": "AdGuard Home'u kullanan veya kullanabilecek cihazların IP adresleri hakkında bilgiler. Bu bilgiler, hosts dosyaları, ters DNS, vb. dahil olmak üzere çeşitli kaynaklardan toplanır.",
    "access_title": "Erişim ayarları",
    "access_desc": "AdGuard Home DNS sunucusu için erişim kurallarını buradan yapılandırabilirsiniz",
    "access_allowed_title": "İzin verilen istemciler",
@@ -478,7 +504,9 @@
    "setup_dns_notice": "<1>DNS-over-HTTPS</1> veya <1>DNS-over-TLS</1> protokolünü kullanmak için AdGuard Home üzerinde <0>Şifreleme ayarları</0> bölümünden ayarları yapmanız gerekir.",
    "rewrite_added": "\"{{key}}\" için DNS yeniden yazımı başarıyla eklendi",
    "rewrite_deleted": "\"{{key}}\" için DNS yeniden yazımı başarıyla silindi",
+    "rewrite_updated": "DNS yeniden yazma başarıyla güncellendi",
    "rewrite_add": "DNS yeniden yazımı ekle",
+    "rewrite_edit": "DNS yeniden yazmayı düzenle",
    "rewrite_not_found": "DNS yeniden yazımı bulunamadı",
    "rewrite_confirm_delete": "\"{{key}}\" için DNS yeniden yazımını silmek istediğinize emin misiniz?",
    "rewrite_desc": "Belirli bir alan adı için özel DNS yanıtını kolayca yapılandırmanızı sağlar.",
@@ -528,8 +556,8 @@
    "statistics_enable": "İstatistikleri etkinleştir",
    "ignore_domains": "Yok sayılan alan adları (yeni satırla ayrılmış)",
    "ignore_domains_title": "Yok sayılan alan adları",
-    "ignore_domains_desc_stats": "Bu alan adları için yapılan sorgular istatistiklere yazılmaz",
-    "ignore_domains_desc_query": "Bu alan adları için yapılan sorgular sorgu günlüğüne yazılmaz",
+    "ignore_domains_desc_stats": "Bu kurallarla eşleşen sorgular istatistiklere yazılmaz",
+    "ignore_domains_desc_query": "Bu kurallarla eşleşen sorgular sorgu günlüğüne yazılmaz",
    "interval_hours": "{{count}} saat",
    "interval_hours_plural": "{{count}} saat",
    "filters_configuration": "Filtre yapılandırması",
@@ -562,7 +590,7 @@
    "rewrite_A": "<0>A</0>: özel değer, üst sunucudan gelen <0>A</0> kayıtlarını tutun",
    "rewrite_AAAA": "<0>AAA</0>: özel değer, üst sunucudan gelen <0>AAA</0> kayıtlarını tutun",
    "disable_ipv6": "IPv6 adreslerinin çözümlenmesini devre dışı bırak",
-    "disable_ipv6_desc": "IPv6 adresleri için tüm DNS sorgularını yanıtsız bırakır (AAAA yazar).",
+    "disable_ipv6_desc": "IPv6 adresleri için tüm DNS sorgularını bırakın (AAAA yazın) ve HTTPS yanıtlarından IPv6 ipuçlarını kaldırın.",
    "fastest_addr": "En hızlı IP adresi",
    "fastest_addr_desc": "Tüm DNS sunucularını sorgulayın ve tüm yanıtlar arasından en hızlı olan IP adresini döndürün. AdGuard Home'un tüm DNS sunucularından yanıt beklemesi gerektiği için DNS sorgularını yavaşlatır, ancak genel bağlantıyı iyileştirir.",
    "autofix_warning_text": "\"Düzelt\" seçeneğine tıklarsanız, AdGuard Home, sisteminizi AdGuard Home DNS sunucusunu kullanacak şekilde yapılandırır.",
@@ -645,7 +673,7 @@
    "parental_control": "Ebeveyn Denetimi",
    "safe_browsing": "Güvenli Gezinti",
    "served_from_cache": "{{value}} <i>(önbellekten kullanıldı)</i>",
-    "form_error_password_length": "Parola en az {{value}} karakter uzunluğunda olmalıdır",
+    "form_error_password_length": "Parola {{min}} ila {{max}} 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",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "Korumayı {{count}} saatliğine devre dışı bırak",
    "disable_notify_for_hours_plural": "Korumayı {{count}} saatliğine devre dışı bırak",
    "disable_notify_until_tomorrow": "Korumayı yarına kadar devre dışı bırak",
-    "enable_protection_timer": "Koruma {{time}} içinde etkinleştirilecektir"
+    "enable_protection_timer": "Koruma {{time}} içinde etkinleştirilecektir",
+    "custom_retention_input": "Saklama süresini saat olarak girin",
+    "custom_rotation_input": "Rotasyonu saat cinsinden girin",
+    "protection_section_label": "Koruma",
+    "log_and_stats_section_label": "Sorgu günlüğü ve istatistikler",
+    "ignore_query_log": "Sorgu günlüğünde bu istemciyi yoksay",
+    "ignore_statistics": "İstatistiklerde bu istemciyi yoksay",
+    "schedule_services": "Hizmet engellemeyi duraklat",
+    "schedule_services_desc": "Hizmet engelleme filtresinin duraklatma planını yapılandırın",
+    "schedule_services_desc_client": "Bu istemci için hizmet engelleme filtresinin duraklatma planını yapılandırın",
+    "schedule_desc": "Engellenen hizmetler için hareketsizlik sürelerini ayarlayın",
+    "schedule_invalid_select": "Başlangıç zamanı, bitiş zamanından önce olmalıdır",
+    "schedule_select_days": "Günleri seçin",
+    "schedule_timezone": "Saat dilimi seçin",
+    "schedule_current_timezone": "Şu anki saat dilimi: {{value}}",
+    "schedule_time_all_day": "Tüm gün",
+    "schedule_modal_description": "Bu plan, haftanın aynı günü için mevcut planların yerini alır. Haftanın her gününde yalnızca bir hareketsizlik süresine sahip olabilir.",
+    "schedule_modal_time_off": "Hizmet engelleme yok:",
+    "schedule_new": "Yeni plan",
+    "schedule_edit": "Planı düzenle",
+    "schedule_save": "Planı kaydet",
+    "schedule_add": "Plan ekle",
+    "schedule_remove": "Planı kaldır",
+    "schedule_from": "Başlangıç",
+    "schedule_to": "Bitiş",
+    "sunday": "Pazar",
+    "monday": "Pazartesi",
+    "tuesday": "Salı",
+    "wednesday": "Çarşamba",
+    "thursday": "Perşembe",
+    "friday": "Cuma",
+    "saturday": "Cumartesi",
+    "sunday_short": "Paz",
+    "monday_short": "Pzt",
+    "tuesday_short": "Sal",
+    "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"
 }
--- a/client/src/__locales/uk.json
+++ b/client/src/__locales/uk.json
@@ -1,13 +1,17 @@
 {
    "client_settings": "Налаштування клієнта",
    "example_upstream_reserved": "DNS-сервер <0>для певних доменів</0>;",
+    "example_multiple_upstreams_reserved": "кілька DNS-серверів <0>для конкретних доменів</0>;",
    "example_upstream_comment": "коментар.",
    "upstream_parallel": "Використовувати паралельні запити, щоб пришвидшити вирішення одночасною чергою всіх оригінальних серверів.",
    "parallel_requests": "Паралельні запити",
    "load_balancing": "Балансування навантаження",
    "load_balancing_desc": "Запитувати один сервер за раз. AdGuard Home використовуватиме зважений випадковий алгоритм для вибору сервера, щоб найшвидший сервер використовувався частіше.",
    "bootstrap_dns": "Bootstrap DNS-сервери",
-    "bootstrap_dns_desc": "Bootstrap DNS-сервери використовуються для вирішення IP-адрес встановлених серверів DoH/DoT.",
+    "bootstrap_dns_desc": "IP-адреси DNS-серверів, які використовуються для визначення IP-адрес DoH/DoT-розпізнавачів, які ви вказуєте як висхідні. Коментарі заборонені.",
+    "fallback_dns_title": "Резервні DNS-сервери",
+    "fallback_dns_desc": "Список резервних DNS-серверів, які використовуються, коли upstream DNS-сервери не відповідають. Синтаксис такий самий, як і в полі upstream сервера вище.",
+    "fallback_dns_placeholder": "Вводьте один резервний DNS-сервер на рядок",
    "local_ptr_title": "Приватні сервери для зворотного DNS",
    "local_ptr_desc": "DNS-сервери, які AdGuard Home використовує для локальних PTR-запитів. Ці сервери використовуються для вирішення PTR-запитів для адрес у приватних мережах, наприклад, «192.168.12.34». Якщо список порожній, AdGuard Home буде усталено використовувати системний DNS-сервер.",
    "local_ptr_default_resolver": "Стандартно AdGuard Home користується такими зворотними DNS-вирішувачами: {{ip}}.",
@@ -70,7 +74,9 @@
    "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": "Скинути всі аренди",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "Заблоковано зловмисних/шахрайських програм",
    "stats_adult": "Заблоковано вебсайтів для дорослих",
    "stats_query_domain": "Найчастіші запити доменів",
-    "for_last_24_hours": "за останні 24 години",
+    "for_last_hours": "за останню {{count}} годину",
+    "for_last_hours_plural": "за останні {{count}} годин",
    "for_last_days": "за останній {{count}} день",
    "for_last_days_plural": "за останні {{count}} днів",
    "stats_disabled": "Статистику вимкнено. Ви можете увімкнути її на <0>сторінці налаштувань</0>.",
@@ -125,15 +132,20 @@
    "top_clients": "Найактивніші клієнти",
    "no_clients_found": "Клієнтів не знайдено",
    "general_statistics": "Загальна статистика",
+    "top_upstreams": "Часто запитувані upstream-сервери",
+    "no_upstreams_data_found": "Немає даних про upstream-сервери",
    "number_of_dns_query_days": "Кількість DNS-запитів, оброблених за останні {{count}} дні",
    "number_of_dns_query_days_plural": "Кількість DNS-запитів, оброблених за останні {{count}} днів",
-    "number_of_dns_query_24_hours": "Кількість DNS-запитів, оброблених за останні 24 години",
+    "number_of_dns_query_hours": "Кількість DNS-запитів, оброблених за останню {{count}} годину",
+    "number_of_dns_query_hours_plural": "Кількість DNS-запитів, оброблених за останні {{count}} годин",
    "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": "Час відгуку",
    "average_processing_time_hint": "Середній час обробки DNS запиту в мілісекундах",
    "block_domain_use_filters_and_hosts": "Блокування доменів за допомогою фільтрів та hosts-файлів",
    "filters_block_toggle_hint": "Ви можете налаштувати правила блокування в розділі <a>Фільтри</a>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Налаштовано в {{path}}",
    "test_upstream_btn": "Перевірити сервери",
    "upstreams": "Upstreams",
+    "upstream": "Upstream-сервер",
    "apply_btn": "Застосувати",
    "disabled_filtering_toast": "Фільтрування вимкнено",
    "enabled_filtering_toast": "Фільтрування увімкнено",
@@ -167,6 +180,7 @@
    "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 списку",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "rate_limit": "Обмеження швидкості",
    "edns_enable": "Увімкнути відправку EDNS Client Subnet",
    "edns_cs_desc": "Додавати параметр EDNS Client Subnet (ECS) до запитів до upstream-серверів, а також записувати в журнал значення, що надсилаються клієнтами.",
+    "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-стилі",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Ви впевнені, що хочете видалити клієнта «{{key}}»?",
    "list_confirm_delete": "Ви впевнені, що хочете видалити цей список?",
    "auto_clients_title": "Runtime-клієнти",
-    "auto_clients_desc": "Клієнти, які використовують AdGuard Home, незалежно від того, чи збережені вони в списку постійних",
+    "auto_clients_desc": "Інформація про IP-адреси пристроїв, які використовують або можуть використовувати AdGuard Home. Ця інформація збирається з кількох джерел, зокрема з файлів hosts, зворотного DNS тощо.",
    "access_title": "Налаштування доступу",
    "access_desc": "Тут ви можете налаштувати правила доступу для DNS-сервера AdGuard Home",
    "access_allowed_title": "Дозволені клієнти",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Для використання <1>DNS-over-HTTPS</1> або <1>DNS-over-TLS</1>, вам потрібно <0>налаштувати Шифрування</0> в налаштуваннях AdGuard Home.",
    "rewrite_added": "Перезапис DNS для «{{key}}» успішно додано",
    "rewrite_deleted": "Перезапис DNS для «{{key}}» успішно видалено",
+    "rewrite_updated": "Перезапис DNS успішно оновлено",
    "rewrite_add": "Додати перезапис DNS",
+    "rewrite_edit": "Редагувати перезапис DNS",
    "rewrite_not_found": "Перезаписів DNS не знайдено",
    "rewrite_confirm_delete": "Ви впевнені, що хочете видалити перезапис DNS для «{{key}}»?",
    "rewrite_desc": "Дозволяє легко налаштувати власну відповідь DNS для певного доменного імені.",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Ви впевнені, що хочете змінити тривалість статистики? Якщо зменшити значення інтервалу, деякі дані будуть втрачені",
    "statistics_cleared": "Статистику успішно очищено",
    "statistics_enable": "Увімкнути статистику",
+    "ignore_domains": "Ігноровані домени (по одному на рядок)",
+    "ignore_domains_title": "Ігноровані домени",
+    "ignore_domains_desc_stats": "Запити, які відповідають цим правилам, в статистику не пишуться",
+    "ignore_domains_desc_query": "Запити, які відповідають цим правилам, не записуються до журналу запитів",
    "interval_hours": "{{count}} година",
    "interval_hours_plural": "{{count}} годин(и)",
    "filters_configuration": "Конфігурація фільтрів",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: спеціальне значення, зберігайте <0>A</0> записи із вищого сервера",
    "rewrite_AAAA": "<0>AAAA</0>: спеціальне значення, зберігайте <0>AAAA</0> записи із вищого сервера",
    "disable_ipv6": "Вимкнути вирішення IPv6-адрес",
-    "disable_ipv6_desc": "Ігнорувати DNS-запити для IPv6-адрес (тип AAAA).",
+    "disable_ipv6_desc": "Ігнорувати всі DNS-запити адрес IPv6 (тип AAAA) та видаляти IPv6-дані з відповідей типу HTTPS.",
    "fastest_addr": "Найшвидша IP-адреса",
    "fastest_addr_desc": "Опитати всі DNS-сервери й повернути найшвидшу IP-адресу серед усіх наданих. Це сповільнить швидкість DNS-запитів, оскільки AdGuard Home повинен буде чекати відповіді усіх DNS-серверів, але водночас може покращити якість з'єднання.",
    "autofix_warning_text": "Якщо ви натиснете «Виправити», AdGuard Home налаштує вашу систему на використання DNS-сервера AdGuard Home.",
@@ -638,9 +673,69 @@
    "parental_control": "Батьківський контроль",
    "safe_browsing": "Безпечний перегляд",
    "served_from_cache": "{{value}} <i>(отримано з кешу)</i>",
-    "form_error_password_length": "Пароль мусить мати принаймні {{value}} символів",
+    "form_error_password_length": "Пароль має містити від {{min}} до {{max}} символів",
    "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> .",
    "confirm_dns_cache_clear": "Ви впевнені, що бажаєте очистити кеш DNS?",
    "cache_cleared": "Кеш DNS успішно очищено",
-    "clear_cache": "Очистити кеш"
+    "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": "Ігнорувати цей клієнт у журналі запитів",
+    "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": "Конфігурація кешу upstream DNS-серверів",
+    "enable_upstream_dns_cache": "Увімкнути кешування для користувацької конфігурації upstream-серверів цього клієнта",
+    "dns_cache_size": "Розмір кешу DNS, у байтах"
 }
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -1,18 +1,22 @@
 {
-    "client_settings": "Cài đặt máy khách",
+    "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",
    "load_balancing": "Cân bằng tải",
    "load_balancing_desc": "Chỉ truy xuất một máy chủ trong cùng thời điểm. AdGuard Home sẽ sử dụng thuật toán trọng số ngẫu nhiên để chọn một máy chủ nhanh nhất và sử dụng máy chủ đó thường xuyên hơn.",
    "bootstrap_dns": "Máy chủ DNS Bootstrap",
-    "bootstrap_dns_desc": "Máy chủ DNS Bootstrap được sử dụng để phân giải địa chỉ IP của bộ phân giải DoH/DoT mà bạn chỉ định là ngược tuyến.",
+    "bootstrap_dns_desc": "Địa chỉ IP của máy chủ DNS được sử dụng để phân giải địa chỉ IP của trình phân giải DoH/DoT mà bạn chỉ định làm thượng nguồn. Bình luận không được phép.",
+    "fallback_dns_title": "Máy chủ DNS dự phòng",
+    "fallback_dns_desc": "Danh sách máy chủ DNS dự phòng được sử dụng khi máy chủ DNS ngược tuyến không phản hồi. Cú pháp tương tự như trong trường ngược dòng chính ở trên.",
+    "fallback_dns_placeholder": "Nhập một máy chủ DNS dự phòng trên mỗi dòng",
    "local_ptr_title": "Máy chủ DNS riêng tư",
    "local_ptr_desc": "Máy chủ DNS hoặc các máy chủ mà AdGuard Home sẽ sử dụng cho các truy vấn về tài nguyên được phân phối cục bộ. Ví dụ: máy chủ này sẽ được sử dụng để phân giải tên máy khách của máy khách cho các máy khách có địa chỉ IP riêng. Nếu không được cài đặt, AdGuard Home sẽ tự động sử dụng trình phân giải DNS mặc định của bạn.",
    "local_ptr_default_resolver": "Theo mặc định, AdGuard Home sử dụng các hệ thống phân giải tên miền ngược sau: {{ip}}.",
    "local_ptr_no_default_resolver": "AdGuard Home không thể xác định hệ thống phân giải tên miền ngược riêng phù hợp cho hệ thống này.",
-    "local_ptr_placeholder": "Nhập một địa chỉ máy chủ trên mỗi dòng",
+    "local_ptr_placeholder": "Nhập một địa chỉ IP trên mỗi dòng",
    "resolve_clients_title": "Kích hoạt cho phép phân giải ngược về địa chỉ IP của máy khách",
    "resolve_clients_desc": "Nếu được bật, AdGuard Home sẽ cố gắng phân giải ngược lại địa chỉ IP của khách hàng thành tên máy chủ của họ bằng cách gửi các truy vấn PTR tới trình phân giải tương ứng (máy chủ DNS riêng cho máy khách cục bộ, máy chủ ngược dòng cho máy khách có địa chỉ IP công cộng).",
    "use_private_ptr_resolvers_title": "Sử dụng trình rDNS riêng tư",
@@ -70,7 +74,9 @@
    "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ê",
@@ -114,7 +120,8 @@
    "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_24_hours": "trong 24 giờ qua",
+    "for_last_hours": "trong {{count}} giờ qua",
+    "for_last_hours_plural": "trong {{count}} 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>.",
@@ -125,15 +132,20 @@
    "top_clients": "Người dùng hàng đầu",
    "no_clients_found": "Không có người dùng",
    "general_statistics": "Thống kê chung",
+    "top_upstreams": "Máy chủ thượng nguồn hàng đầu",
+    "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_24_hours": "Số yêu cầu DNS đã xử lý trong 24 giờ 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_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",
    "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>.",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "Cấu hình tại {{path}}",
    "test_upstream_btn": "Kiểm tra",
    "upstreams": "Nguồn",
+    "upstream": "Máy chủ thượng nguồn",
    "apply_btn": "Áp dụng",
    "disabled_filtering_toast": "Đã tắt chặn quảng cáo",
    "enabled_filtering_toast": "Đã bật chặn quảng cáo",
@@ -167,6 +180,7 @@
    "enabled_parental_toast": "Đã bật quản lý của phụ huynh",
    "disabled_safe_search_toast": "Đã tắt tìm kiếm an toàn",
    "enabled_save_search_toast": "Đã bật tìm kiếm an toàn",
+    "updated_save_search_toast": "Cài đặt Tìm kiếm an toàn đã được cập nhật",
    "enabled_table_header": "Kích hoạt",
    "name_table_header": "Tên",
    "list_url_table_header": "URL bộ lọc",
@@ -256,12 +270,12 @@
    "query_log_cleared": "Nhật ký truy vấn đã được xóa thành công",
    "query_log_updated": "Cập nhật thành công nhật kí truy xuất",
    "query_log_clear": "Xóa nhật ký truy vấn",
-    "query_log_retention": "Lưu giữ nhật ký truy vấn",
+    "query_log_retention": "Xoay vòng nhật ký truy vấn",
    "query_log_enable": "Bật nhật ký",
    "query_log_configuration": "Cấu hình nhật ký",
    "query_log_disabled": "Nhật ký truy vấn bị vô hiệu hóa và có thể được định cấu hình trong <0>cài đặt</ 0>",
    "query_log_strict_search": "Sử dụng dấu ngoặc kép để tìm kiếm nghiêm ngặt",
-    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ nhật ký truy vấn? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
+    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi xoay vòng nhật ký truy vấn không? Nếu bạn giảm giá trị khoảng thời gian, một số dữ liệu sẽ bị mất",
    "anonymize_client_ip": "Ẩn danh IP khách",
    "anonymize_client_ip_desc": "Không lưu địa chỉ IP đầy đủ của khách hàng trong nhật ký và thống kê",
    "dns_config": "Thiết lập máy chủ DNS",
@@ -275,6 +289,9 @@
    "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",
@@ -290,7 +307,19 @@
    "rate_limit": "Giới hạn yêu cầu",
    "edns_enable": "Bật mạng con EDNS Client",
    "edns_cs_desc": "Thêm tùy chọn EDNS Client Subnet (ECS) vào các yêu cầu ngược dòng và ghi lại các giá trị được gửi bởi các máy khách trong nhật ký truy vấn.",
+    "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",
@@ -441,7 +470,7 @@
    "client_confirm_delete": "Bạn có chắc chắn muốn xóa máy khách \"{{key}}\" không?",
    "list_confirm_delete": "Bạn có muốn xóa bộ lọc này?",
    "auto_clients_title": "Máy khách (thời gian chạy)",
-    "auto_clients_desc": "Các thiết bị không có trong danh sách khách hàng ổn định vẫn có thể sử dụng AdGuard Home",
+    "auto_clients_desc": "Thông tin về địa chỉ IP của thiết bị đang sử dụng hoặc có thể sử dụng AdGuard Home. Thông tin này được thu thập từ nhiều nguồn, bao gồm tệp máy chủ, DNS ngược, v.v.",
    "access_title": "Cài đặt truy cập",
    "access_desc": "Tại đây bạn có thể định cấu hình quy tắc truy cập cho máy chủ AdGuard Home DNS",
    "access_allowed_title": "Máy chủ được phép",
@@ -475,7 +504,9 @@
    "setup_dns_notice": "Để sử dụng <1>DNS-over-HTTPS</1> hoặc <1>DNS-over-TLS</1>, bạn cần <0>định cấu hình Mã hóa</0> trong cài đặt AdGuard Home.",
    "rewrite_added": "DNS viết lại cho \"{{key}}\" đã thêm thành công",
    "rewrite_deleted": "DNS viết lại cho \"{{key}}\" đã xóa thành công",
+    "rewrite_updated": "Viết lại DNS được cập nhật thành công",
    "rewrite_add": "Thêm DNS viết lại",
+    "rewrite_edit": "Chỉnh sửa viết lại DNS",
    "rewrite_not_found": "Không tìm thấy DNS viết lại",
    "rewrite_confirm_delete": "Bạn có chắc chắn muốn xóa DNS viết lại cho \"{{key}}\" không?",
    "rewrite_desc": "Cho phép dễ dàng định cấu hình tùy chỉnh DNS phản hồi cho một tên miền cụ thể.",
@@ -523,6 +554,10 @@
    "statistics_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ số liệu thống kê? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
    "statistics_cleared": "Xoá thống kê thành công",
    "statistics_enable": "Bật thống kê",
+    "ignore_domains": "Các miền bị bỏ qua (cách nhau bởi dòng mới)",
+    "ignore_domains_title": "Các miền bị bỏ qua",
+    "ignore_domains_desc_stats": "Các truy vấn phù hợp với các quy tắc này không được ghi vào số liệu thống kê",
+    "ignore_domains_desc_query": "Các truy vấn khớp với các quy tắc này không được ghi vào nhật ký truy vấn",
    "interval_hours": "{{count}} giờ",
    "interval_hours_plural": "{{count}} giờ",
    "filters_configuration": "Cấu hình bộ lọc",
@@ -555,7 +590,7 @@
    "rewrite_A": "<0>A</0>: giá trị đặc biệt, giữ bản ghi <0>A</0> từ nguồn",
    "rewrite_AAAA": "<0>A</0>: giá trị đặc biệt, giữ bản ghi <0>A</0> từ nguồn",
    "disable_ipv6": "Tắt IPv6",
-    "disable_ipv6_desc": "Nếu tính năng này được bật, tất cả các truy vấn DNS cho địa chỉ IPv6 (loại AAAA) sẽ bị loại bỏ.",
+    "disable_ipv6_desc": "Bỏ tất cả truy vấn DNS cho địa chỉ IPv6 (loại AAAA) và xóa gợi ý IPv6 khỏi phản hồi HTTPS.",
    "fastest_addr": "Địa chỉ IP nhanh nhất",
    "fastest_addr_desc": "Truy vấn tất cả các máy chủ DNS và trả về địa chỉ IP nhanh nhất trong số tất cả các phản hồi",
    "autofix_warning_text": "Nếu bạn nhấp vào \"Khắc phục\", AdGuard Home sẽ định cấu hình hệ thống của bạn để sử dụng máy chủ DNS của AdGuard Home.",
@@ -638,9 +673,69 @@
    "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 có ít nhất {{value}} ký tự",
+    "form_error_password_length": "Mật khẩu phải dài từ {{min}} đến {{max}} 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",
-    "clear_cache": "Xóa bộ nhớ cache"
+    "clear_cache": "Xóa bộ nhớ cache",
+    "make_static": "Chuyển sang tĩnh",
+    "theme_auto_desc": "Tự động (dựa trên chủ đề màu của thiết bị của bạn)",
+    "theme_dark_desc": "Chủ đề tối",
+    "theme_light_desc": "Chủ đề sáng",
+    "disable_for_seconds": "Trong {{count}} giây",
+    "disable_for_seconds_plural": "Trong {{count}} giây",
+    "disable_for_minutes": "Trong {{count}} phút",
+    "disable_for_minutes_plural": "Trong {{count}} phút",
+    "disable_for_hours": "Trong {{count}} giờ",
+    "disable_for_hours_plural": "Trong {{count}} giờ",
+    "disable_until_tomorrow": "Cho đến ngày mai",
+    "disable_notify_for_seconds": "Tắt bảo vệ trong {{count}} giây",
+    "disable_notify_for_seconds_plural": "Tắt bảo vệ trong {{count}} giây",
+    "disable_notify_for_minutes": "Tắt bảo vệ trong {{count}} phút",
+    "disable_notify_for_minutes_plural": "Tắt bảo vệ trong {{count}} phút",
+    "disable_notify_for_hours": "Tắt bảo vệ trong {{count}} giờ",
+    "disable_notify_for_hours_plural": "Tắt bảo vệ trong {{count}} giờ",
+    "disable_notify_until_tomorrow": "Vô hiệu hóa bảo vệ cho đến ngày mai",
+    "enable_protection_timer": "Bảo vệ sẽ được bật trong {{time}}",
+    "custom_retention_input": "Nhập thời gian giữ lại theo giờ",
+    "custom_rotation_input": "Nhập chu kỳ theo giờ",
+    "protection_section_label": "Sự bảo vệ",
+    "log_and_stats_section_label": "Nhật ký truy vấn và thống kê",
+    "ignore_query_log": "Bỏ qua máy khách này trong nhật ký truy vấn",
+    "ignore_statistics": "Bỏ qua máy khách này trong thống kê",
+    "schedule_services": "Tạm dừng chặn dịch vụ",
+    "schedule_services_desc": "Định cấu hình lịch tạm dừng của bộ lọc chặn dịch vụ",
+    "schedule_services_desc_client": "Định cấu hình lịch tạm dừng của bộ lọc chặn dịch vụ cho máy khách này",
+    "schedule_desc": "Đặt khoảng thời gian không hoạt động cho các dịch vụ bị chặn",
+    "schedule_invalid_select": "Thời gian bắt đầu phải trước thời gian kết thúc",
+    "schedule_select_days": "Chọn ngày",
+    "schedule_timezone": "Chọn múi giờ",
+    "schedule_current_timezone": "Múi giờ hiện tại: {{value}}",
+    "schedule_time_all_day": "Cả ngày",
+    "schedule_modal_description": "Lịch trình này sẽ thay thế mọi lịch trình hiện có cho cùng một ngày trong tuần. Mỗi ngày trong tuần chỉ có thể có một khoảng thời gian không hoạt động.",
+    "schedule_modal_time_off": "Chặn dịch vụ bị vô hiệu hóa:",
+    "schedule_new": "Kế hoạch mới",
+    "schedule_edit": "Chỉnh sửa lịch trình",
+    "schedule_save": "Lưu lịch trình",
+    "schedule_add": "Thêm lịch trình",
+    "schedule_remove": "Xóa lịch biểu",
+    "schedule_from": "Từ",
+    "schedule_to": "Đến",
+    "sunday": "Chủ nhật",
+    "monday": "Thứ hai",
+    "tuesday": "Thứ ba",
+    "wednesday": "Thứ Tư",
+    "thursday": "Thứ năm",
+    "friday": "Thứ sáu",
+    "saturday": "Thứ bảy",
+    "sunday_short": "Chủ nhật",
+    "monday_short": "Thứ 2",
+    "tuesday_short": "Thứ 3",
+    "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"
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -1,18 +1,22 @@
 {
    "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": "Bootstrap DNS 服务器用于解析您指定为上游的 DoH / DoT 解析器的 IP 地址。",
+    "bootstrap_dns_desc": "DNS 服务器的 IP 地址，用于解析指定为上游的 DoH/DoT 解析器的 IP 地址。不允许添加注释。",
+    "fallback_dns_title": "后备 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 解析器。",
    "local_ptr_default_resolver": "AdGuard Home 默认使用下列反向 DNS 解析器: {{ip}}",
    "local_ptr_no_default_resolver": "AdGuard Home 无法为这个系统确定合适的私人反向 DNS 解析器。",
-    "local_ptr_placeholder": "每行输入一个服务器地址",
+    "local_ptr_placeholder": "每行输入一个 IP 地址",
    "resolve_clients_title": "启用客户端的 IP 地址的反向解析",
    "resolve_clients_desc": "通过发送 PTR 查询到对应的解析器 (本地客户端的私人 DNS 服务器，公共 IP 客户端的上游服务器) 将 IP 地址反向解析成其客户端主机名。",
    "use_private_ptr_resolvers_title": "使用私人反向 DNS 解析器",
@@ -55,7 +59,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 接口",
@@ -64,13 +68,15 @@
    "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": "重置所有租约",
@@ -109,12 +115,13 @@
    "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_24_hours": "在过去 24 小时",
+    "for_last_hours": "最近 {{count}} 小时",
+    "for_last_hours_plural": "最近 {{count}} 小时",
    "for_last_days": "最近 {{count}} 天",
    "for_last_days_plural": "最近 {{count}} 天",
    "stats_disabled": "已禁用统计数据。您可以从<0>设置页面</0>打开它。",
@@ -125,15 +132,20 @@
    "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_24_hours": "过去 24 小时内处理的 DNS 请求总数",
+    "number_of_dns_query_hours": "最近 {{count}} 小时内处理的 DNS 查询次数",
+    "number_of_dns_query_hours_plural": "最近 {{count}} 小时内处理的 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": "响应时间",
    "average_processing_time_hint": "处理 DNS 请求的平均时间（毫秒）",
    "block_domain_use_filters_and_hosts": "使用过滤器和 Hosts 文件以拦截指定域名",
    "filters_block_toggle_hint": "你可以在 <a>过滤器</a> 设置中添加过滤规则。",
@@ -148,7 +160,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": "加密设置",
@@ -156,8 +168,9 @@
    "upstream_dns": "上游 DNS 服务器",
    "upstream_dns_help": "每行输入一个服务器地址。<a>了解更多</a>关于配置上游 DNS 服务器的内容",
    "upstream_dns_configured_in_file": "配置路径{{path}}",
-    "test_upstream_btn": "测试上游 DNS",
+    "test_upstream_btn": "测试上游",
    "upstreams": "上游服务器",
+    "upstream": "上游服务器",
    "apply_btn": "应用",
    "disabled_filtering_toast": "过滤器已禁用",
    "enabled_filtering_toast": "过滤器已启用",
@@ -200,9 +213,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": "只是一条注释；",
@@ -213,7 +226,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 ）；",
@@ -253,20 +266,20 @@
    "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": "清除查询日志",
-    "query_log_retention": "查询记录保留时间",
+    "query_log_retention": "查询日志保留时间",
    "query_log_enable": "启用日志",
    "query_log_configuration": "日志配置",
    "query_log_disabled": "查询日志已禁用，在<0>这些设置</0>中能配置它们",
-    "query_log_strict_search": "使用双引号进行严谨搜索",
-    "query_log_retention_confirm": "您确定要更改查询记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
-    "anonymize_client_ip": "匿名化客户端IP",
+    "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": "默认",
@@ -276,6 +289,9 @@
    "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",
@@ -286,7 +302,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 客户端子网",
@@ -294,13 +310,23 @@
    "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": "深色主题",
@@ -324,7 +350,7 @@
    "install_settings_dns_desc": "您将需要使用以下地址来设置您的设备或路由器的 DNS 服务器：",
    "install_settings_all_interfaces": "所有接口",
    "install_auth_title": "身份认证",
-    "install_auth_desc": "您需要对 AdGuard Home 的网页管理界面配置密码认证。即使该 AdGuard Home 只能通过您的本地网络访问，避免 AdGuard Home 被不受限制地访问依旧十分重要。",
+    "install_auth_desc": "需要对 AdGuard Home 的网页管理界面配置密码认证。即使 AdGuard Home 只能通过本地网络访问，为它添加访问限制依旧十分重要。",
    "install_auth_username": "用户名",
    "install_auth_password": "密码",
    "install_auth_confirm": "确认密码",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "您确定要删除客户端 \"{{key}}\"？",
    "list_confirm_delete": "您确定要删除此列表吗？",
    "auto_clients_title": "客户端（运行时间）",
-    "auto_clients_desc": "不在可继续使用 AdGuard Home 的持久客户端列表中的设备。",
+    "auto_clients_desc": "有关正在使用或可能使用 AdGuard Home 的设备的 IP 地址的信息。此信息是从多个来源收集的，包括 hosts 文件、反向 DNS 等。",
    "access_title": "访问设置",
    "access_desc": "您可以在此处配置 AdGuard Home 的 DNS 服务器的访问规则",
    "access_allowed_title": "允许的客户端",
@@ -452,12 +478,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> 字符串。",
@@ -478,12 +504,14 @@
    "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 重写",
    "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 地址或域名",
@@ -522,14 +550,14 @@
    "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_desc_stats": "这些网域的查询不在统计信息",
-    "ignore_domains_desc_query": "这些网域的查询不在查询日志记录",
+    "ignore_domains": "忽略的域名（以换行符分隔）",
+    "ignore_domains_title": "被忽略的域名",
+    "ignore_domains_desc_stats": "匹配这些规则的查询不在统计信息",
+    "ignore_domains_desc_query": "匹配这些规则的查询不在查询日志",
    "interval_hours": "{{count}} 小时",
    "interval_hours_plural": "{{count}} 小时",
    "filters_configuration": "过滤器配置",
@@ -550,24 +578,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 查询。",
+    "disable_ipv6_desc": "丢弃对 IPv6 地址（类型 AAAA）的所有 DNS 查询，并从 HTTPS 响应中删除 IPv6 相关的信息。",
    "fastest_addr": "最快的 IP 地址",
-    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器均有所回应，因而会降低 DNS 查询的速度，但同时，此举将会改善总体的连接。",
-    "autofix_warning_text": "若您单击「修复」，AdGuardHome 将会配置您的系统以使用 AdGuardHome 的 DNS 服务器。",
+    "fastest_addr_desc": "查询所有 DNS 服务器并返回所有响应中速度最快的 IP 地址。因 AdGuard Home 必须等待全部 DNS 服务器响应，这会降低 DNS 查询的速度，但此举将会在总体上改善连接速度。",
+    "autofix_warning_text": "若您单击「修复」，AdGuard Home 将会配置您的系统以使用 AdGuard Home 的 DNS 服务器。",
    "autofix_warning_list": "其将会进行如下工作：<0>停用系统DNSStubListener</0><0>设置DNS服务器地址为127.0.0.1</0><0>将/etc/resolv.conf的符号链接目标替换为/run/systemd/resolv/resolv.conf</0><0>停止DNSStubListener（重新加载系统解析服务）</0>",
-    "autofix_warning_result": "因此，默认情况下所有来自系统的DNS请求都将由AdGuardHome处理。",
+    "autofix_warning_result": "因此，默认情况下所有来自系统的 DNS 请求都将由 AdGuard Home 处理。",
    "tags_title": "标签",
    "tags_desc": "您可以选择与客户端对应的标记。标签可以包含在过滤规则中，并允许您更准确地应用它们。<0>了解更多</0>。",
    "form_select_tags": "选择客户端标签",
@@ -585,22 +613,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": "已列入白名单",
@@ -615,9 +643,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 值（秒）",
@@ -645,7 +673,7 @@
    "parental_control": "家长控制",
    "safe_browsing": "安全浏览",
    "served_from_cache": "{{value}}<i>(由缓存提供)</i>",
-    "form_error_password_length": "密码必须至少有 {{value}} 个字符",
+    "form_error_password_length": "密码长度必须为 {{min}} 到 {{max}} 个字符",
    "anonymizer_notification": "<0>注意：</0> IP 匿名化已启用。您可以在<1>常规设置</1>中禁用它。",
    "confirm_dns_cache_clear": "您确定要清除 DNS 缓存吗？",
    "cache_cleared": "已成功清除 DNS 缓存",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "禁用保护 {{count}} 小时",
    "disable_notify_for_hours_plural": "禁用保护 {{count}} 小时",
    "disable_notify_until_tomorrow": "禁用保护直到明天",
-    "enable_protection_timer": "保护将于 {{time}} 启用"
+    "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 缓存大小，单位：字节"
 }
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -48,6 +48,7 @@
    "out_of_range_error": "必須介於 \"{{start}}\" - \"{{end}}\" 範圍之外",
    "lower_range_start_error": "必須小於起始值",
    "greater_range_start_error": "必須大於起始值",
+    "gateway_or_subnet_invalid": "無效子網路",
    "dhcp_form_gateway_input": "閘道 IP 位址",
    "dhcp_form_subnet_input": "子網路遮罩",
    "dhcp_form_range_title": "IP 位址範圍",
@@ -163,7 +164,7 @@
    "disabled_parental_toast": "已停用家長監護",
    "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 網址",
@@ -195,6 +196,7 @@
    "form_error_url_or_path_format": "列表中含有的 URL 網址或絕對路徑",
    "custom_filter_rules": "自訂過濾規則",
    "custom_filter_rules_hint": "一行一條規則。您可以使用「adblock」語法或「hosts檔案」的語法。",
+    "system_host_files": "系統 hosts 檔案",
    "examples_title": "範例",
    "example_meaning_filter_block": "封鎖對 example.org 網域及其所有子網域的存取",
    "example_meaning_filter_whitelist": "解除對 example.org 網域及其所有子網域存取封鎖",
@@ -209,6 +211,10 @@
    "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": "所有清單已更新至最新",
    "dns_test_ok_toast": "設定中的 DNS 上游運作正常",
    "dns_test_not_ok_toast": "DNS 設定中的 \"{{key}}\" 出現錯誤，請確認是否正確輸入",
@@ -279,6 +285,8 @@
    "rate_limit": "速率限制",
    "edns_enable": "啟用 EDNS Client Subnet",
    "edns_cs_desc": "傳送用戶端的子網路給 DNS 伺服器。",
+    "edns_use_custom_ip": "使用自訂 EDNS IP",
+    "edns_use_custom_ip_desc": "允許使用自訂 EDNS IP",
    "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
    "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
    "blocking_ipv6_desc": "回覆指定 IPv6 位址給被封鎖的網域的 AAAA 紀錄查詢",
@@ -287,6 +295,9 @@
    "blocking_mode_nxdomain": "NXDOMAIN：回應 NXDOMAIN 狀態碼",
    "blocking_mode_null_ip": "Null IP：回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）",
    "blocking_mode_custom_ip": "自訂 IP 位址：回應一個自訂的 IP 位址",
+    "theme_auto": "自動",
+    "theme_light": "明亮",
+    "theme_dark": "深色",
    "upstream_dns_client_desc": "如果您將此欄位留白，AdGuard Home 將使用 <0>DNS 設定</0> 內的設定的 DNS 伺服器。",
    "tracker_source": "追蹤器來源",
    "source_label": "來源",
@@ -397,6 +408,7 @@
    "dns_providers": "下列為常見的<0> DNS 伺服器</0>。",
    "update_now": "立即更新",
    "update_failed": "自動更新發生錯誤。請嘗試依照<a>以下步驟</a> 來手動更新。",
+    "manual_update": "請嘗試依照<a>下列步驟</a>來手動更新。",
    "processing_update": "請稍候，AdGuard Home 正在更新",
    "clients_title": "用戶端",
    "clients_desc": "對已連接到 AdGuard Home 的裝置進行設定",
@@ -460,6 +472,7 @@
    "rewrite_added": "「{{key}}」的 DNS 覆寫新增成功",
    "rewrite_deleted": "「{{key}}」的 DNS 覆寫刪除成功",
    "rewrite_add": "新增 DNS 覆寫",
+    "rewrite_edit": "編輯 DNS 覆寫",
    "rewrite_not_found": "找不到 DNS 覆寫",
    "rewrite_confirm_delete": "您確定要刪除 \"{{key}}\" 的 DNS 覆寫？",
    "rewrite_desc": "提供簡單的方式對特定網域自訂 DNS 回應。",
@@ -493,6 +506,7 @@
    "interval_days": "{{count}} 天",
    "interval_days_plural": "{{count}} 天",
    "domain": "網域",
+    "ecs": "EDNS 子網",
    "punycode": "Punycode",
    "answer": "回應",
    "filter_added_successfully": "已成功新增清單",
@@ -505,6 +519,9 @@
    "statistics_clear_confirm": "您確定要清除統計資料嗎？",
    "statistics_retention_confirm": "您確定要更改統計資料保存時間嗎？如果您縮短期限部分資料可能將會遺失",
    "statistics_cleared": "已清除統計資料",
+    "statistics_enable": "啟用統計數據",
+    "ignore_domains": "已忽略網域（每行一個）",
+    "ignore_domains_title": "已忽略網域",
    "interval_hours": "{{count}} 小時",
    "interval_hours_plural": "{{count}} 小時",
    "filters_configuration": "過濾器設定",
@@ -613,5 +630,30 @@
    "original_response": "原始回應",
    "click_to_view_queries": "按一下以檢視查詢結果",
    "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
-    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。"
+    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。",
+    "safe_browsing": "安全瀏覽",
+    "served_from_cache": "{{value}} <i>(由快取回應)</i>",
+    "form_error_password_length": "密碼必須至少 {{value}} 個字元長度",
+    "make_static": "新增為靜態",
+    "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}} 小時",
+    "sunday_short": "週日",
+    "monday_short": "週一",
+    "tuesday_short": "週二",
+    "wednesday_short": "週三",
+    "thursday_short": "週四",
+    "friday_short": "週五",
+    "saturday_short": "週六"
 }
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -1,18 +1,22 @@
 {
    "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": "自我啟動（Bootstrap）DNS 伺服器被用於解析您明確指定作為上游的 DoH/DoT 解析器之 IP 位址。",
+    "bootstrap_dns_desc": "DNS 伺服器的 IP 位址，用於解析您指定為上游伺服器的 DoH/DoT 解析器的 IP 位址。不允許註釋。",
+    "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}}。",
    "local_ptr_no_default_resolver": "AdGuard Home 無法為此系統決定合適的私人反向的 DNS 解析器。",
-    "local_ptr_placeholder": "每行輸入一個伺服器位址",
+    "local_ptr_placeholder": "每行輸入一個 IP 位址",
    "resolve_clients_title": "啟用用戶端的 IP 位址之反向的解析",
    "resolve_clients_desc": "透過傳送指標（PTR）查詢到對應的解析器（私人 DNS 伺服器供區域的用戶端，上游的伺服器供有公共 IP 位址的用戶端），反向地解析用戶端的 IP 位址變為它們的主機名稱。",
    "use_private_ptr_resolvers_title": "使用私人反向的 DNS 解析器",
@@ -70,7 +74,9 @@
    "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": "重置所有的租約",
@@ -114,7 +120,8 @@
    "stats_malware_phishing": "已封鎖的惡意軟體/網路釣魚",
    "stats_adult": "已封鎖的成人網站",
    "stats_query_domain": "熱門已查詢的網域",
-    "for_last_24_hours": "在最近的 24 小時內",
+    "for_last_hours": "在過去的 {{count}} 小時內",
+    "for_last_hours_plural": "在過去的 {{count}} 小時內",
    "for_last_days": "在最近的 {{count}} 日內",
    "for_last_days_plural": "在最近的 {{count}} 日內",
    "stats_disabled": "該統計資料已被禁用。您可從<0>設定頁面</0>中打開它。",
@@ -125,22 +132,27 @@
    "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_24_hours": "在最近的 24 小時內已處理的 DNS 查詢之數量",
+    "number_of_dns_query_hours": "過去 {{count}} 小時內處理的 DNS 查詢次數",
+    "number_of_dns_query_hours_plural": "過去 {{count}} 小時內處理的 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": "回應時間",
    "average_processing_time_hint": "在處理一項 DNS 請求時以毫秒（ms）計的平均時間",
    "block_domain_use_filters_and_hosts": "透過過濾器和主機檔案封鎖網域",
    "filters_block_toggle_hint": "您可在<a>過濾器</a>設定中設置封鎖規則。",
    "use_adguard_browsing_sec": "使用 AdGuard 瀏覽安全網路服務",
-    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查該網域是否被瀏覽安全網路服務封鎖。它將使用友好的隱私查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到該伺服器。",
+    "use_adguard_browsing_sec_hint": "AdGuard Home 將檢查該網域是否被瀏覽安全網路服務封鎖。它將使用對隱私友好的查找應用程式介面（API）以執行檢查：僅域名 SHA256 雜湊的短前綴被傳送到該伺服器。",
    "use_adguard_parental": "使用 AdGuard 家長控制之網路服務",
-    "use_adguard_parental_hint": "AdGuard Home 將檢查網域是否包含成人資料。它使用如同瀏覽安全網路服務一樣之友好的隱私應用程式介面（API）。",
+    "use_adguard_parental_hint": "AdGuard Home 將檢查網域是否包含成人資料。它使用如同瀏覽安全網路服務一樣之對隱私友好的應用程式介面（API）。",
    "enforce_safe_search": "使用安全搜尋",
    "enforce_save_search_hint": "AdGuard Home 將在下列的搜尋引擎：Google、YouTube、Bing、DuckDuckGo、Yandex 和 Pixabay 中強制執行安全搜尋。",
    "no_servers_specified": "無已明確指定的伺服器",
@@ -158,6 +170,7 @@
    "upstream_dns_configured_in_file": "被配置在 {{path}}",
    "test_upstream_btn": "測試上行資料流",
    "upstreams": "上游",
+    "upstream": "上游伺服器",
    "apply_btn": "套用",
    "disabled_filtering_toast": "已禁用過濾",
    "enabled_filtering_toast": "已啟用過濾",
@@ -257,12 +270,12 @@
    "query_log_cleared": "該查詢記錄已被成功地清除",
    "query_log_updated": "該查詢記錄已被成功地更新",
    "query_log_clear": "清除查詢記錄",
-    "query_log_retention": "查詢記錄保留",
+    "query_log_retention": "查詢記錄保留時間",
    "query_log_enable": "啟用記錄",
    "query_log_configuration": "記錄配置",
    "query_log_disabled": "查詢記錄被禁用並可在<0>設定</0>中被配置",
    "query_log_strict_search": "使用雙引號於嚴謹的搜尋",
-    "query_log_retention_confirm": "您確定您想要更改查詢記錄保留嗎？如果您減少該間隔值，某些資料將被丟失",
+    "query_log_retention_confirm": "您確定要更改記錄檔保存期限嗎？如果您縮短期限部分資料可能將會遺失",
    "anonymize_client_ip": "將用戶端 IP 匿名",
    "anonymize_client_ip_desc": "不要儲存用戶端之完整的 IP 位址到記錄或統計資料裡",
    "dns_config": "DNS 伺服器配置",
@@ -276,6 +289,9 @@
    "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",
@@ -294,6 +310,16 @@
    "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 位址回覆",
@@ -444,7 +470,7 @@
    "client_confirm_delete": "您確定您想要刪除用戶端 \"{{key}}\" 嗎？",
    "list_confirm_delete": "您確定您想要刪除該清單嗎？",
    "auto_clients_title": "執行時期用戶端",
-    "auto_clients_desc": "未於可能仍然使用 AdGuard Home 的持續性用戶端之清單上的裝置",
+    "auto_clients_desc": "AdGuard Home 使用或可能使用的裝置的 IP 地址資訊。這些資訊來自多個來源，包括主機檔案、反向 DNS 等。",
    "access_title": "存取設定",
    "access_desc": "於此您可配置用於 AdGuard Home DNS 伺服器之存取規則",
    "access_allowed_title": "已允許的用戶端",
@@ -478,7 +504,9 @@
    "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 改寫",
    "rewrite_confirm_delete": "您確定您想要刪除對於 \"{{key}}\" 之 DNS 改寫嗎？",
    "rewrite_desc": "允許輕易地配置自訂的 DNS 回應供特定的域名。",
@@ -528,8 +556,8 @@
    "statistics_enable": "啟用統計資料",
    "ignore_domains": "忽略的網域（以換行符分隔）",
    "ignore_domains_title": "被忽略的網域",
-    "ignore_domains_desc_stats": "這些網域的查詢不在統計資料",
-    "ignore_domains_desc_query": "這些網域的查詢不在查詢記錄",
+    "ignore_domains_desc_stats": "符合這些規則的查詢不會被記錄在統計資料中",
+    "ignore_domains_desc_query": "符合這些規則的查詢不會被寫入查詢記錄中",
    "interval_hours": "{{count}} 小時",
    "interval_hours_plural": "{{count}} 小時",
    "filters_configuration": "過濾器配置",
@@ -562,7 +590,7 @@
    "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 查詢。",
+    "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 伺服器。",
@@ -645,7 +673,7 @@
    "parental_control": "家長控制",
    "safe_browsing": "安全瀏覽",
    "served_from_cache": "{{value}} <i>(由快取提供)</i>",
-    "form_error_password_length": "密碼必須為至少長 {{value}} 個字元",
+    "form_error_password_length": "密碼長度必須為 {{min}} 到 {{max}} 個字符",
    "anonymizer_notification": "<0>注意：</0>IP 匿名化被啟用。您可在<1>一般設定</1>中禁用它。",
    "confirm_dns_cache_clear": "您確定您想要清除 DNS 快取嗎？",
    "cache_cleared": "DNS 快取被成功地清除",
@@ -668,5 +696,46 @@
    "disable_notify_for_hours": "計 {{count}} 小時禁用防護",
    "disable_notify_for_hours_plural": "計 {{count}} 小時禁用防護",
    "disable_notify_until_tomorrow": "禁用防護直到明天",
-    "enable_protection_timer": "防護將於 {{time}} 被啟用"
+    "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 快取大小，單位：位元"
 }
--- a/client/src/actions/dnsConfig.js
+++ b/client/src/actions/dnsConfig.js
@@ -50,6 +50,10 @@ export const setDnsConfig = (config) => async (dispatch) => {
            data.bootstrap_dns = splitByNewLine(config.bootstrap_dns);
            hasDnsSettings = true;
        }
+        if (Object.prototype.hasOwnProperty.call(data, 'fallback_dns')) {
+            data.fallback_dns = splitByNewLine(config.fallback_dns);
+            hasDnsSettings = true;
+        }
        if (Object.prototype.hasOwnProperty.call(data, 'local_ptr_upstreams')) {
            data.local_ptr_upstreams = splitByNewLine(config.local_ptr_upstreams);
            hasDnsSettings = true;
@@ -58,6 +62,10 @@ 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);

--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -338,12 +338,51 @@ 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');

 export const testUpstream = (
-    { bootstrap_dns, upstream_dns, local_ptr_upstreams }, upstream_dns_file,
+    {
+        bootstrap_dns,
+        upstream_dns,
+        local_ptr_upstreams,
+        fallback_dns,
+    }, upstream_dns_file,
 ) => async (dispatch) => {
    dispatch(testUpstreamRequest());
    try {
@@ -352,6 +391,7 @@ export const testUpstream = (
        const config = {
            bootstrap_dns: splitByNewLine(bootstrap_dns),
            private_upstream: splitByNewLine(local_ptr_upstreams),
+            fallback_dns: splitByNewLine(fallback_dns),
            ...(upstream_dns_file ? null : {
                upstream_dns: removeComments(upstream_dns),
            }),
@@ -386,12 +426,14 @@ export const testUpstreamWithFormValues = () => async (dispatch, getState) => {
        bootstrap_dns,
        upstream_dns,
        local_ptr_upstreams,
+        fallback_dns,
    } = getState().form[FORM_NAME.UPSTREAM].values;

    return dispatch(testUpstream({
        bootstrap_dns,
        upstream_dns,
        local_ptr_upstreams,
+        fallback_dns,
    }, upstream_dns_file));
 };

@@ -652,6 +694,24 @@ 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 = (
--- a/client/src/actions/rewrites.js
+++ b/client/src/actions/rewrites.js
@@ -38,6 +38,29 @@ export const addRewrite = (config) => async (dispatch) => {
    }
 };

+export const updateRewriteRequest = createAction('UPDATE_REWRITE_REQUEST');
+export const updateRewriteFailure = createAction('UPDATE_REWRITE_FAILURE');
+export const updateRewriteSuccess = createAction('UPDATE_REWRITE_SUCCESS');
+
+/**
+ * @param {Object} config
+ * @param {string} config.target - current DNS rewrite value
+ * @param {string} config.update - updated DNS rewrite value
+ */
+export const updateRewrite = (config) => async (dispatch) => {
+    dispatch(updateRewriteRequest());
+    try {
+        await apiClient.updateRewrite(config);
+        dispatch(updateRewriteSuccess());
+        dispatch(toggleRewritesModal());
+        dispatch(getRewritesList());
+        dispatch(addSuccessToast(i18next.t('rewrite_updated', { key: config.domain })));
+    } catch (error) {
+        dispatch(addErrorToast({ error }));
+        dispatch(updateRewriteFailure());
+    }
+};
+
 export const deleteRewriteRequest = createAction('DELETE_REWRITE_REQUEST');
 export const deleteRewriteFailure = createAction('DELETE_REWRITE_FAILURE');
 export const deleteRewriteSuccess = createAction('DELETE_REWRITE_SUCCESS');
--- a/client/src/actions/services.js
+++ b/client/src/actions/services.js
@@ -2,21 +2,6 @@ import { createAction } from 'redux-actions';
 import apiClient from '../api/Api';
 import { addErrorToast, addSuccessToast } from './toasts';

-export const getBlockedServicesAvailableServicesRequest = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_REQUEST');
-export const getBlockedServicesAvailableServicesFailure = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_FAILURE');
-export const getBlockedServicesAvailableServicesSuccess = createAction('GET_BLOCKED_SERVICES_AVAILABLE_SERVICES_SUCCESS');
-
-export const getBlockedServicesAvailableServices = () => async (dispatch) => {
-    dispatch(getBlockedServicesAvailableServicesRequest());
-    try {
-        const data = await apiClient.getBlockedServicesAvailableServices();
-        dispatch(getBlockedServicesAvailableServicesSuccess(data));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(getBlockedServicesAvailableServicesFailure());
-    }
-};
-
 export const getBlockedServicesRequest = createAction('GET_BLOCKED_SERVICES_REQUEST');
 export const getBlockedServicesFailure = createAction('GET_BLOCKED_SERVICES_FAILURE');
 export const getBlockedServicesSuccess = createAction('GET_BLOCKED_SERVICES_SUCCESS');
@@ -47,19 +32,19 @@ export const getAllBlockedServices = () => async (dispatch) => {
    }
 };

-export const setBlockedServicesRequest = createAction('SET_BLOCKED_SERVICES_REQUEST');
-export const setBlockedServicesFailure = createAction('SET_BLOCKED_SERVICES_FAILURE');
-export const setBlockedServicesSuccess = createAction('SET_BLOCKED_SERVICES_SUCCESS');
+export const updateBlockedServicesRequest = createAction('UPDATE_BLOCKED_SERVICES_REQUEST');
+export const updateBlockedServicesFailure = createAction('UPDATE_BLOCKED_SERVICES_FAILURE');
+export const updateBlockedServicesSuccess = createAction('UPDATE_BLOCKED_SERVICES_SUCCESS');

-export const setBlockedServices = (values) => async (dispatch) => {
-    dispatch(setBlockedServicesRequest());
+export const updateBlockedServices = (values) => async (dispatch) => {
+    dispatch(updateBlockedServicesRequest());
    try {
-        await apiClient.setBlockedServices(values);
-        dispatch(setBlockedServicesSuccess());
+        await apiClient.updateBlockedServices(values);
+        dispatch(updateBlockedServicesSuccess());
        dispatch(getBlockedServices());
        dispatch(addSuccessToast('blocked_services_saved'));
    } catch (error) {
        dispatch(addErrorToast({ error }));
-        dispatch(setBlockedServicesFailure());
+        dispatch(updateBlockedServicesFailure());
    }
 };
--- a/client/src/actions/stats.js
+++ b/client/src/actions/stats.js
@@ -56,6 +56,8 @@ export const getStats = () => async (dispatch) => {
            top_clients: topClientsWithInfo,
            top_queried_domains: normalizeTopStats(stats.top_queried_domains),
            avg_processing_time: secondsToMilliseconds(stats.avg_processing_time),
+            top_upstreams_responses: normalizeTopStats(stats.top_upstreams_responses),
+            top_upstrems_avg_time: normalizeTopStats(stats.top_upstreams_avg_time),
        };

        dispatch(getStatsSuccess(normalizedStats));
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -274,6 +274,8 @@ 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' };
@@ -320,6 +322,14 @@ 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);
@@ -455,6 +465,8 @@ class Api {

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

+    REWRITE_UPDATE = { path: 'rewrite/update', method: 'PUT' };
+
    REWRITE_DELETE = { path: 'rewrite/delete', method: 'POST' };

    getRewritesList() {
@@ -470,6 +482,14 @@ class Api {
        return this.makeRequest(path, method, parameters);
    }

+    updateRewrite(config) {
+        const { path, method } = this.REWRITE_UPDATE;
+        const parameters = {
+            data: config,
+        };
+        return this.makeRequest(path, method, parameters);
+    }
+
    deleteRewrite(config) {
        const { path, method } = this.REWRITE_DELETE;
        const parameters = {
@@ -479,31 +499,24 @@ class Api {
    }

    // Blocked services
-    BLOCKED_SERVICES_SERVICES = { path: 'blocked_services/services', method: 'GET' };
+    BLOCKED_SERVICES_GET = { path: 'blocked_services/get', method: 'GET' };

-    BLOCKED_SERVICES_LIST = { path: 'blocked_services/list', method: 'GET' };
-
-    BLOCKED_SERVICES_SET = { path: 'blocked_services/set', method: 'POST' };
+    BLOCKED_SERVICES_UPDATE = { path: 'blocked_services/update', method: 'PUT' };

    BLOCKED_SERVICES_ALL = { path: 'blocked_services/all', method: 'GET' };

-    getBlockedServicesAvailableServices() {
-        const { path, method } = this.BLOCKED_SERVICES_SERVICES;
-        return this.makeRequest(path, method);
-    }
-
    getAllBlockedServices() {
        const { path, method } = this.BLOCKED_SERVICES_ALL;
        return this.makeRequest(path, method);
    }

    getBlockedServices() {
-        const { path, method } = this.BLOCKED_SERVICES_LIST;
+        const { path, method } = this.BLOCKED_SERVICES_GET;
        return this.makeRequest(path, method);
    }

-    setBlockedServices(config) {
-        const { path, method } = this.BLOCKED_SERVICES_SET;
+    updateBlockedServices(config) {
+        const { path, method } = this.BLOCKED_SERVICES_UPDATE;
        const parameters = {
            data: config,
        };
--- a/client/src/components/App/index.css
+++ b/client/src/components/App/index.css
@@ -89,18 +89,18 @@ body {
 }

 .container--wrap {
-    min-height: calc(100vh - 160px);
+    min-height: calc(100vh - 372px);
+}
+
+@media screen and (min-width: 768px) {
+    .container--wrap {
+        min-height: calc(100vh - 168px);
+    }
 }

@media screen and (min-width: 992px) {
    .container--wrap {
-        min-height: calc(100vh - 117px);
-    }
-}
-
-@media screen and (max-width: 992px) {
-    .container--wrap {
-        min-height: calc(100vh);
+        min-height: calc(100vh - 187px);
    }
 }

@@ -118,6 +118,11 @@ body {
    overflow-y: auto;
 }

+.modal-body--filters {
+    max-height: 600px;
+    overflow-y: auto;
+}
+
 .modal-body__item:not(:first-child) {
    padding-top: 1.5rem;
 }
@@ -134,15 +139,6 @@ body {
    cursor: not-allowed;
 }

-.button-action {
-    visibility: hidden;
-}
-
-.logs__row:hover .button-action,
-.button-action--active {
-    visibility: visible;
-}
-
 .ReactModal__Body--open {
    overflow: hidden;
 }
--- a/client/src/components/App/index.js
+++ b/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 } from '../../actions';
+import { changeLanguage, getDnsStatus, getTimerStatus } from '../../actions';

 import Dashboard from '../../containers/Dashboard';
 import SetupGuide from '../../containers/SetupGuide';
@@ -126,6 +126,18 @@ const App = () => {

    useEffect(() => {
        dispatch(getDnsStatus());
+
+        const handleVisibilityChange = () => {
+            if (document.visibilityState === 'visible') {
+                dispatch(getTimerStatus());
+            }
+        };
+
+        document.addEventListener('visibilitychange', handleVisibilityChange);
+
+        return () => {
+            document.removeEventListener('visibilitychange', handleVisibilityChange);
+        };
    }, []);

    const setLanguage = () => {
@@ -192,7 +204,7 @@ const App = () => {
        <LoadingBar className="loading-bar" updateTime={1000} />
        <Header />
        <ProtectionTimer />
-        <div className="container container--wrap pb-5">
+        <div className="container container--wrap pb-5 pt-5">
            {processing && <Loading />}
            {!isCoreRunning && <div className="row row-cards">
                <div className="col-lg-12">
--- a/client/src/components/Dashboard/BlockedDomains.js
+++ b/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 { STATUS_COLORS } from '../../helpers/constants';
+import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } 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={6}
-                defaultPageSize={100}
+                minRows={TABLES_MIN_ROWS}
+                defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
                className="-highlight card-table-overflow--limited stats__table"
            />
        </Card>
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import ReactTable from 'react-table';
 import PropTypes from 'prop-types';
 import { Trans, useTranslation } from 'react-i18next';
@@ -9,10 +9,16 @@ import Card from '../ui/Card';
 import Cell from '../ui/Cell';

 import { getPercent, sortIp } from '../../helpers/helpers';
-import { BLOCK_ACTIONS, STATUS_COLORS } from '../../helpers/constants';
+import {
+    BLOCK_ACTIONS,
+    DASHBOARD_TABLES_DEFAULT_PAGE_SIZE,
+    STATUS_COLORS,
+    TABLES_MIN_ROWS,
+} 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) {
@@ -40,9 +46,7 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
    const processingSet = useSelector((state) => state.access.processingSet);
    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);

-    const buttonClass = classNames('button-action button-action--main', {
-        'button-action--unblock': disallowed,
-    });
+    const [isOptionsOpened, setOptionsOpened] = useState(false);

    const toggleClientStatus = async (ip, disallowed, disallowed_rule) => {
        let confirmMessage;
@@ -62,23 +66,49 @@ const renderBlockingButton = (ip, disallowed, disallowed_rule) => {
        }
    };

-    const onClick = () => toggleClientStatus(ip, disallowed, disallowed_rule);
+    const onClick = () => {
+        toggleClientStatus(ip, disallowed, disallowed_rule);
+        setOptionsOpened(false);
+    };

    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 pl-4">
+        <div className="table__action">
            <button
                type="button"
-                className={buttonClass}
-                onClick={onClick}
-                disabled={disabled}
-                title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''}
+                className="btn btn-icon btn-sm px-0"
+                onClick={() => setOptionsOpened(true)}
            >
-                <Trans>{text}</Trans>
+                <svg className="icon24 icon--lightgray button-action__icon">
+                    <use xlinkHref="#bullets" />
+                </svg>
            </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>
    );
 };
@@ -134,8 +164,8 @@ const Clients = ({
                ]}
                showPagination={false}
                noDataText={t('no_clients_found')}
-                minRows={6}
-                defaultPageSize={100}
+                minRows={TABLES_MIN_ROWS}
+                defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
                className="-highlight card-table-overflow--limited clients__table"
                getTrProps={(_state, rowInfo) => {
                    if (!rowInfo) {
--- a/client/src/components/Dashboard/Counters.js
+++ b/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 } from '../../helpers/helpers';
+import { formatNumber, msToDays, msToHours } from '../../helpers/helpers';
 import LogsSearchLink from '../ui/LogsSearchLink';
-import { RESPONSE_FILTER } from '../../helpers/constants';
+import { RESPONSE_FILTER, TIME_UNITS } from '../../helpers/constants';
 import Tooltip from '../ui/Tooltip';

 const Row = ({
@@ -52,14 +52,19 @@ 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 rows = [
        {
            label: 'dns_query',
            count: numDnsQueries,
-            tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
+            tooltipTitle: dnsQueryTooltip,
            response_status: RESPONSE_FILTER.ALL.QUERY,
        },
        {
--- a/client/src/components/Dashboard/Dashboard.css
+++ b/client/src/components/Dashboard/Dashboard.css
@@ -28,11 +28,14 @@
    border-bottom: 6px solid #585965;
 }

-@media (max-width: 1279.98px) {
-    .table__action {
-        position: absolute;
-        right: 0;
-    }
+.table__action {
+    position: relative;
+    margin-left: auto;
+}
+
+.table__action .btn-icon {
+    outline: 0;
+    box-shadow: none;
 }

 .page-title--dashboard {
--- a/client/src/components/Dashboard/QueriedDomains.js
+++ b/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 { STATUS_COLORS } from '../../helpers/constants';
+import { DASHBOARD_TABLES_DEFAULT_PAGE_SIZE, STATUS_COLORS, TABLES_MIN_ROWS } 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={6}
-            defaultPageSize={100}
+            minRows={TABLES_MIN_ROWS}
+            defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
            className="-highlight card-table-overflow--limited stats__table"
        />
    </Card>
--- a/client/src/components/Dashboard/UpstreamAvgTime.js
+++ b/client/src/components/Dashboard/UpstreamAvgTime.js
@@ -0,0 +1,80 @@
+import React from 'react';
+import ReactTable from 'react-table';
+import PropTypes from 'prop-types';
+import round from 'lodash/round';
+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) {
+        return '–';
+    }
+
+    const valueInMilliseconds = round(value * 1000);
+
+    return (
+        <div className="logs__row o-hidden">
+            <span className="logs__text logs__text--full" title={valueInMilliseconds}>
+                {valueInMilliseconds}&nbsp;ms
+            </span>
+        </div>
+    );
+};
+
+TimeCell.propTypes = {
+    value: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+    ]),
+};
+
+const UpstreamAvgTime = ({
+    t,
+    refreshButton,
+    topUpstreamsAvgTime,
+    subtitle,
+}) => (
+    <Card
+        title={t('average_upstream_response_time')}
+        subtitle={subtitle}
+        bodyType="card-table"
+        refresh={refreshButton}
+    >
+        <ReactTable
+            data={topUpstreamsAvgTime.map(({ name: domain, count }) => ({
+                domain,
+                count,
+            }))}
+            columns={[
+                {
+                    Header: <Trans>upstream</Trans>,
+                    accessor: 'domain',
+                    Cell: DomainCell,
+                },
+                {
+                    Header: <Trans>response_time</Trans>,
+                    accessor: 'count',
+                    maxWidth: 190,
+                    Cell: TimeCell,
+                },
+            ]}
+            showPagination={false}
+            noDataText={t('no_upstreams_data_found')}
+            minRows={TABLES_MIN_ROWS}
+            defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+            className="-highlight card-table-overflow--limited stats__table"
+        />
+    </Card>
+);
+
+UpstreamAvgTime.propTypes = {
+    topUpstreamsAvgTime: PropTypes.array.isRequired,
+    refreshButton: PropTypes.node.isRequired,
+    subtitle: PropTypes.string.isRequired,
+    t: PropTypes.func.isRequired,
+};
+
+export default withTranslation()(UpstreamAvgTime);
--- a/client/src/components/Dashboard/UpstreamResponses.js
+++ b/client/src/components/Dashboard/UpstreamResponses.js
@@ -0,0 +1,81 @@
+import React from 'react';
+import ReactTable from 'react-table';
+import PropTypes from 'prop-types';
+import { withTranslation, Trans } from 'react-i18next';
+
+import Card from '../ui/Card';
+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';
+
+const CountCell = (totalBlocked) => (
+    function cell(row) {
+        const { value } = row;
+        const percent = getPercent(totalBlocked, value);
+
+        return (
+            <Cell
+                value={value}
+                percent={percent}
+                color={STATUS_COLORS.green}
+            />
+        );
+    }
+);
+
+const getTotalUpstreamRequests = (stats) => {
+    let total = 0;
+    stats.forEach(({ count }) => { total += count; });
+
+    return total;
+};
+
+const UpstreamResponses = ({
+    t,
+    refreshButton,
+    topUpstreamsResponses,
+    subtitle,
+}) => (
+    <Card
+        title={t('top_upstreams')}
+        subtitle={subtitle}
+        bodyType="card-table"
+        refresh={refreshButton}
+    >
+        <ReactTable
+            data={topUpstreamsResponses.map(({ name: domain, count }) => ({
+                domain,
+                count,
+            }))}
+            columns={[
+                {
+                    Header: <Trans>upstream</Trans>,
+                    accessor: 'domain',
+                    Cell: DomainCell,
+                },
+                {
+                    Header: <Trans>requests_count</Trans>,
+                    accessor: 'count',
+                    maxWidth: 190,
+                    Cell: CountCell(getTotalUpstreamRequests(topUpstreamsResponses)),
+                },
+            ]}
+            showPagination={false}
+            noDataText={t('no_upstreams_data_found')}
+            minRows={TABLES_MIN_ROWS}
+            defaultPageSize={DASHBOARD_TABLES_DEFAULT_PAGE_SIZE}
+            className="-highlight card-table-overflow--limited stats__table"
+        />
+    </Card>
+);
+
+UpstreamResponses.propTypes = {
+    topUpstreamsResponses: PropTypes.array.isRequired,
+    refreshButton: PropTypes.node.isRequired,
+    subtitle: PropTypes.string.isRequired,
+    t: PropTypes.func.isRequired,
+};
+
+export default withTranslation()(UpstreamResponses);
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -9,7 +9,12 @@ 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 } from '../../helpers/constants';
+import {
+    DISABLE_PROTECTION_TIMINGS,
+    ONE_SECOND_IN_MS,
+    SETTINGS_URLS,
+    TIME_UNITS,
+} from '../../helpers/constants';
 import {
    msToSeconds,
    msToMinutes,
@@ -21,6 +26,8 @@ import PageTitle from '../ui/PageTitle';
 import Loading from '../ui/Loading';
 import './Dashboard.css';
 import Dropdown from '../ui/Dropdown';
+import UpstreamResponses from './UpstreamResponses';
+import UpstreamAvgTime from './UpstreamAvgTime';

 const Dashboard = ({
    getAccessList,
@@ -44,15 +51,12 @@ const Dashboard = ({
        getAllStats();
    }, []);
    const getSubtitle = () => {
-        const ONE_DAY = 1;
-        const intervalInDays = msToDays(stats.interval);
-
-        if (intervalInDays < ONE_DAY) {
+        if (!stats.enabled) {
            return t('stats_disabled_short');
        }

-        return intervalInDays === ONE_DAY
-            ? t('for_last_24_hours')
+        return stats.timeUnits === TIME_UNITS.HOURS
+            ? t('for_last_hours', { count: msToHours(stats.interval) })
            : t('for_last_days', { count: msToDays(stats.interval) });
    };

@@ -136,12 +140,12 @@ const Dashboard = ({
        <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
            <div className="page-title__protection">
                <button
-                        type="button"
-                        className={buttonClass}
-                        onClick={() => {
-                            toggleProtection(protectionEnabled);
-                        }}
-                        disabled={processingProtection}
+                    type="button"
+                    className={buttonClass}
+                    onClick={() => {
+                        toggleProtection(protectionEnabled);
+                    }}
+                    disabled={processingProtection}
                >
                    {protectionDisabledDuration
                        ? `${t('enable_protection_timer')} ${getRemaningTimeText(protectionDisabledDuration)}`
@@ -160,9 +164,9 @@ const Dashboard = ({
                </Dropdown>}
            </div>
            <button
-                    type="button"
-                    className="btn btn-outline-primary btn-sm"
-                    onClick={getAllStats}
+                type="button"
+                className="btn btn-outline-primary btn-sm"
+                onClick={getAllStats}
            >
                <Trans>refresh_statics</Trans>
            </button>
@@ -185,53 +189,67 @@ const Dashboard = ({
                    </div>
                )}
                <Statistics
-                        interval={msToDays(stats.interval)}
-                        dnsQueries={stats.dnsQueries}
-                        blockedFiltering={stats.blockedFiltering}
-                        replacedSafebrowsing={stats.replacedSafebrowsing}
-                        replacedParental={stats.replacedParental}
-                        numDnsQueries={stats.numDnsQueries}
-                        numBlockedFiltering={stats.numBlockedFiltering}
-                        numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
-                        numReplacedParental={stats.numReplacedParental}
-                        refreshButton={refreshButton}
+                    interval={msToDays(stats.interval)}
+                    dnsQueries={stats.dnsQueries}
+                    blockedFiltering={stats.blockedFiltering}
+                    replacedSafebrowsing={stats.replacedSafebrowsing}
+                    replacedParental={stats.replacedParental}
+                    numDnsQueries={stats.numDnsQueries}
+                    numBlockedFiltering={stats.numBlockedFiltering}
+                    numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
+                    numReplacedParental={stats.numReplacedParental}
+                    refreshButton={refreshButton}
                />
            </div>
            <div className="col-lg-6">
                <Counters
-                        subtitle={subtitle}
-                        refreshButton={refreshButton}
+                    subtitle={subtitle}
+                    refreshButton={refreshButton}
                />
            </div>
            <div className="col-lg-6">
                <Clients
-                        subtitle={subtitle}
-                        dnsQueries={stats.numDnsQueries}
-                        topClients={stats.topClients}
-                        clients={dashboard.clients}
-                        autoClients={dashboard.autoClients}
-                        refreshButton={refreshButton}
-                        processingAccessSet={access.processingSet}
-                        disallowedClients={access.disallowed_clients}
+                    subtitle={subtitle}
+                    dnsQueries={stats.numDnsQueries}
+                    topClients={stats.topClients}
+                    clients={dashboard.clients}
+                    autoClients={dashboard.autoClients}
+                    refreshButton={refreshButton}
+                    processingAccessSet={access.processingSet}
+                    disallowedClients={access.disallowed_clients}
                />
            </div>
            <div className="col-lg-6">
                <QueriedDomains
-                        subtitle={subtitle}
-                        dnsQueries={stats.numDnsQueries}
-                        topQueriedDomains={stats.topQueriedDomains}
-                        refreshButton={refreshButton}
+                    subtitle={subtitle}
+                    dnsQueries={stats.numDnsQueries}
+                    topQueriedDomains={stats.topQueriedDomains}
+                    refreshButton={refreshButton}
                />
            </div>
            <div className="col-lg-6">
                <BlockedDomains
-                        subtitle={subtitle}
-                        topBlockedDomains={stats.topBlockedDomains}
-                        blockedFiltering={stats.numBlockedFiltering}
-                        replacedSafebrowsing={stats.numReplacedSafebrowsing}
-                        replacedSafesearch={stats.numReplacedSafesearch}
-                        replacedParental={stats.numReplacedParental}
-                        refreshButton={refreshButton}
+                    subtitle={subtitle}
+                    topBlockedDomains={stats.topBlockedDomains}
+                    blockedFiltering={stats.numBlockedFiltering}
+                    replacedSafebrowsing={stats.numReplacedSafebrowsing}
+                    replacedSafesearch={stats.numReplacedSafesearch}
+                    replacedParental={stats.numReplacedParental}
+                    refreshButton={refreshButton}
+                />
+            </div>
+            <div className="col-lg-6">
+                <UpstreamResponses
+                    subtitle={subtitle}
+                    topUpstreamsResponses={stats.topUpstreamsResponses}
+                    refreshButton={refreshButton}
+                />
+            </div>
+            <div className="col-lg-6">
+                <UpstreamAvgTime
+                    subtitle={subtitle}
+                    topUpstreamsAvgTime={stats.topUpstreamsAvgTime}
+                    refreshButton={refreshButton}
                />
            </div>
        </div>}
--- a/client/src/components/Filters/Form.js
+++ b/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="nav-icon nav-icon--gray">
+    <svg className="icon icon--15 mr-1 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--medium">
+        <div className="modal-body modal-body--filters">
            {modalType === MODAL_TYPE.SELECT_MODAL_TYPE
            && <div className="d-flex justify-content-around">
                <button onClick={openFilteringListModal}
@@ -134,7 +134,6 @@ const Form = (props) => {
                        component={renderInputField}
                        className="form-control"
                        placeholder={t('enter_name_hint')}
-                        validate={[validateRequiredValue]}
                        normalizeOnBlur={(data) => data.trim()}
                    />
                </div>
--- a/client/src/components/Filters/Rewrites/Form.js
+++ b/client/src/components/Filters/Rewrites/Form.js
@@ -105,6 +105,7 @@ Form.propTypes = {
    submitting: PropTypes.bool.isRequired,
    processingAdd: PropTypes.bool.isRequired,
    t: PropTypes.func.isRequired,
+    initialValues: PropTypes.object,
 };

 export default flow([
--- a/client/src/components/Filters/Rewrites/Modal.js
+++ b/client/src/components/Filters/Rewrites/Modal.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
 import ReactModal from 'react-modal';

+import { MODAL_TYPE } from '../../../helpers/constants';
 import Form from './Form';

 const Modal = (props) => {
@@ -12,6 +13,8 @@ const Modal = (props) => {
        toggleRewritesModal,
        processingAdd,
        processingDelete,
+        modalType,
+        currentRewrite,
    } = props;

    return (
@@ -24,13 +27,18 @@ const Modal = (props) => {
            <div className="modal-content">
                <div className="modal-header">
                    <h4 className="modal-title">
-                        <Trans>rewrite_add</Trans>
+                        {modalType === MODAL_TYPE.EDIT_REWRITE ? (
+                            <Trans>rewrite_edit</Trans>
+                        ) : (
+                            <Trans>rewrite_add</Trans>
+                        )}
                    </h4>
                    <button type="button" className="close" onClick={() => toggleRewritesModal()}>
                        <span className="sr-only">Close</span>
                    </button>
                </div>
                <Form
+                    initialValues={{ ...currentRewrite }}
                    onSubmit={handleSubmit}
                    toggleRewritesModal={toggleRewritesModal}
                    processingAdd={processingAdd}
@@ -47,6 +55,8 @@ Modal.propTypes = {
    toggleRewritesModal: PropTypes.func.isRequired,
    processingAdd: PropTypes.bool.isRequired,
    processingDelete: PropTypes.bool.isRequired,
+    modalType: PropTypes.string.isRequired,
+    currentRewrite: PropTypes.object,
 };

 export default withTranslation()(Modal);
--- a/client/src/components/Filters/Rewrites/Table.js
+++ b/client/src/components/Filters/Rewrites/Table.js
@@ -3,6 +3,8 @@ 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';

 class Table extends Component {
    cellWrap = ({ value }) => (
@@ -31,24 +33,44 @@ class Table extends Component {
            maxWidth: 100,
            sortable: false,
            resizable: false,
-            Cell: (value) => (
-                <div className="logs__row logs__row--center">
-                    <button
-                        type="button"
-                        className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
-                        onClick={() => this.props.handleDelete({
-                            answer: value.row.answer,
-                            domain: value.row.domain,
-                        })
-                        }
-                        title={this.props.t('delete_table_action')}
-                    >
-                        <svg className="icons">
-                            <use xlinkHref="#delete" />
-                        </svg>
-                    </button>
-                </div>
-            ),
+            Cell: (value) => {
+                const currentRewrite = {
+                    answer: value.row.answer,
+                    domain: value.row.domain,
+                };
+
+                return (
+                    <div className="logs__row logs__row--center">
+                        <button
+                            type="button"
+                            className="btn btn-icon btn-outline-primary btn-sm mr-2"
+                            onClick={() => {
+                                this.props.toggleRewritesModal({
+                                    type: MODAL_TYPE.EDIT_REWRITE,
+                                    currentRewrite,
+                                });
+                            }}
+                            disabled={this.props.processingUpdate}
+                            title={this.props.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={() => this.props.handleDelete(currentRewrite)}
+                            title={this.props.t('delete_table_action')}
+                        >
+                            <svg className="icons">
+                                <use xlinkHref="#delete" />
+                            </svg>
+                        </button>
+                    </div>
+                );
+            },
        },
    ];

@@ -64,8 +86,9 @@ class Table extends Component {
                loading={processing || processingAdd || processingDelete}
                className="-striped -highlight card-table-overflow"
                showPagination
-                defaultPageSize={10}
-                minRows={5}
+                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}
                ofText="/"
                previousText={t('previous_btn')}
                nextText={t('next_btn')}
@@ -84,7 +107,9 @@ Table.propTypes = {
    processing: PropTypes.bool.isRequired,
    processingAdd: PropTypes.bool.isRequired,
    processingDelete: PropTypes.bool.isRequired,
+    processingUpdate: PropTypes.bool.isRequired,
    handleDelete: PropTypes.func.isRequired,
+    toggleRewritesModal: PropTypes.func.isRequired,
 };

 export default withTranslation()(Table);
--- a/client/src/components/Filters/Rewrites/index.js
+++ b/client/src/components/Filters/Rewrites/index.js
@@ -6,16 +6,13 @@ import Table from './Table';
 import Modal from './Modal';
 import Card from '../../ui/Card';
 import PageTitle from '../../ui/PageTitle';
+import { MODAL_TYPE } from '../../../helpers/constants';

 class Rewrites extends Component {
    componentDidMount() {
        this.props.getRewritesList();
    }

-    handleSubmit = (values) => {
-        this.props.addRewrite(values);
-    };
-
    handleDelete = (values) => {
        // eslint-disable-next-line no-alert
        if (window.confirm(this.props.t('rewrite_confirm_delete', { key: values.domain }))) {
@@ -23,6 +20,19 @@ class Rewrites extends Component {
        }
    };

+    handleSubmit = (values) => {
+        const { modalType, currentRewrite } = this.props.rewrites;
+
+        if (modalType === MODAL_TYPE.EDIT_REWRITE && currentRewrite) {
+            this.props.updateRewrite({
+                target: currentRewrite,
+                update: values,
+            });
+        } else {
+            this.props.addRewrite(values);
+        }
+    };
+
    render() {
        const {
            t,
@@ -36,6 +46,9 @@ class Rewrites extends Component {
            processing,
            processingAdd,
            processingDelete,
+            processingUpdate,
+            modalType,
+            currentRewrite,
        } = rewrites;

        return (
@@ -54,13 +67,15 @@ class Rewrites extends Component {
                            processing={processing}
                            processingAdd={processingAdd}
                            processingDelete={processingDelete}
+                            processingUpdate={processingUpdate}
                            handleDelete={this.handleDelete}
+                            toggleRewritesModal={toggleRewritesModal}
                        />

                        <button
                            type="button"
                            className="btn btn-success btn-standard mt-3"
-                            onClick={() => toggleRewritesModal()}
+                            onClick={() => toggleRewritesModal({ type: MODAL_TYPE.ADD_REWRITE })}
                            disabled={processingAdd}
                        >
                            <Trans>rewrite_add</Trans>
@@ -68,10 +83,13 @@ class Rewrites extends Component {

                        <Modal
                            isModalOpen={isModalOpen}
+                            modalType={modalType}
                            toggleRewritesModal={toggleRewritesModal}
                            handleSubmit={this.handleSubmit}
                            processingAdd={processingAdd}
                            processingDelete={processingDelete}
+                            processingUpdate={processingUpdate}
+                            currentRewrite={currentRewrite}
                        />
                    </Fragment>
                </Card>
@@ -86,6 +104,7 @@ Rewrites.propTypes = {
    toggleRewritesModal: PropTypes.func.isRequired,
    addRewrite: PropTypes.func.isRequired,
    deleteRewrite: PropTypes.func.isRequired,
+    updateRewrite: PropTypes.func.isRequired,
    rewrites: PropTypes.object.isRequired,
 };

--- a/client/src/components/Filters/Services/ScheduleForm/Modal.js
+++ b/client/src/components/Filters/Services/ScheduleForm/Modal.js
@@ -0,0 +1,209 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import ReactModal from 'react-modal';
+
+import { Timezone } from './Timezone';
+import { TimeSelect } from './TimeSelect';
+import { TimePeriod } from './TimePeriod';
+import { getFullDayName, getShortDayName } from './helpers';
+import { LOCAL_TIMEZONE_VALUE } from '../../../../helpers/constants';
+
+export const DAYS_OF_WEEK = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
+
+const INITIAL_START_TIME_MS = 0;
+const INITIAL_END_TIME_MS = 86340000;
+
+export const Modal = ({
+    isOpen,
+    currentDay,
+    schedule,
+    onClose,
+    onSubmit,
+}) => {
+    const [t] = useTranslation();
+
+    const intialTimezone = schedule.time_zone === LOCAL_TIMEZONE_VALUE
+        ? Intl.DateTimeFormat().resolvedOptions().timeZone
+        : schedule.time_zone;
+
+    const [timezone, setTimezone] = useState(intialTimezone);
+    const [days, setDays] = useState(new Set());
+
+    const [startTime, setStartTime] = useState(INITIAL_START_TIME_MS);
+    const [endTime, setEndTime] = useState(INITIAL_END_TIME_MS);
+
+    const [wrongPeriod, setWrongPeriod] = useState(true);
+
+    useEffect(() => {
+        if (currentDay) {
+            const newDays = new Set([currentDay]);
+            setDays(newDays);
+
+            setStartTime(schedule[currentDay].start);
+            setEndTime(schedule[currentDay].end);
+        }
+    }, [currentDay]);
+
+    useEffect(() => {
+        if (startTime >= endTime) {
+            setWrongPeriod(true);
+        } else {
+            setWrongPeriod(false);
+        }
+    }, [startTime, endTime]);
+
+    const addDays = (day) => {
+        const newDays = new Set(days);
+
+        if (newDays.has(day)) {
+            newDays.delete(day);
+        } else {
+            newDays.add(day);
+        }
+
+        setDays(newDays);
+    };
+
+    const activeDay = (day) => {
+        return days.has(day);
+    };
+
+    const onFormSubmit = (e) => {
+        e.preventDefault();
+
+        const newSchedule = schedule;
+
+        Array.from(days).forEach((day) => {
+            newSchedule[day] = {
+                start: startTime,
+                end: endTime,
+            };
+        });
+
+        if (timezone !== intialTimezone) {
+            newSchedule.time_zone = timezone;
+        }
+
+        onSubmit(newSchedule);
+    };
+
+    return (
+        <ReactModal
+            className="Modal__Bootstrap modal-dialog modal-dialog-centered modal-dialog--schedule"
+            closeTimeoutMS={0}
+            isOpen={isOpen}
+            onRequestClose={onClose}
+        >
+            <div className="modal-content">
+                <div className="modal-header">
+                    <h4 className="modal-title">
+                        {currentDay ? t('schedule_edit') : t('schedule_new')}
+                    </h4>
+                    <button type="button" className="close" onClick={onClose}>
+                        <span className="sr-only">Close</span>
+                    </button>
+                </div>
+                <form onSubmit={onFormSubmit}>
+                    <div className="modal-body">
+                        <Timezone
+                            timezone={timezone}
+                            setTimezone={setTimezone}
+                        />
+
+                        <div className="schedule__days">
+                            {DAYS_OF_WEEK.map((day) => (
+                                <button
+                                    type="button"
+                                    key={day}
+                                    className="btn schedule__button-day"
+                                    data-active={activeDay(day)}
+                                    onClick={() => addDays(day)}
+                                >
+                                    {getShortDayName(t, day)}
+                                </button>
+                            ))}
+                        </div>
+
+                        <div className="schedule__time-wrap">
+                            <div className="schedule__time-row">
+                                <TimeSelect
+                                    value={startTime}
+                                    onChange={(v) => setStartTime(v)}
+                                />
+
+                                <TimeSelect
+                                    value={endTime}
+                                    onChange={(v) => setEndTime(v)}
+                                />
+                            </div>
+
+                            {wrongPeriod && (
+                                <div className="schedule__error">
+                                    {t('schedule_invalid_select')}
+                                </div>
+                            )}
+                        </div>
+
+                        <div className="schedule__info">
+                            <div className="schedule__info-title">
+                                {t('schedule_modal_time_off')}
+                            </div>
+                            <div className="schedule__info-row">
+                                <svg className="icons schedule__info-icon">
+                                    <use xlinkHref="#calendar" />
+                                </svg>
+                                {days.size ? (
+                                    Array.from(days).map((day) => getFullDayName(t, day)).join(', ')
+                                ) : (
+                                    <span>
+                                        —
+                                    </span>
+                                )}
+                            </div>
+                            <div className="schedule__info-row">
+                                <svg className="icons schedule__info-icon">
+                                    <use xlinkHref="#watch" />
+                                </svg>
+                                {wrongPeriod ? (
+                                    <span>
+                                        —
+                                    </span>
+                                ) : (
+                                    <TimePeriod
+                                        startTimeMs={startTime}
+                                        endTimeMs={endTime}
+                                    />
+                                )}
+                            </div>
+                        </div>
+
+                        <div className="schedule__notice">
+                            {t('schedule_modal_description')}
+                        </div>
+                    </div>
+                    <div className="modal-footer">
+                        <div className="btn-list">
+                            <button
+                                type="button"
+                                className="btn btn-success btn-standard"
+                                disabled={days.size === 0 || wrongPeriod}
+                                onClick={onFormSubmit}
+                            >
+                                {currentDay ? t('schedule_save') : t('schedule_add')}
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </ReactModal>
+    );
+};
+
+Modal.propTypes = {
+    schedule: PropTypes.object.isRequired,
+    currentDay: PropTypes.string,
+    isOpen: PropTypes.bool.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+};
--- a/client/src/components/Filters/Services/ScheduleForm/TimePeriod.js
+++ b/client/src/components/Filters/Services/ScheduleForm/TimePeriod.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { getTimeFromMs } from './helpers';
+
+export const TimePeriod = ({
+    startTimeMs,
+    endTimeMs,
+}) => {
+    const startTime = getTimeFromMs(startTimeMs);
+    const endTime = getTimeFromMs(endTimeMs);
+
+    return (
+        <div className="schedule__time">
+            <time>{startTime.hours}:{startTime.minutes}</time>
+            &nbsp;–&nbsp;
+            <time>{endTime.hours}:{endTime.minutes}</time>
+        </div>
+    );
+};
+
+TimePeriod.propTypes = {
+    startTimeMs: PropTypes.number.isRequired,
+    endTimeMs: PropTypes.number.isRequired,
+};
--- a/client/src/components/Filters/Services/ScheduleForm/TimeSelect.js
+++ b/client/src/components/Filters/Services/ScheduleForm/TimeSelect.js
@@ -0,0 +1,60 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+
+import { getTimeFromMs, convertTimeToMs } from './helpers';
+
+export const TimeSelect = ({
+    value,
+    onChange,
+}) => {
+    const { hours: initialHours, minutes: initialMinutes } = getTimeFromMs(value);
+
+    const [hours, setHours] = useState(initialHours);
+    const [minutes, setMinutes] = useState(initialMinutes);
+
+    const hourOptions = Array.from({ length: 24 }, (_, i) => i.toString().padStart(2, '0'));
+    const minuteOptions = Array.from({ length: 60 }, (_, i) => i.toString().padStart(2, '0'));
+
+    const onHourChange = (event) => {
+        setHours(event.target.value);
+        onChange(convertTimeToMs(event.target.value, minutes));
+    };
+
+    const onMinuteChange = (event) => {
+        setMinutes(event.target.value);
+        onChange(convertTimeToMs(hours, event.target.value));
+    };
+
+    return (
+        <div className="schedule__time-select">
+            <select
+                value={hours}
+                onChange={onHourChange}
+                className="form-control custom-select"
+            >
+                {hourOptions.map((hour) => (
+                    <option key={hour} value={hour}>
+                        {hour}
+                    </option>
+                ))}
+            </select>
+            &nbsp;:&nbsp;
+            <select
+                value={minutes}
+                onChange={onMinuteChange}
+                className="form-control custom-select"
+            >
+                {minuteOptions.map((minute) => (
+                    <option key={minute} value={minute}>
+                        {minute}
+                    </option>
+                ))}
+            </select>
+        </div>
+    );
+};
+
+TimeSelect.propTypes = {
+    value: PropTypes.number.isRequired,
+    onChange: PropTypes.func.isRequired,
+};
--- a/client/src/components/Filters/Services/ScheduleForm/Timezone.js
+++ b/client/src/components/Filters/Services/ScheduleForm/Timezone.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import timezones from 'timezones-list';
+import { useTranslation } from 'react-i18next';
+import PropTypes from 'prop-types';
+
+import { LOCAL_TIMEZONE_VALUE } from '../../../../helpers/constants';
+
+export const Timezone = ({
+    timezone,
+    setTimezone,
+}) => {
+    const [t] = useTranslation();
+
+    const onTimeZoneChange = (event) => {
+        setTimezone(event.target.value);
+    };
+
+    return (
+        <div className="schedule__timezone">
+            <label className="form__label form__label--with-desc mb-2">
+                {t('schedule_timezone')}
+            </label>
+
+            <select
+                className="form-control custom-select"
+                value={timezone}
+                onChange={onTimeZoneChange}
+            >
+                <option value={LOCAL_TIMEZONE_VALUE}>
+                    {t('schedule_timezone')}
+                </option>
+                {/* TODO: get timezones from backend method when the method is ready */}
+                {timezones.map((zone) => (
+                    <option key={zone.name} value={zone.tzCode}>
+                        {zone.label}
+                    </option>
+                ))}
+            </select>
+        </div>
+    );
+};
+
+Timezone.propTypes = {
+    timezone: PropTypes.string.isRequired,
+    setTimezone: PropTypes.func.isRequired,
+};
--- a/client/src/components/Filters/Services/ScheduleForm/helpers.js
+++ b/client/src/components/Filters/Services/ScheduleForm/helpers.js
@@ -0,0 +1,46 @@
+export const getFullDayName = (t, abbreviation) => {
+    const dayMap = {
+        sun: t('sunday'),
+        mon: t('monday'),
+        tue: t('tuesday'),
+        wed: t('wednesday'),
+        thu: t('thursday'),
+        fri: t('friday'),
+        sat: t('saturday'),
+    };
+
+    return dayMap[abbreviation] || '';
+};
+
+export const getShortDayName = (t, abbreviation) => {
+    const dayMap = {
+        sun: t('sunday_short'),
+        mon: t('monday_short'),
+        tue: t('tuesday_short'),
+        wed: t('wednesday_short'),
+        thu: t('thursday_short'),
+        fri: t('friday_short'),
+        sat: t('saturday_short'),
+    };
+
+    return dayMap[abbreviation] || '';
+};
+
+export const getTimeFromMs = (value) => {
+    const selectedTime = new Date(value);
+    const hours = selectedTime.getUTCHours();
+    const minutes = selectedTime.getUTCMinutes();
+
+    return {
+        hours: hours.toString().padStart(2, '0'),
+        minutes: minutes.toString().padStart(2, '0'),
+    };
+};
+
+export const convertTimeToMs = (hours, minutes) => {
+    const selectedTime = new Date(0);
+    selectedTime.setUTCHours(parseInt(hours, 10));
+    selectedTime.setUTCMinutes(parseInt(minutes, 10));
+
+    return selectedTime.getTime();
+};
--- a/client/src/components/Filters/Services/ScheduleForm/index.js
+++ b/client/src/components/Filters/Services/ScheduleForm/index.js
@@ -0,0 +1,140 @@
+import React, { useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import PropTypes from 'prop-types';
+import cn from 'classnames';
+
+import { Modal } from './Modal';
+import { getFullDayName, getShortDayName } from './helpers';
+import { LOCAL_TIMEZONE_VALUE } from '../../../../helpers/constants';
+import { TimePeriod } from './TimePeriod';
+import './styles.css';
+
+export const ScheduleForm = ({
+    schedule,
+    onScheduleSubmit,
+    clientForm,
+}) => {
+    const [t] = useTranslation();
+    const [modalOpen, setModalOpen] = useState(false);
+    const [currentDay, setCurrentDay] = useState();
+
+    const onModalOpen = () => setModalOpen(true);
+    const onModalClose = () => setModalOpen(false);
+
+    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]));
+
+    const onSubmit = (values) => {
+        onScheduleSubmit(values);
+        onModalClose();
+    };
+
+    const onDelete = (day) => {
+        scheduleMap.delete(day);
+
+        const scheduleWeek = Object.fromEntries(Array.from(scheduleMap.entries()));
+
+        onScheduleSubmit({
+            time_zone: schedule.time_zone,
+            ...scheduleWeek,
+        });
+    };
+
+    const onEdit = (day) => {
+        setCurrentDay(day);
+        onModalOpen();
+    };
+
+    const onAdd = () => {
+        setCurrentDay(undefined);
+        onModalOpen();
+    };
+
+    return (
+        <div>
+            <div className="schedule__current-timezone">
+                {t('schedule_current_timezone', { value: schedule?.time_zone || LOCAL_TIMEZONE_VALUE })}
+            </div>
+
+            <div className="schedule__rows">
+                {filteredScheduleKeys.map((day) => {
+                    const data = schedule[day];
+
+                    if (!data) {
+                        return undefined;
+                    }
+
+                    return (
+                        <div key={day} className="schedule__row">
+                            <div className="schedule__day">
+                                {getFullDayName(t, day)}
+                            </div>
+                            <div className="schedule__day schedule__day--mobile">
+                                {getShortDayName(t, day)}
+                            </div>
+                            <TimePeriod
+                                startTimeMs={data.start}
+                                endTimeMs={data.end}
+                            />
+                            <div className="schedule__actions">
+                                <button
+                                    type="button"
+                                    className="btn btn-icon btn-outline-primary btn-sm schedule__button"
+                                    title={t('edit_table_action')}
+                                    onClick={() => onEdit(day)}
+                                >
+                                    <svg className="icons icon12">
+                                        <use xlinkHref="#edit" />
+                                    </svg>
+                                </button>
+
+                                <button
+                                    type="button"
+                                    className="btn btn-icon btn-outline-secondary btn-sm schedule__button"
+                                    title={t('delete_table_action')}
+                                    onClick={() => onDelete(day)}
+                                >
+                                    <svg className="icons">
+                                        <use xlinkHref="#delete" />
+                                    </svg>
+                                </button>
+                            </div>
+                        </div>
+                    );
+                })}
+            </div>
+
+            <button
+                type="button"
+                className={cn(
+                    'btn',
+                    { 'btn-outline-success btn-sm': clientForm },
+                    { 'btn-success btn-standard': !clientForm },
+                )}
+                onClick={onAdd}
+            >
+                {t('schedule_new')}
+            </button>
+
+            {modalOpen && (
+                <Modal
+                    isOpen={modalOpen}
+                    onClose={onModalClose}
+                    onSubmit={onSubmit}
+                    schedule={schedule}
+                    currentDay={currentDay}
+                />
+            )}
+        </div>
+    );
+};
+
+ScheduleForm.propTypes = {
+    schedule: PropTypes.object,
+    onScheduleSubmit: PropTypes.func.isRequired,
+    clientForm: PropTypes.bool,
+};
--- a/client/src/components/Filters/Services/ScheduleForm/styles.css
+++ b/client/src/components/Filters/Services/ScheduleForm/styles.css
@@ -0,0 +1,134 @@
+.schedule__row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 8px;
+}
+
+.schedule__row:last-child {
+    margin-bottom: 0;
+}
+
+.schedule__rows {
+    margin-bottom: 24px;
+}
+
+.schedule__day {
+    display: none;
+    min-width: 110px;
+}
+
+.schedule__day--mobile {
+    display: block;
+    min-width: 50px;
+}
+
+@media screen and (min-width: 767px) {
+    .schedule__row {
+        justify-content: flex-start;
+    }
+
+    .schedule__day {
+        display: block;
+    }
+
+    .schedule__day--mobile {
+        display: none;
+    }
+
+    .schedule__actions {
+        margin-left: 32px;
+        white-space: nowrap;
+    }
+}
+
+.schedule__time {
+    min-width: 110px;
+}
+
+.schedule__button {
+    border: 0;
+}
+
+.schedule__days {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-bottom: 24px;
+}
+
+.schedule__button-day {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-width: 60px;
+    height: 32px;
+    font-size: 14px;
+    line-height: 14px;
+    color: #495057;
+    background-color: transparent;
+    border: 1px solid var(--card-border-color);
+    border-radius: 4px;
+    cursor: pointer;
+    outline: 0;
+}
+
+.schedule__button-day[data-active="true"] {
+    color: var(--btn-success-bgcolor);
+    border-color: var(--btn-success-bgcolor);
+}
+
+.schedule__time-wrap {
+    margin-bottom: 24px;
+}
+
+.schedule__time-row {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+}
+
+.schedule__time-select {
+    display: flex;
+    align-items: center;
+}
+
+.schedule__error {
+    margin-top: 4px;
+    font-size: 13px;
+    color: #cd201f;
+}
+
+.schedule__timezone {
+    margin-bottom: 24px;
+}
+
+.schedule__current-timezone {
+    margin-bottom: 16px;
+}
+
+.schedule__info {
+    margin-bottom: 24px;
+}
+
+.schedule__notice {
+    font-size: 13px;
+}
+
+.schedule__info-title {
+    margin-bottom: 8px;
+}
+
+.schedule__info-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 4px;
+}
+
+.schedule__info-icon {
+    width: 24px;
+    height: 24px;
+    margin-right: 8px;
+    color: #495057;
+    flex-shrink: 0;
+}
--- a/client/src/components/Filters/Services/index.js
+++ b/client/src/components/Filters/Services/index.js
@@ -4,9 +4,11 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import Form from './Form';
 import Card from '../../ui/Card';
-import { getBlockedServices, getAllBlockedServices, setBlockedServices } from '../../../actions/services';
+import { getBlockedServices, getAllBlockedServices, updateBlockedServices } from '../../../actions/services';
 import PageTitle from '../../ui/PageTitle';

+import { ScheduleForm } from './ScheduleForm';
+
 const getInitialDataForServices = (initial) => (initial ? initial.reduce(
    (acc, service) => {
        acc.blocked_services[service] = true;
@@ -33,10 +35,24 @@ const Services = () => {
            .keys(values.blocked_services)
            .filter((service) => values.blocked_services[service]);

-        dispatch(setBlockedServices(blocked_services));
+        dispatch(updateBlockedServices({
+            ids: blocked_services,
+            schedule: services.list.schedule,
+        }));
    };

-    const initialValues = getInitialDataForServices(services.list);
+    const handleScheduleSubmit = (values) => {
+        dispatch(updateBlockedServices({
+            ids: services.list.ids,
+            schedule: values,
+        }));
+    };
+
+    const initialValues = getInitialDataForServices(services.list.ids);
+
+    if (!initialValues) {
+        return null;
+    }

    return (
        <>
@@ -57,6 +73,17 @@ const Services = () => {
                    />
                </div>
            </Card>
+
+            <Card
+                title={t('schedule_services')}
+                subtitle={t('schedule_services_desc')}
+                bodyType="card-body box-body--settings"
+            >
+                <ScheduleForm
+                    schedule={services.list.schedule}
+                    onScheduleSubmit={handleScheduleSubmit}
+                />
+            </Card>
        </>
    );
 };
--- a/client/src/components/Filters/Table.js
+++ b/client/src/components/Filters/Table.js
@@ -6,6 +6,7 @@ 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);
@@ -48,6 +49,7 @@ class Table extends Component {
            Header: <Trans>list_url_table_header</Trans>,
            accessor: 'url',
            minWidth: 180,
+            // eslint-disable-next-line react/prop-types
            Cell: ({ value }) => (
                <div className="logs__row">
                    {isValidAbsolutePath(value) ? value
@@ -125,12 +127,17 @@ 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={10}
+                defaultPageSize={LocalStorageHelper.getItem(localStorageKey) || 10}
+                onPageSizeChange={(size) => LocalStorageHelper.setItem(localStorageKey, size)}
                loading={loading}
                minRows={6}
                ofText="/"
--- a/client/src/components/Logs/Cells/ClientCell.js
+++ b/client/src/components/Logs/Cells/ClientCell.js
@@ -26,9 +26,7 @@ const ClientCell = ({
    const { t } = useTranslation();
    const dispatch = useDispatch();
    const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
-    const processingRules = useSelector((state) => state.filtering.processingRules);
    const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
-    const processingSet = useSelector((state) => state.access.processingSet);
    const allowedСlients = useSelector((state) => state.access.allowed_clients, shallowEqual);
    const [isOptionsOpened, setOptionsOpened] = useState(false);

@@ -84,11 +82,23 @@ 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);
                },
            },
            {
@@ -101,27 +111,25 @@ const ClientCell = ({
                            client_info?.disallowed_rule || '',
                        ));
                        await dispatch(updateLogs());
+                        setOptionsOpened(false);
                    }
                },
-                disabled: processingSet || lastRuleInAllowlist,
+                disabled: lastRuleInAllowlist,
            },
        ];

-        const onClick = async () => {
-            await dispatch(toggleBlocking(buttonType, domain));
-            await dispatch(getStats());
-        };
-
        const getOptions = (options) => {
            if (options.length === 0) {
                return null;
            }
            return (
                <>
-                    {options.map(({ name, onClick, disabled }) => (
+                    {options.map(({
+                        name, onClick, disabled, className,
+                    }) => (
                        <button
                            key={name}
-                            className="button-action--arrow-option px-4 py-1"
+                            className={classNames('button-action--arrow-option px-4 py-1', className)}
                            onClick={onClick}
                            disabled={disabled}
                        >
@@ -134,17 +142,6 @@ 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,
        });
@@ -153,25 +150,26 @@ const ClientCell = ({
            <div className={containerClass}>
                <button
                    type="button"
-                    className={buttonClass}
-                    onClick={onClick}
-                    disabled={processingRules}
+                    className="btn btn-icon btn-sm px-0"
+                    onClick={() => setOptionsOpened(true)}
                >
-                    {t(buttonType)}
+                    <svg className="icon24 icon--lightgray button-action__icon">
+                        <use xlinkHref="#bullets" />
+                    </svg>
                </button>
-                {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>
+                {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}
+                    />
                )}
            </div>
        );
@@ -198,7 +196,7 @@ const ClientCell = ({
                </div>
                {isDetailed && clientName && !whoisAvailable && (
                    <Link
-                        className="detailed-info d-none d-sm-block logs__text logs__text--link"
+                        className="detailed-info d-none d-sm-block logs__text logs__text--link logs__text--client"
                        to={`logs?search="${encodeURIComponent(clientName)}"`}
                        title={clientName}
                    >
--- a/client/src/components/Logs/Cells/IconTooltip.css
+++ b/client/src/components/Logs/Cells/IconTooltip.css
@@ -1,4 +1,5 @@
 .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);
--- a/client/src/components/Logs/Cells/IconTooltip.js
+++ b/client/src/components/Logs/Cells/IconTooltip.js
@@ -21,6 +21,8 @@ const IconTooltip = ({
    content,
    trigger,
    onVisibilityChange,
+    defaultTooltipShown,
+    delayHide,
    renderContent = content ? React.Children.map(
        processContent(content),
        (item, idx) => <div key={idx} className={contentItemClass}>
@@ -44,6 +46,8 @@ const IconTooltip = ({
        trigger={trigger}
        onVisibilityChange={onVisibilityChange}
        delayShow={trigger === 'click' ? 0 : SHOW_TOOLTIP_DELAY}
+        delayHide={delayHide}
+        defaultTooltipShown={defaultTooltipShown}
    >
        {xlinkHref && <svg className={className}>
            <use xlinkHref={`#${xlinkHref}`} />
@@ -65,6 +69,8 @@ IconTooltip.propTypes = {
    content: PropTypes.node,
    renderContent: PropTypes.arrayOf(PropTypes.element),
    onVisibilityChange: PropTypes.func,
+    defaultTooltipShown: PropTypes.bool,
+    delayHide: PropTypes.number,
 };

 export default IconTooltip;
--- a/client/src/components/Logs/Logs.css
+++ b/client/src/components/Logs/Logs.css
@@ -74,6 +74,16 @@
    color: #295a9f;
 }

+[data-theme="dark"] .logs__text--link,
+[data-theme="dark"] .logs__text--link:hover,
+[data-theme="dark"] .logs__text--link:focus {
+    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);
@@ -255,9 +265,8 @@
 .button-action__container {
    display: flex;
    position: absolute;
-    right: 0;
+    right: 2px;
    bottom: 0.5rem;
-    height: 1.6rem;
 }

@media screen and (max-width: 1024px) {
@@ -301,45 +310,10 @@
    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;
@@ -545,3 +519,20 @@
    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);
+}
--- a/client/src/components/ProtectionTimer/index.js
+++ b/client/src/components/ProtectionTimer/index.js
@@ -32,6 +32,8 @@ const ProtectionTimer = ({
 };

 ProtectionTimer.propTypes = {
+    protectionDisabledDuration: PropTypes.number,
+    toggleProtectionSuccess: PropTypes.func.isRequired,
    setProtectionTimerTime: PropTypes.func.isRequired,
 };

--- a/client/src/components/Settings/Clients/AutoClients.js
+++ b/client/src/components/Settings/Clients/AutoClients.js
@@ -9,6 +9,8 @@ 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;

@@ -85,8 +87,11 @@ class AutoClients extends Component {
                    ]}
                    className="-striped -highlight card-table-overflow"
                    showPagination
-                    defaultPageSize={10}
-                    minRows={5}
+                    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}
                    ofText="/"
                    previousText={t('previous_btn')}
                    nextText={t('next_btn')}
--- a/client/src/components/Settings/Clients/ClientsTable/ClientsTable.js
+++ b/client/src/components/Settings/Clients/ClientsTable/ClientsTable.js
@@ -6,7 +6,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import ReactTable from 'react-table';

-import { getAllBlockedServices } from '../../../../actions/services';
+import { getAllBlockedServices, getBlockedServices } from '../../../../actions/services';
 import { initSettings } from '../../../../actions';
 import {
    splitByNewLine,
@@ -14,11 +14,12 @@ import {
    sortIp,
    getService,
 } from '../../../../helpers/helpers';
-import { MODAL_TYPE } from '../../../../helpers/constants';
+import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE, TABLES_MIN_ROWS } 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,
@@ -45,6 +46,7 @@ const ClientsTable = ({

    useEffect(() => {
        dispatch(getAllBlockedServices());
+        dispatch(getBlockedServices());
        dispatch(initSettings());
    }, []);

@@ -57,7 +59,7 @@ const ClientsTable = ({
    };

    const handleSubmit = (values) => {
-        const config = values;
+        const config = { ...values };

        if (values) {
            if (values.blocked_services) {
@@ -77,6 +79,10 @@ const ClientsTable = ({
            } else {
                config.tags = [];
            }
+
+            if (typeof values.upstreams_cache_size === 'string') {
+                config.upstreams_cache_size = 0;
+            }
        }

        if (modalType === MODAL_TYPE.EDIT_FILTERS) {
@@ -112,6 +118,9 @@ const ClientsTable = ({
            tags: [],
            use_global_settings: true,
            use_global_blocked_services: true,
+            blocked_services_schedule: {
+                time_zone: LOCAL_TIMEZONE_VALUE,
+            },
            safe_search: { ...(safesearch || {}) },
        };
    };
@@ -338,8 +347,11 @@ const ClientsTable = ({
                    ]}
                    className="-striped -highlight card-table-overflow"
                    showPagination
-                    defaultPageSize={10}
-                    minRows={5}
+                    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}
                    ofText="/"
                    previousText={t('previous_btn')}
                    nextText={t('next_btn')}
--- a/client/src/components/Settings/Clients/Form.js
+++ b/client/src/components/Settings/Clients/Form.js
@@ -11,8 +11,14 @@ import Select from 'react-select';
 import i18n from '../../../i18n';
 import Tabs from '../../ui/Tabs';
 import Examples from '../Dns/Upstream/Examples';
-import { toggleAllServices, trimLinesAndRemoveEmpty, captitalizeWords } from '../../../helpers/helpers';
+import { ScheduleForm } from '../../Filters/Services/ScheduleForm';
 import {
+    toggleAllServices,
+    trimLinesAndRemoveEmpty,
+    captitalizeWords,
+} from '../../../helpers/helpers';
+import {
+    toNumber,
    renderInputField,
    renderGroupField,
    CheckboxField,
@@ -20,7 +26,7 @@ import {
    renderTextareaField,
 } from '../../../helpers/form';
 import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
-import { CLIENT_ID_LINK, FORM_NAME } from '../../../helpers/constants';
+import { CLIENT_ID_LINK, FORM_NAME, UINT32_RANGE } from '../../../helpers/constants';
 import './Service.css';

 const settingsCheckboxes = [
@@ -41,6 +47,17 @@ const settingsCheckboxes = [
        placeholder: 'use_adguard_parental',
    },
 ];
+
+const logAndStatsCheckboxes = [
+    {
+        name: 'ignore_querylog',
+        placeholder: 'ignore_query_log',
+    },
+    {
+        name: 'ignore_statistics',
+        placeholder: 'ignore_statistics',
+    },
+];
 const validate = (values) => {
    const errors = {};
    const { name, ids } = values;
@@ -126,10 +143,10 @@ let Form = (props) => {
        handleSubmit,
        reset,
        change,
-        pristine,
        submitting,
        useGlobalSettings,
        useGlobalServices,
+        blockedServicesSchedule,
        toggleClientModal,
        processingAdding,
        processingUpdating,
@@ -144,10 +161,17 @@ let Form = (props) => {

    const [activeTabLabel, setActiveTabLabel] = useState('settings');

+    const handleScheduleSubmit = (values) => {
+        change('blocked_services_schedule', values);
+    };
+
    const tabs = {
        settings: {
            title: 'settings',
            component: <div label="settings" title={props.t('main_settings')}>
+                <div className="form__label--bot form__label--bold">
+                    {t('protection_section_label')}
+                </div>
                {settingsCheckboxes.map((setting) => (
                    <div className="form__group" key={setting.name}>
                        <Field
@@ -185,6 +209,19 @@ let Form = (props) => {
                        </div>
                    ))}
                </div>
+                <div className="form__label--bold form__label--top form__label--bot">
+                    {t('log_and_stats_section_label')}
+                </div>
+                {logAndStatsCheckboxes.map((setting) => (
+                    <div className="form__group" key={setting.name}>
+                        <Field
+                            name={setting.name}
+                            type="checkbox"
+                            component={CheckboxField}
+                            placeholder={t(setting.placeholder)}
+                        />
+                    </div>
+                ))}
            </div>,
        },
        block_services: {
@@ -242,6 +279,21 @@ let Form = (props) => {
                </div>
            </div>,
        },
+        schedule_services: {
+            title: 'schedule_services',
+            component: (
+                <>
+                    <div className="form__desc mb-4">
+                        <Trans>schedule_services_desc_client</Trans>
+                    </div>
+                    <ScheduleForm
+                        schedule={blockedServicesSchedule}
+                        onScheduleSubmit={handleScheduleSubmit}
+                        clientForm
+                    />
+                </>
+            ),
+        },
        upstream_dns: {
            title: 'upstream_dns',
            component: <div label="upstream" title={props.t('upstream_dns')}>
@@ -260,6 +312,35 @@ 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>,
        },
    };
@@ -328,8 +409,12 @@ let Form = (props) => {
                    </div>
                </div>

-                <Tabs controlClass="form" tabs={tabs} activeTabLabel={activeTabLabel}
-                      setActiveTabLabel={setActiveTabLabel}>
+                <Tabs
+                    controlClass="form"
+                    tabs={tabs}
+                    activeTabLabel={activeTabLabel}
+                    setActiveTabLabel={setActiveTabLabel}
+                >
                    {activeTab}
                </Tabs>
            </div>
@@ -353,7 +438,6 @@ let Form = (props) => {
                        disabled={
                            submitting
                            || invalid
-                            || pristine
                            || processingAdding
                            || processingUpdating
                        }
@@ -375,6 +459,7 @@ Form.propTypes = {
    toggleClientModal: PropTypes.func.isRequired,
    useGlobalSettings: PropTypes.bool,
    useGlobalServices: PropTypes.bool,
+    blockedServicesSchedule: PropTypes.object,
    t: PropTypes.func.isRequired,
    processingAdding: PropTypes.bool.isRequired,
    processingUpdating: PropTypes.bool.isRequired,
@@ -388,9 +473,11 @@ const selector = formValueSelector(FORM_NAME.CLIENT);
 Form = connect((state) => {
    const useGlobalSettings = selector(state, 'use_global_settings');
    const useGlobalServices = selector(state, 'use_global_blocked_services');
+    const blockedServicesSchedule = selector(state, 'blocked_services_schedule');
    return {
        useGlobalSettings,
        useGlobalServices,
+        blockedServicesSchedule,
    };
 })(Form);

--- a/client/src/components/Settings/Dhcp/Leases.js
+++ b/client/src/components/Settings/Dhcp/Leases.js
@@ -27,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-secondary btn-sm"
+                    className="btn btn-icon btn-icon--green btn-outline-success btn-sm"
                    title={t('make_static')}
                    onClick={this.convertToStatic(row)}
                    disabled={disabledLeasesButton}
--- a/client/src/components/Settings/Dhcp/StaticLeases/Form.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Form.js
@@ -22,6 +22,7 @@ const Form = ({
    submitting,
    processingAdding,
    cidr,
+    isEdit,
 }) => {
    const { t } = useTranslation();
    const dispatch = useDispatch();
@@ -45,6 +46,7 @@ const Form = ({
                        placeholder={t('form_enter_mac')}
                        normalize={normalizeMac}
                        validate={[validateRequiredValue, validateMac]}
+                        disabled={isEdit}
                    />
                </div>
                <div className="form__group">
@@ -112,6 +114,7 @@ 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);
--- a/client/src/components/Settings/Dhcp/StaticLeases/Modal.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Modal.js
@@ -5,9 +5,11 @@ 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,
@@ -32,7 +34,11 @@ const Modal = ({
            <div className="modal-content">
                <div className="modal-header">
                    <h4 className="modal-title">
-                        <Trans>dhcp_new_static_lease</Trans>
+                        {modalType === MODAL_TYPE.EDIT_LEASE ? (
+                            <Trans>dhcp_edit_static_lease</Trans>
+                        ) : (
+                            <Trans>dhcp_new_static_lease</Trans>
+                        )}
                    </h4>
                    <button type="button" className="close" onClick={toggleModal}>
                        <span className="sr-only">Close</span>
@@ -53,6 +59,7 @@ const Modal = ({
                    cidr={cidr}
                    rangeStart={rangeStart}
                    rangeEnd={rangeEnd}
+                    isEdit={modalType === MODAL_TYPE.EDIT_LEASE}
                />
            </div>
        </ReactModal>
@@ -61,6 +68,7 @@ const Modal = ({

 Modal.propTypes = {
    isModalOpen: PropTypes.bool.isRequired,
+    modalType: PropTypes.string.isRequired,
    handleSubmit: PropTypes.func.isRequired,
    processingAdding: PropTypes.bool.isRequired,
    cidr: PropTypes.string.isRequired,
--- a/client/src/components/Settings/Dhcp/StaticLeases/index.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/index.js
@@ -3,10 +3,15 @@ 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 } from '../../../../helpers/constants';
+import { LEASES_TABLE_DEFAULT_PAGE_SIZE, MODAL_TYPE } from '../../../../helpers/constants';
 import { sortIp } from '../../../../helpers/helpers';
 import Modal from './Modal';
-import { addStaticLease, removeStaticLease } from '../../../../actions';
+import {
+    addStaticLease,
+    removeStaticLease,
+    toggleLeaseModal,
+    updateStaticLease,
+} from '../../../../actions';

 const cellWrap = ({ value }) => (
    <div className="logs__row o-hidden">
@@ -18,8 +23,10 @@ const cellWrap = ({ value }) => (

 const StaticLeases = ({
    isModalOpen,
+    modalType,
    processingAdding,
    processingDeleting,
+    processingUpdating,
    staticLeases,
    cidr,
    rangeStart,
@@ -31,7 +38,12 @@ const StaticLeases = ({

    const handleSubmit = (data) => {
        const { mac, ip, hostname } = data;
-        dispatch(addStaticLease({ mac, ip, hostname }));
+
+        if (modalType === MODAL_TYPE.EDIT_LEASE) {
+            dispatch(updateStaticLease({ mac, ip, hostname }));
+        } else {
+            dispatch(addStaticLease({ mac, ip, hostname }));
+        }
    };

    const handleDelete = (ip, mac, hostname = '') => {
@@ -80,19 +92,35 @@ 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-icon--green btn-outline-secondary btn-sm"
-                                        title={t('delete_table_action')}
-                                        disabled={processingDeleting}
+                                        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)}
-                                        >
-                                            <svg className="icons">
-                                                <use xlinkHref="#delete"/>
-                                            </svg>
-                                        </button>
-                                    </div>;
+                                        disabled={processingDeleting}
+                                        title={t('delete_table_action')}
+                                    >
+                                        <svg className="icons icon12">
+                                            <use xlinkHref="#delete" />
+                                        </svg>
+                                    </button>
+                                </div>
+                            );
                        },
                    },
                ]}
@@ -105,6 +133,7 @@ const StaticLeases = ({
            />
            <Modal
                isModalOpen={isModalOpen}
+                modalType={modalType}
                handleSubmit={handleSubmit}
                processingAdding={processingAdding}
                cidr={cidr}
@@ -119,8 +148,10 @@ 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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ainar Garipov	ecdac56616	all: fix chlog link	2023-12-07 17:44:22 +03:00
Ainar Garipov	25918e56fa	Pull request 2100: v0.107.42-rc Squashed commit of the following: commit 284190f748345c7556e60b67f051ec5f6f080948 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 6 19:36:00 2023 +0300 all: sync with master; upd chlog	2023-12-07 17:23:00 +03:00
Ainar Garipov	df91f016f2	all: fix chlog	2023-11-13 18:34:42 +03:00
Ainar Garipov	f7d259f653	all: fix chlog	2023-11-13 18:00:38 +03:00
Ainar Garipov	82ab4328d4	all: sync with master; upd chlog	2023-11-13 17:39:48 +03:00
Ainar Garipov	b21e19a223	all: sync with master; upd chlog	2023-10-18 17:04:44 +03:00
Ainar Garipov	c6aed4eb57	cherry-pick: 6180 revert	2023-10-11 18:35:46 +03:00
Ainar Garipov	760d466b38	all: sync with master; upd chlog	2023-10-11 17:31:41 +03:00
Ainar Garipov	258eecc55b	all: sync with master; upd chlog	2023-09-11 17:51:50 +03:00
Ainar Garipov	7b93f5d7cf	all: sync with master; upd chlog	2023-09-07 17:13:48 +03:00
Ainar Garipov	3be7676970	all: sync with master; upd chlog	2023-08-02 16:26:34 +03:00
Ainar Garipov	48ee2f8a42	all: sync with master; upd chlog	2023-07-26 13:18:44 +03:00
Ainar Garipov	ec83d0eb86	all: sync with master; upd chlog	2023-07-12 15:13:31 +03:00
Ainar Garipov	19347d263a	cherry-pick: 5959-fix-error-days Updates #5959. * commit '4b9264531be50e81fe610050a12827b71bc3a9cd': clients: use constant a day in milliseconds clients: fix lint fix error days	2023-07-03 14:38:16 +03:00
Ainar Garipov	b22b16d98c	all: sync with master; upd chlog	2023-07-03 14:10:40 +03:00
Ainar Garipov	cadb765b7d	all: sync with master; upd chlog	2023-06-13 17:04:47 +03:00
Ainar Garipov	1116da8b83	all: sync with master; upd chlog	2023-06-08 19:48:01 +03:00
Ainar Garipov	c65700923a	all: sync with master; upd chlog	2023-06-07 20:04:01 +03:00
Ainar Garipov	7030c7c24c	all: imp chlog	2023-04-18 16:56:12 +03:00
Ainar Garipov	09718a2170	all: sync with master; upd chlog	2023-04-18 16:07:11 +03:00