all: upd chlog

Updates #4557.

* commit 'e3624ec5880361b8afccd0ddac9dc31fd7ce4a07':
  all: fix abbreviation
  Update README.md

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,142 +1,109 @@
 'body':
   - 'attributes':
-      'description': >
-        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 post it to the GitHub
-        Discussions page.
-      'label': 'Prerequisites'
-      'options':
-        - 'label': >
-            I have checked the
-            [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-            [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
-            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
-          'required': true
+        'description': >
+            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 post it to the GitHub
+            Discussions page.
+        'label': 'Prerequisites'
+        'options':
+          - 'label': >
+                I have checked the
+                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
+                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+                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
+            'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-      'description': 'On which operating system type does the issue occur?'
-      'label': 'Operating system type'
-      'options':
-        - 'FreeBSD'
-        - 'Linux, OpenWrt'
-        - 'Linux, Other (please mention the version in the description)'
-        - 'macOS (aka Darwin)'
-        - 'OpenBSD'
-        - 'Windows'
-        - 'Other (please mention in the description)'
+        'description': 'On which operating system type does the issue occur?'
+        'label': 'Operating system type'
+        'options':
+          - 'FreeBSD'
+          - 'Linux, OpenWrt'
+          - 'Linux, Other (please mention the version in the description)'
+          - 'macOS (aka Darwin)'
+          - 'OpenBSD'
+          - 'Windows'
+          - 'Other (please mention in the description)'
     'id': 'os'
     'type': 'dropdown'
     'validations':
-      'required': true
+        '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)'
+        '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
+        'required': true
   - 'attributes':
-      'description': 'How did you install AdGuard Home?'
-      'label': 'Installation'
-      'options':
-        - 'GitHub releases or script from README'
-        - 'Docker'
-        - 'Snapcraft'
-        - 'Custom port'
-        - 'Other (please mention in the description)'
+        'description': 'How did you install AdGuard Home?'
+        'label': 'Installation'
+        'options':
+          - 'GitHub releases or script from README'
+          - 'Docker'
+          - 'Snapcraft'
+          - 'Custom port'
+          - 'Other (please mention in the description)'
     'id': 'install'
     'type': 'dropdown'
     'validations':
-      'required': true
+        'required': true
   - 'attributes':
-      'description': 'How did you setup AdGuard Home?'
-      'label': 'Setup'
-      'options':
-        - 'On one machine'
-        - 'On a router, DHCP is handled by the router'
-        - 'On a router, DHCP is handled by AdGuard Home'
-        - 'Other (please mention in the description)'
+        'description': 'How did you setup AdGuard Home?'
+        'label': 'Setup'
+        'options':
+          - 'On one machine'
+          - 'On a router, DHCP is handled by the router'
+          - 'On a router, DHCP is handled by AdGuard Home'
+          - 'Other (please mention in the description)'
     'id': 'setup'
     'type': 'dropdown'
     'validations':
-      'required': true
+        'required': true
   - 'attributes':
-      'description': 'What version of AdGuard Home are you using?'
-      'label': 'AdGuard Home version'
+        'description': 'What version of AdGuard Home are you using?'
+        'label': 'AdGuard Home version'
     'id': 'version'
     'type': 'input'
     'validations':
-      'required': true
+        'required': true
   - 'attributes':
-      'description': 'Please provide a set of steps to reproduce the issue'
-      'label': 'Issue Details'
-      'placeholder':
-      'value': |
-        Steps to reproduce:
-        1.
-        2.
-        3.
-    'id': 'what-happened'
+        'description': 'Please describe the bug'
+        'label': 'Description'
+        'value': |
+            #### What did you do?
+
+            #### Expected result
+
+            #### Actual result
+
+            #### Screenshots (if applicable)
+
+            #### Additional information
+    'id': 'description'
     'type': 'textarea'
     'validations':
-      'required': true
-  - 'attributes':
-      'label': 'Expected Behavior'
-      'description': 'Describe the expected behavior'
-      'placeholder': |
-        A clear and concise description of what you expected to happen.
-    'id': 'expected-behavior'
-    'type': 'textarea'
-    'validations':
-      'required': false
-  - 'attributes':
-      'label': 'Actual Behavior'
-      'description': 'Describe the actual behavior'
-      'placeholder': 'A clear description of what happened instead.'
-    'id': 'actual-behavior'
-    'type': 'textarea'
-    'validations':
-      'required': true
-  - 'attributes':
-      'label': 'Screenshots'
-      'description': |
-        If applicable add screenshots explaining your problem.
-        You can drag and drop images or paste them from clipboard.
-        Use `<details> </details>` tag to hide screenshots under the spoiler.
-      'placeholder': 'If applicable add screenshots explaining your problem.'
-      'value': |
-        <details><summary>Screenshot 1:</summary>
-        
-        <!-- paste screenshot here -->
-        
-        </details>
-    'id': 'screenshots'
-    'type': 'textarea'
-    'validations':
-      'required': false
-'description': >
-  Open a bug report. Please do not open bug reports for questions. If you
-  want to ask a question, ask in in the Discussions section.
-'name': 'Bug report'
-'labels': [ 'bug' ]
+        'required': true
+'description': 'File a bug report'
+'name': 'Bug'

.github/ISSUE_TEMPLATE/config.yml

@@ -7,9 +7,9 @@
     'name': 'AdGuard filters issues'
     'url': 'https://link.adtidy.org/forward.html?action=report&app=home&from=github'
   - 'about': >
-        Please send requests for new blocked services and vetted filtering lists
-        to the Hostlists Registry repository
-    'name': 'Blocked services and vetted filtering rule lists: AdGuard Hostlists Registry'
+        Please send requests for addition to the vetted filtering lists to the
+        Hostlists Registry repository.
+    'name': 'AdGuard Hostlists Registry'
     'url': 'https://github.com/AdguardTeam/HostlistsRegistry'
   - 'about': >
         Please use GitHub Discussions for questions

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,54 +1,41 @@
 'body':
   - 'attributes':
-      'description': >
-        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 post it to the GitHub
-        Discussions page.
-      'label': 'Prerequisites'
-      'options':
-        - 'label': >
-            I have checked the
-            [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-            [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
-            and found no answer
-          'required': true
-        - 'label': >
-            I have searched other issues and found no duplicates
-          'required': true
-        - 'label': >
-            I want to request a feature or enhancement and not ask a
-            question
-          'required': true
+        'description': >
+            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 post it to the GitHub
+            Discussions page.
+        'label': 'Prerequisites'
+        'options':
+          - 'label': >
+                I have checked the
+                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
+                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+                and found no answer
+            'required': true
+          - 'label': >
+                I have searched other issues and found no duplicates
+            'required': true
+          - 'label': >
+                I want to request a feature or enhancement and not ask a
+                question
+            'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-      'description': 'What happened?'
-      'placeholder': |
-        Is your feature request related to a problem? Please add a clear and 
-        concise description of what the problem is.
-      'label': 'Issue Details'
-    'id': 'what-happened'
+        'description': 'Please describe the request'
+        'label': 'Description'
+        'value': |
+            #### What problem are you trying to solve?
+
+            #### Proposed solution
+
+            #### Alternatives considered
+
+            #### Additional information
+    'id': 'description'
     'type': 'textarea'
     'validations':
-      'required': true
-  - 'attributes':
-      'description': 'What do you propose to change in AdGuard Home?'
-      'placeholder': |
-        Describe the solution you'd like in a clear and concise manner.
-      'label': 'Proposed solution'
-    'id': 'proposed-solution'
-    'type': 'textarea'
-    'validations':
-      'required': true
-  - 'attributes':
-      'description': 'Are there any other ways to solve the problem?'
-      'placeholder': |
-        A clear and concise description of any alternative solutions or features
-        you've considered.
-      'label': 'Alternative solution'
-    'id': 'alternative-solution'
-    'type': 'textarea'
+        'required': true
 'description': 'Suggest a feature or an enhancement for AdGuard Home'
 'name': 'Feature request or enhancement'
-'labels': [ 'feature request' ]

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.19.10'
+  'GO_VERSION': '1.18.8'
   'NODE_VERSION': '14'
 
 'on':

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.19.10'
+  'GO_VERSION': '1.18.8'
 
 'on':
   'push':

.github/workflows/potential-duplicates.yml

@@ -1,34 +0,0 @@
-'name': 'potential-duplicates'
-'on':
-  'issues':
-    'types': [ 'opened', 'edited' ]
-'jobs':
-  'run':
-    'runs-on': 'ubuntu-latest'
-    'steps':
-      - 'uses': 'wow-actions/potential-duplicates@v1'
-        'with':
-          'GITHUB_TOKEN': ${{ secrets.GITHUB_TOKEN }}
-          # Issue title filter work with https://www.npmjs.com/package/anymatch.
-          # Any matched issue will stop detection immediately.
-          # You can specify multi filters in each line.
-          # 'filter': ''
-          # Exclude keywords in title before detecting.
-          # 'exclude': ''
-          # Label to set, when potential duplicates are detected.
-          'label': 'potential-duplicate'
-          # Get issues with state to compare. Supported state: 'all', 'closed',
-          # 'open'.
-          'state': 'all'
-          # If similarity is higher than this threshold([0,1]), issue will be
-          # marked as duplicate.
-          'threshold': 0.6
-          # Reactions to be add to comment when potential duplicates are
-          # detected. Available reactions: "-1", "+1", "confused", "laugh",
-          # "heart", "hooray", "rocket", "eyes".
-          # 'reactions': 'eyes, confused'
-          # Comment to post when potential duplicates are detected.
-          'comment': >
-            Potential duplicates: {{#issues}}
-              - [#{{ number }}] {{ title }} ({{ accuracy }}%)
-            {{/issues}}

.gitignore

@@ -12,6 +12,7 @@
 /agh-backup/
 /bin/
 /build/*
+/build2/*
 /data/
 /dist/
 /filtering/tests/filtering.TestLotsOfRules*.pprof
@@ -21,6 +22,8 @@
 /snapcraft_login
 AdGuardHome*
 coverage.txt
+leases.db
 node_modules/
 
 !/build/gitkeep
+!/build2/gitkeep

AGHTechDoc.md

@@ -399,7 +399,6 @@ Response:
 	"protection_enabled":true,
 	"running":true,
 	"dhcp_available":true,
-    "protection_disabled_duration":0
 	"version":"undefined"
 	}
 

CHANGELOG.md

@@ -13,584 +13,17 @@ and this project adheres to
 
 <!--
 ## [v0.108.0] - TBA
-
-## [v0.107.32] - 2023-06-28 (APPROX.)
-
-See also the [v0.107.32 GitHub milestone][ms-v0.107.32].
-
-[ms-v0.107.32]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1
-
-NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
-### Added
 
-- The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
-  ([#1577]).
-
-### Fixed
-
- - DNSCrypt upstream not resetting the client and resolver information on
-   dialing errors ([#5872]).
-
-[#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
 
 <!--
-NOTE: Add new changes ABOVE THIS COMMENT.
--->
-
-
-
-## [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].
-
-### Added
-
-- The ability to exclude client activity from the query log or statistics by
-  using the new properties `ignore_querylog` and `ignore_statistics` of the
-  items of the `clients.persistent` array ([#1717], [#4299]).  The UI changes
-  are coming in the upcoming releases.
-- Better profiling information when `debug_pprof` is set to `true`.
-- IPv6 support in Safe Search for some services.
-- The ability to make bootstrap DNS lookups prefer IPv6 addresses to IPv4 ones
-  using the new `dns.bootstrap_prefer_ipv6` configuration file property
-  ([#4262]).
-- Docker container's healthcheck ([#3290]).
-- The new HTTP API `POST /control/protection`, that updates protection state
-  and adds an optional pause duration ([#1333]).  The format of request body
-  is described in `openapi/openapi.yaml`.  The duration of this pause could
-  also be set with the property `protection_disabled_until` in the `dns` object
-  of the YAML configuration file.
-- The ability to create a static DHCP lease from a dynamic one more easily
-  ([#3459]).
-- Two new HTTP APIs, `PUT /control/stats/config/update` and `GET
-  control/stats/config`, which can be used to set and receive the query log
-  configuration.  See `openapi/openapi.yaml` for the full description.
-- Two new HTTP APIs, `PUT /control/querylog/config/update` and `GET
-  control/querylog/config`, which can be used to set and receive the statistics
-  configuration.  See `openapi/openapi.yaml` for the full description.
-- The ability to set custom IP for EDNS Client Subnet by using the DNS-server
-  configuration section on the DNS settings page in the UI ([#1472]).
-- The ability to manage Safe Search for each service by using the new
-  `safe_search` property ([#1163]).
-
-### Changed
-
-- ARPA domain names containing a subnet within private networks now also
-  considered private, behaving closer to [RFC 6761][rfc6761] ([#5567]).
-
-#### Configuration Changes
-
-In this release, the schema version has changed from 17 to 20.
-
-- Property `statistics.interval`, which in schema versions 19 and earlier used
-  to be an integer number of days, is now a string with a human-readable
-  duration:
-
-  ```yaml
-  # BEFORE:
-  'statistics':
-    # …
-    'interval': 1
-
-  # AFTER:
-  'statistics':
-    # …
-    'interval': '24h'
-  ```
-
-  To rollback this change, convert the property back into days and change the
-  `schema_version` back to `19`.
-- The `dns.safesearch_enabled` property has been replaced with `safe_search`
-  object containing per-service settings.
-- The `clients.persistent.safesearch_enabled` property has been replaced with
-  `safe_search` object containing per-service settings.
-
-  ```yaml
-    # BEFORE:
-    'safesearch_enabled': true
-
-    # AFTER:
-    'safe_search':
-      'enabled': true
-      'bing': true
-      'duckduckgo': true
-      'google': true
-      'pixabay': true
-      'yandex': true
-      'youtube': true
-  ```
-
-  To rollback this change, move the value of `dns.safe_search.enabled` into the
-  `dns.safesearch_enabled`, then remove `dns.safe_search` property.  Do the same
-  client's specific `clients.persistent.safesearch` and then change the
-  `schema_version` back to `17`.
-
-### Deprecated
-
-- The `POST /control/safesearch/enable` HTTP API is deprecated.  Use the new
-  `PUT /control/safesearch/settings` API.
-- The `POST /control/safesearch/disable` HTTP API is deprecated.  Use the new
-  `PUT /control/safesearch/settings` API
-- The `safesearch_enabled` property is deprecated in the following HTTP APIs:
-  - `GET /control/clients`;
-  - `POST /control/clients/add`;
-  - `POST /control/clients/update`;
-  - `GET /control/clients/find?ip0=...&ip1=...&ip2=...`.
-
-  Check `openapi/openapi.yaml` for more details.
-- The `GET /control/stats_info` HTTP API; use the new `GET
-  /control/stats/config` API instead.
-
-  **NOTE:** If interval is custom then it will be equal to `90` days for
-  compatibility reasons.  See `openapi/openapi.yaml` and `openapi/CHANGELOG.md`.
-- The `POST /control/stats_config` HTTP API; use the new `PUT
-  /control/stats/config/update` API instead.
-- The `GET /control/querylog_info` HTTP API; use the new `GET
-  /control/querylog/config` API instead.
-
-  **NOTE:** If interval is custom then it will be equal to `90` days for
-  compatibility reasons.  See `openapi/openapi.yaml` and `openapi/CHANGELOG.md`.
-- The `POST /control/querylog_config` HTTP API; use the new `PUT
-  /control/querylog/config/update` API instead.
-
-### Fixed
-
-- Logging of the client's IP address after failed login attempts ([#5701]).
-
-[#1163]: https://github.com/AdguardTeam/AdGuardHome/issues/1163
-[#1333]: https://github.com/AdguardTeam/AdGuardHome/issues/1333
-[#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
-[#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
-
-
-
-
-## [v0.107.27] - 2023-04-05
-
-See also the [v0.107.27 GitHub milestone][ms-v0.107.27].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-24534, CVE-2023-24536, CVE-2023-24537, and CVE-2023-24538 Go
-  vulnerabilities fixed in [Go 1.19.8][go-1.19.8].
-
-### Fixed
-
-- Query log not showing all filtered queries when the “Filtered” log filter is
-  selected ([#5639]).
-- Panic in empty hostname in the filter's URL ([#5631]).
-- Panic caused by empty top-level domain name label in `/etc/hosts` files
-  ([#5584]).
-
-[#5584]: https://github.com/AdguardTeam/AdGuardHome/issues/5584
-[#5631]: https://github.com/AdguardTeam/AdGuardHome/issues/5631
-[#5639]: https://github.com/AdguardTeam/AdGuardHome/issues/5639
-
-[go-1.19.8]:    https://groups.google.com/g/golang-announce/c/Xdv6JL9ENs8/m/OV40vnafAwAJ
-[ms-v0.107.27]: https://github.com/AdguardTeam/AdGuardHome/milestone/63?closed=1
-
-
-
-## [v0.107.26] - 2023-03-09
-
-See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-24532 Go vulnerability fixed in [Go 1.19.7][go-1.19.7].
-
-### Added
-
-- The ability to set custom IP for EDNS Client Subnet by using the new
-  `dns.edns_client_subnet.use_custom` and `dns.edns_client_subnet.custom_ip`
-  properties ([#1472]).  The UI changes are coming in the upcoming releases.
-- The ability to use `dnstype` rules in the disallowed domains list ([#5468]).
-  This allows dropping requests based on their question types.
-
-### Changed
-
-#### 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`
-  object:
-
-  ```yaml
-  # BEFORE:
-  'dns':
-    # …
-    'edns_client_subnet': false
-
-  # AFTER:
-  'dns':
-    # …
-    'edns_client_subnet':
-      'enabled': false
-      'use_custom': false
-      'custom_ip': ''
-  ```
-
-  To rollback this change, move the value of `dns.edns_client_subnet.enabled`
-  into the `dns.edns_client_subnet`, remove the properties
-  `dns.edns_client_subnet.enabled`, `dns.edns_client_subnet.use_custom`,
-  `dns.edns_client_subnet.custom_ip`, and change the `schema_version` back to
-  `16`.
-
-### Fixed
-
-- Obsolete value of the Interface MTU DHCP option is now omitted ([#5281]).
-- Various dark theme bugs ([#5439], [#5441], [#5442], [#5515]).
-- Automatic update on MIPS64 and little-endian 32-bit MIPS architectures
-  ([#5270], [#5373]).
-- Requirements to domain names in domain-specific upstream configurations have
-  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
-[#5373]: https://github.com/AdguardTeam/AdGuardHome/issues/5373
-[#5431]: https://github.com/AdguardTeam/AdGuardHome/issues/5431
-[#5439]: https://github.com/AdguardTeam/AdGuardHome/issues/5439
-[#5441]: https://github.com/AdguardTeam/AdGuardHome/issues/5441
-[#5442]: https://github.com/AdguardTeam/AdGuardHome/issues/5442
-[#5468]: https://github.com/AdguardTeam/AdGuardHome/issues/5468
-[#5515]: https://github.com/AdguardTeam/AdGuardHome/issues/5515
-
-[go-1.19.7]:    https://groups.google.com/g/golang-announce/c/3-TpUx48iQY
-[ms-v0.107.26]: https://github.com/AdguardTeam/AdGuardHome/milestone/62?closed=1
-[rfc3696]:      https://datatracker.ietf.org/doc/html/rfc3696
-
-
-
-## [v0.107.25] - 2023-02-21
-
-See also the [v0.107.25 GitHub milestone][ms-v0.107.25].
-
-### Fixed
-
-- Panic when using unencrypted DNS-over-HTTPS ([#5518]).
-
-[#5518]: https://github.com/AdguardTeam/AdGuardHome/issues/5518
-
-[ms-v0.107.25]: https://github.com/AdguardTeam/AdGuardHome/milestone/61?closed=1
-
-
-
-## [v0.107.24] - 2023-02-15
-
-See also the [v0.107.24 GitHub milestone][ms-v0.107.24].
-
-### Security
-
-- Go version has been updated, both because Go 1.18 has reached end of life an
-  to prevent the possibility of exploiting the Go vulnerabilities fixed in [Go
-  1.19.6][go-1.19.6].
-
-### Added
-
-- The ability to disable statistics by using the new `statistics.enabled`
-  property.  Previously it was necessary to set the `statistics_interval` to 0,
-  losing the previous value ([#1717], [#4299]).
-- The ability to exclude domain names from the query log or statistics by using
-  the new `querylog.ignored` or `statistics.ignored` properties ([#1717],
-  [#4299]).  The UI changes are coming in the upcoming releases.
-
-### Changed
-
-#### Configuration Changes
-
-In this release, the schema version has changed from 14 to 16.
-
-- Property `statistics_interval`, which in schema versions 15 and earlier used
-  to be a part of the `dns` object, is now a part of the `statistics` object:
-
-  ```yaml
-  # BEFORE:
-  'dns':
-    # …
-    'statistics_interval': 1
-
-  # AFTER:
-  'statistics':
-    # …
-    'interval': 1
-  ```
-
-  To rollback this change, move the property back into the `dns` object and
-  change the `schema_version` back to `15`.
-- The properties `dns.querylog_enabled`, `dns.querylog_file_enabled`,
-  `dns.querylog_interval`, and `dns.querylog_size_memory` have been moved to the
-  new `querylog` object.
-
-  ```yaml
-  # BEFORE:
-  'dns':
-    'querylog_enabled': true
-    'querylog_file_enabled': true
-    'querylog_interval': '2160h'
-    'querylog_size_memory': 1000
-
-  # AFTER:
-  'querylog':
-    'enabled': true
-    'file_enabled': true
-    'interval': '2160h'
-    'size_memory': 1000
-    'ignored': []
-  ```
-
-  To rollback this change, rename and move properties back into the `dns`
-  object, remove `querylog` object and `querylog.ignored` property, and change
-  the `schema_version` back to `14`.
-
-### Deprecated
-
-- Go 1.19 support.  Future versions will require at least Go 1.20 to build.
-
-### Fixed
-
-- Setting the AD (Authenticated Data) flag on responses that have the DO (DNSSEC
-  OK) flag set but not the AD flag ([#5479]).
-- Client names resolved via reverse DNS not being updated ([#4939]).
-- The icon for League Of Legends on the Blocked services page ([#5433]).
-
-### Removed
-
-- Go 1.18 support, as it has reached end of life.
-
-[#1717]: https://github.com/AdguardTeam/AdGuardHome/issues/1717
-[#4299]: https://github.com/AdguardTeam/AdGuardHome/issues/4299
-[#4939]: https://github.com/AdguardTeam/AdGuardHome/issues/4939
-[#5433]: https://github.com/AdguardTeam/AdGuardHome/issues/5433
-[#5479]: https://github.com/AdguardTeam/AdGuardHome/issues/5479
-
-[go-1.19.6]:    https://groups.google.com/g/golang-announce/c/V0aBFqaFs_E
-[ms-v0.107.24]: https://github.com/AdguardTeam/AdGuardHome/milestone/60?closed=1
-
-
-
-## [v0.107.23] - 2023-02-01
-
-See also the [v0.107.23 GitHub milestone][ms-v0.107.23].
-
-### Added
-
-- DNS64 support ([#5117]).  The function may be enabled with new `use_dns64`
-  property under `dns` object in the configuration along with `dns64_prefixes`,
-  the set of exclusion prefixes to filter AAAA responses.  The Well-Known Prefix
-  (`64:ff9b::/96`) is used if no custom prefixes are specified.
-
-### Fixed
-
-- Filtering rules with `*` as the hostname not working properly ([#5245]).
-- Various dark theme bugs ([#5375]).
-
-### Removed
-
-- The “beta frontend” and the corresponding APIs.  They never quite worked
-  properly, and the future new version of AdGuard Home API will probably be
-  different.
-
-  Correspondingly, the configuration parameter `beta_bind_port` has been removed
-  as well.
-
-[#5117]: https://github.com/AdguardTeam/AdGuardHome/issues/5117
-[#5245]: https://github.com/AdguardTeam/AdGuardHome/issues/5245
-[#5375]: https://github.com/AdguardTeam/AdGuardHome/issues/5375
-
-[ms-v0.107.23]: https://github.com/AdguardTeam/AdGuardHome/milestone/59?closed=1
-
-
-
-## [v0.107.22] - 2023-01-19
-
-See also the [v0.107.22 GitHub milestone][ms-v0.107.22].
-
-### Added
-
-- Experimental Dark UI theme ([#613]).
-- The new HTTP API `PUT /control/profile/update`, that updates current user
-  language and UI theme.  The format of request body is described in
-  `openapi/openapi.yaml`.
-
-### Changed
-
-- The HTTP API `GET /control/profile` now returns enhanced object with
-  current user's name, language, and UI theme.  The format of response body is
-  described in `openapi/openapi.yaml` and `openapi/CHANGELOG.md`.
-
-### Fixed
-
-- `AdGuardHome --update` freezing when another instance of AdGuard Home is
-  running ([#4223], [#5191]).
-- The `--update` flag performing an update even when there is no version change.
-- Failing HTTPS redirection on saving the encryption settings ([#4898]).
-- Zeroing rules counter of erroneously edited filtering rule lists ([#5290]).
-- Filters updating strategy, which could sometimes lead to use of broken or
-  incompletely downloaded lists ([#5258]).
-
-[#613]:  https://github.com/AdguardTeam/AdGuardHome/issues/613
-[#5191]: https://github.com/AdguardTeam/AdGuardHome/issues/5191
-[#5290]: https://github.com/AdguardTeam/AdGuardHome/issues/5290
-[#5258]: https://github.com/AdguardTeam/AdGuardHome/issues/5258
-
-[ms-v0.107.22]: https://github.com/AdguardTeam/AdGuardHome/milestone/58?closed=1
-
-
-
-## [v0.107.21] - 2022-12-15
-
-See also the [v0.107.21 GitHub milestone][ms-v0.107.21].
-
-### Changed
-
-- The URLs of the default filters for new installations are synchronized to
-  those introduced in v0.107.20 ([#5238]).
-
-  **NOTE:** Some users may need to re-add the lists from the vetted filter lists
-  to update the URLs to the new ones.  Custom filters added by users themselves
-  do not require re-adding.
-
-### Fixed
-
-- Errors popping up during updates of settings, which could sometimes cause the
-  server to stop responding ([#5251]).
-
-[#5238]: https://github.com/AdguardTeam/AdGuardHome/issues/5238
-[#5251]: https://github.com/AdguardTeam/AdGuardHome/issues/5251
-
-[ms-v0.107.21]: https://github.com/AdguardTeam/AdGuardHome/milestone/57?closed=1
-
-
-
-## [v0.107.20] - 2022-12-07
+## [v0.107.20] - 2022-12-07 (APPROX.)
 
 See also the [v0.107.20 GitHub milestone][ms-v0.107.20].
 
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2022-41717 and CVE-2022-41720 Go vulnerabilities fixed in [Go
-  1.18.9][go-1.18.9].
-
-### Added
-
-- The ability to clear the DNS cache ([#5190]).
-
-### Changed
-
-- DHCP server initialization errors are now logged at debug level if the server
-  itself disabled ([#4944]).
-
-### Fixed
-
-- Wrong validation error messages on the DHCP configuration page ([#5208]).
-- Slow upstream checks making the API unresponsive ([#5193]).
-- The TLS initialization errors preventing AdGuard Home from starting ([#5189]).
-  Instead, AdGuard Home disables encryption and shows an error message on the
-  encryption settings page in the UI, which was the intended previous behavior.
-- URLs of some vetted blocklists.
-
-[#4944]: https://github.com/AdguardTeam/AdGuardHome/issues/4944
-[#5189]: https://github.com/AdguardTeam/AdGuardHome/issues/5189
-[#5190]: https://github.com/AdguardTeam/AdGuardHome/issues/5190
-[#5193]: https://github.com/AdguardTeam/AdGuardHome/issues/5193
-[#5208]: https://github.com/AdguardTeam/AdGuardHome/issues/5208
-
-[go-1.18.9]:    https://groups.google.com/g/golang-announce/c/L_3rmdT0BMU
 [ms-v0.107.20]: https://github.com/AdguardTeam/AdGuardHome/milestone/56?closed=1
+-->
 
 
 
@@ -1127,7 +560,7 @@ In this release, the schema version has changed from 12 to 14.
       hosts: true
   ```
 
-  The value for `clients.runtime_sources.rdns` property is taken from
+  The value for `clients.runtime_sources.rdns` field is taken from
   `dns.resolve_clients` property.  To rollback this change, remove the
   `runtime_sources` property, move the contents of `persistent` into the
   `clients` itself, the value of `clients.runtime_sources.rdns` into the
@@ -1377,7 +810,7 @@ See also the [v0.107.0 GitHub milestone][ms-v0.107.0].
   log entries concerning cached responses won't include that information.
 - Finnish and Ukrainian localizations.
 - Setting the timeout for IP address pinging in the "Fastest IP address" mode
-  through the new `fastest_timeout` property in the configuration file ([#1992]).
+  through the new `fastest_timeout` field in the configuration file ([#1992]).
 - Static IP address detection on FreeBSD ([#3289]).
 - Optimistic cache ([#2145]).
 - New possible value of `6h` for `querylog_interval` property ([#2504]).
@@ -1463,6 +896,7 @@ In this release, the schema version has changed from 10 to 12.
 
   To rollback this change, convert the property back into days and change the
   `schema_version` back to `11`.
+
 - Property `rlimit_nofile`, which in schema versions 10 and earlier used to be
   on the top level, is now moved to the new `os` object:
 
@@ -1793,7 +1227,7 @@ See also the [v0.105.2 GitHub milestone][ms-v0.105.2].
 - Inconsistent responses for messages with EDNS0 and AD when DNS caching is
   enabled ([#2600]).
 - Incomplete OpenWrt detection ([#2757]).
-- DHCP lease's `expired` property incorrect time format ([#2692]).
+- DHCP lease's `expired` field incorrect time format ([#2692]).
 - Incomplete DNS upstreams validation ([#2674]).
 - Wrong parsing of DHCP options of the `ip` type ([#2688]).
 
@@ -1830,8 +1264,8 @@ See also the [v0.105.1 GitHub milestone][ms-v0.105.1].
   the machine has a static IP.
 - Optical issue on custom rules ([#2641]).
 - Occasional crashes during startup.
-- The property `"range_start"` in the `GET /control/dhcp/status` HTTP API
-  response is now correctly named again ([#2678]).
+- The field `"range_start"` in the `GET /control/dhcp/status` HTTP API response
+  is now correctly named again ([#2678]).
 - DHCPv6 server's `ra_slaac_only` and `ra_allow_slaac` properties aren't reset
   to `false` on update anymore ([#2653]).
 - The `Vary` header is now added along with `Access-Control-Allow-Origin` to
@@ -1901,7 +1335,7 @@ See also the [v0.105.0 GitHub milestone][ms-v0.105.0].
 
 - Go 1.14 support.  v0.106.0 will require at least Go 1.15 to build.
 - The `darwin/386` port.  It will be removed in v0.106.0.
-- The `"rule"` and `"filter_id"` property in `GET /filtering/check_host` and
+- The `"rule"` and `"filter_id"` fields in `GET /filtering/check_host` and
   `GET /querylog` responses.  They will be removed in v0.106.0 ([#2102]).
 
 ### Fixed
@@ -2009,23 +1443,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...HEAD
-[v0.107.32]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...v0.107.32
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.20...HEAD
+[v0.107.20]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.19...v0.107.20
 -->
 
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...HEAD
-[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
-[v0.107.25]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.24...v0.107.25
-[v0.107.24]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.23...v0.107.24
-[v0.107.23]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.22...v0.107.23
-[v0.107.22]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.21...v0.107.22
-[v0.107.21]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.20...v0.107.21
-[v0.107.20]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.19...v0.107.20
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.19...HEAD
 [v0.107.19]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.18...v0.107.19
 [v0.107.18]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.17...v0.107.18
 [v0.107.17]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.16...v0.107.17

Makefile

@@ -4,26 +4,18 @@
 # See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html.
 .POSIX:
 
-# This comment is used to simplify checking local copies of the
-# Makefile.  Bump this number every time a significant change is made to
-# this Makefile.
-#
-# AdGuard-Project-Version: 2
-
-# Don't name these macros "GO" etc., because GNU Make apparently makes
-# them exported environment variables with the literal value of
-# "${GO:-go}" and so on, which is not what we need.  Use a dot in the
-# name to make sure that users don't have an environment variable with
-# the same name.
-#
-# See https://unix.stackexchange.com/q/646255/105635.
-GO.MACRO = $${GO:-go}
-VERBOSE.MACRO = $${VERBOSE:-0}
-
 CHANNEL = development
+CLIENT_BETA_DIR = client2
 CLIENT_DIR = client
 COMMIT = $$( git rev-parse --short HEAD )
 DIST_DIR = dist
+# Don't name this macro "GO", because GNU Make apparenly makes it an
+# exported environment variable with the literal value of "${GO:-go}",
+# which is not what we need.  Use a dot in the name to make sure that
+# users don't have an environment variable with the same name.
+#
+# See https://unix.stackexchange.com/q/646255/105635.
+GO.MACRO = $${GO:-go}
 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
 GOSUMDB = sum.golang.google.cn
 GPG_KEY = devteam@adguard.com
@@ -34,10 +26,13 @@ NPM_INSTALL_FLAGS = $(NPM_FLAGS) --quiet --no-progress --ignore-engines\
 	--ignore-optional --ignore-platform --ignore-scripts
 RACE = 0
 SIGN = 1
+VERBOSE = 0
 VERSION = v0.0.0
 YARN = yarn
-
-NEXTAPI = 0
+YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
+YARN_INSTALL_FLAGS = $(YARN_FLAGS) --network-timeout 120000 --silent\
+	--ignore-engines --ignore-optional --ignore-platform\
+	--ignore-scripts
 
 # Macros for the build-release target.  If FRONTEND_PREBUILT is 0, the
 # default, the macro $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT)) expands
@@ -66,14 +61,13 @@ ENV = env\
 	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
 	RACE='$(RACE)'\
 	SIGN='$(SIGN)'\
-	NEXTAPI='$(NEXTAPI)'\
-	VERBOSE="$(VERBOSE.MACRO)"\
+	VERBOSE='$(VERBOSE)'\
 	VERSION='$(VERSION)'\
 
 # Keep the line above blank.
 
-# Keep this target first, so that a naked make invocation triggers a
-# full build.
+# Keep this target first, so that a naked make invocation triggers
+# a full build.
 build: deps quick-build
 
 quick-build: js-build go-build
@@ -96,13 +90,17 @@ init:  ; git config core.hooksPath ./scripts/hooks
 
 js-build:
 	$(NPM) $(NPM_FLAGS) run build-prod
+	$(YARN) $(YARN_FLAGS) build
 js-deps:
 	$(NPM) $(NPM_INSTALL_FLAGS) ci
+	$(YARN) $(YARN_INSTALL_FLAGS) install
 
 # TODO(a.garipov): Remove the legacy client tasks support once the new
 # client is done and the old one is removed.
 js-lint: ; $(NPM) $(NPM_FLAGS) run lint
 js-test: ; $(NPM) $(NPM_FLAGS) run test
+js-beta-lint: ; $(YARN) $(YARN_FLAGS) lint
+js-beta-test: ; # TODO(v.abdulmyanov): Add tests for the new client.
 
 go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
 go-deps:  ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
@@ -127,4 +125,4 @@ go-os-check:
 openapi-lint: ; cd ./openapi/ && $(YARN) test
 openapi-show: ; cd ./openapi/ && $(YARN) start
 
-txt-lint: ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh
+txt-lint:  ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh

README.md

@@ -81,24 +81,12 @@ code.
 
    ###  <a href="#automated-install-linux-and-mac" id="automated-install-linux-and-mac" name="automated-install-linux-and-mac">Automated install (Unix)</a>
 
-To install with `curl` run the following command:
+Run the following command in your terminal:
 
 ```sh
 curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v
 ```
 
-To install with `wget` run the following command:
-
-```sh
-wget --no-verbose -O - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v
-```
-
-To install with `fetch` run the following command:
-
-```sh
-fetch -o - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v
-```
-
 The script also accepts some options:
 
  *  `-c <channel>` to use specified channel;
@@ -261,7 +249,7 @@ 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;
+ *  [Go](https://golang.org/dl/) v1.18 or later;
  *  [Node.js](https://nodejs.org/en/download/) v10.16.2 or later;
  *  [npm](https://www.npmjs.com/) v6.14 or later;
  *  [yarn](https://yarnpkg.com/) v1.22.5 or later.
@@ -466,10 +454,6 @@ 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/).

bamboo-specs/release.yaml

@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
   'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:6.7'
+  'dockerGo': 'adguard/golang-ubuntu:5.3'
 
 'stages':
 - 'Build frontend':
@@ -109,8 +109,7 @@
                 CHANNEL=${bamboo.channel}\
                 GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
                 FRONTEND_PREBUILT=1\
-                PARALLELISM=1\
-                VERBOSE=2\
+                VERBOSE=1\
                 build-release
   # TODO(a.garipov): Use more fine-grained artifact rules.
   'artifacts':
@@ -136,12 +135,8 @@
 
         set -e -f -u -x
 
-        COMMIT="${bamboo.repository.revision.number}"
-        export COMMIT
-        readonly COMMIT
-
         # Explicitly checkout the revision that we need.
-        git checkout "$COMMIT"
+        git checkout "${bamboo.repository.revision.number}"
 
         # Install Qemu, create builder.
         docker version -f '{{ .Server.Experimental }}'
@@ -161,13 +156,12 @@
         docker info
 
         # Prepare and push the build.
-        env\
+        make\
                 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
+                build-docker
       'environment':
         DOCKER_CLI_EXPERIMENTAL=enabled
   'final-tasks':
@@ -228,28 +222,28 @@
 
         channel="${bamboo.channel}"
         readonly channel
-
         case "$channel"
         in
         ('release')
-                snapchannel='candidate'
-                ;;
+              snapchannel='candidate'
+              ;;
         ('beta')
-                snapchannel='beta'
-                ;;
+              snapchannel='beta'
+              ;;
         ('edge')
-                snapchannel='edge'
-                ;;
+              snapchannel='edge'
+              ;;
         (*)
-                echo "invalid channel '$channel'"
-                exit 1
-                ;;
+              echo "invalid channel '$channel'"
+              exit 1
+              ;;
         esac
 
         env\
                 SNAPCRAFT_CHANNEL="$snapchannel"\
                 SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
-                SNAPCRAFT_STORE_CREDENTIALS="${bamboo.snapcraftMacaroonPassword}"\
+                SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
+                SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\
                 ../bamboo-deploy-publisher/deploy.sh adguard-home-snap
   'final-tasks':
   - 'clean'
@@ -274,14 +268,12 @@
 
         set -e -f -u -x
 
-        channel="${bamboo.channel}"
-        readonly channel
-
-        if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
+        export CHANNEL="${bamboo.channel}"
+        if [ "$CHANNEL" != 'release' ] && [ "${CHANNEL}" != 'beta' ]
         then
-                echo "don't publish to GitHub Releases for this channel"
+              echo "don't publish to GitHub Releases for this channel"
 
-                exit 0
+              exit 0
         fi
 
         cd ./dist/
@@ -330,7 +322,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:6.7'
+      'dockerGo': 'adguard/golang-ubuntu:5.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]+':
@@ -345,4 +337,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:6.7'
+      'dockerGo': 'adguard/golang-ubuntu:5.3'

bamboo-specs/test.yaml

@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:6.7'
+  'dockerGo': 'adguard/golang-ubuntu:5.3'
 
 'stages':
 - 'Tests':

build2/gitkeep

@@ -0,0 +1 @@
+Keep this file non-hidden for Go's embedding to work.

client/dev.eslintrc

@@ -3,4 +3,4 @@
     "rules": {
         "no-debugger":"warn",
     }
-}
+}

client/public/index.html

@@ -12,40 +12,11 @@
         <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 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>
+        <div id="root"></div>
     </body>
 </html>

client/public/login.html

@@ -17,12 +17,5 @@
             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>

client/src/__locales/ar.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 إعدادات",
     "form_error_required": "الحقل مطلوب",
     "form_error_ip4_format": "عنوان IPv4 غير صالح",
+    "form_error_ip4_range_start_format": "عناوين البداية لـIPv4 غير صالحة للنطاق",
+    "form_error_ip4_range_end_format": "عناوين IPv4 غير صالحة لنطاق النهاية",
     "form_error_ip4_gateway_format": "عنوان IPv4 غير صالح للبوابة",
     "form_error_ip6_format": "عنوان IPv6 غير صالح",
     "form_error_ip_format": "عنوان IP غير صحيح",
@@ -49,6 +51,7 @@
     "out_of_range_error": "يجب أن يكون خارج النطاق \"{{start}}\" - \"{{end}}\"",
     "lower_range_start_error": "يجب أن يكون أقل من نطاق البداية",
     "greater_range_start_error": "يجب أن يكون أكبر من نطاق البداية",
+    "greater_range_end_error": "يجب أن يكون أكبر من نطاق النهاية",
     "subnet_error": "يجب أن تكون العناوين في شبكة فرعية واحدة",
     "gateway_or_subnet_invalid": "قناع الشبكة الفرعية غير صالح",
     "dhcp_form_gateway_input": "IP البوابة",
@@ -297,8 +300,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: الرد باستخدام رمز NXDOMAIN",
     "blocking_mode_null_ip": "IP Null: الاستجابة بعنوان IP صفري (0.0.0.0 لـ A ؛ :: لـ AAAA)",
     "blocking_mode_custom_ip": "استجابة IP مخصصة بعنوان IP تم تعيينه يدويًا",
-    "theme_light": "فاتح",
-    "theme_dark": "ليلي",
     "upstream_dns_client_desc": "إذا احتفظت بهذا الحقل فارغًا ، فسيستخدم AdGuard Home الخوادم التي تم تكوينها في<0>DNS إعدادات</0>.",
     "tracker_source": "مصدر المتعقب",
     "source_label": "المصدر",
@@ -635,6 +636,5 @@
     "parental_control": "الرقابة الابويه",
     "safe_browsing": "تصفح آمن",
     "served_from_cache": "{{value}} <i>(يتم تقديمه من ذاكرة التخزين المؤقت)</i>",
-    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل",
-    "protection_section_label": "الحماية"
+    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل"
 }

client/src/__locales/be.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Налады DHCP IPv6",
     "form_error_required": "Абавязковае поле",
     "form_error_ip4_format": "Няслушны IPv4-адрас",
+    "form_error_ip4_range_start_format": "Няслушны IPv4-адрас пачатку дыяпазону",
+    "form_error_ip4_range_end_format": "Няслушны IPv4-адрас канца дыяпазону",
     "form_error_ip4_gateway_format": "Няслушны IPv4-адрас шлюза",
     "form_error_ip6_format": "Няслушны IPv6-адрас",
     "form_error_ip_format": "Няслушны IP-адрас",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Павінна быць па-за дыяпазонам «{{start}}»-«{{end}}»",
     "lower_range_start_error": "Павінна быць менш за пачатак дыяпазону",
     "greater_range_start_error": "Павінна быць больш за пачатак дыяпазону",
+    "greater_range_end_error": "Павінна быць больш за канец дыяпазону",
     "subnet_error": "Адрасы павінны быць усярэдзіне адной падсеткі",
     "gateway_or_subnet_invalid": "Некарэктная маска падсеткі",
     "dhcp_form_gateway_input": "IP-адрас шлюза",
@@ -150,7 +153,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-серверы",
@@ -247,7 +250,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}}",
@@ -261,7 +264,7 @@
     "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-сервера",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Адказвае з кодам NXDOMAIN\n",
     "blocking_mode_null_ip": "Нулёвы IP: Адказвае з нулёвым IP-адрасам (0.0.0.0 для A; :: для AAAA)",
     "blocking_mode_custom_ip": "Карыстацкі IP: Адказвае з ручна наладжаным IP-адрасам",
-    "theme_auto": "Аўто",
-    "theme_light": "Светлая",
-    "theme_dark": "Цёмная",
     "upstream_dns_client_desc": "Калі пакінуць поле пустым, AdGuard Home будзе звяртацца да сервераў, паказаных у <0>наладах DNS</0>.",
     "tracker_source": "Крыніца трэкінгу",
     "source_label": "Крыніца",
@@ -356,7 +356,7 @@
     "install_devices_android_list_5": "Зараз можна змяніць палі «DNS 1» і «DNS 2». Увядзіце ў іх адрасы AdGuard Home.",
     "install_devices_ios_list_1": "Увайдзіце ў меню налад прылады.",
     "install_devices_ios_list_2": "Абярыце пункт «Wi-Fi» (для мабільных сетак ручная наладка DNS немагчыма).",
-    "install_devices_ios_list_3": "Націсніце на назву актыўнай у дадзены момант сеткі.",
+    "install_devices_ios_list_3": "Націсніце на назву сетцы, да якой прылада падлучана ў дадзены момант.",
     "install_devices_ios_list_4": "У поле «DNS» увядзіце ўвядзіце адрасы AdGuard Home.",
     "get_started": "Паехалі",
     "next": "Далей",
@@ -393,7 +393,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",
@@ -454,7 +454,6 @@
     "updates_checked": "Даступная новая версія AdGuard Home",
     "updates_version_equal": "Версія AdGuard Home актуальная",
     "check_updates_now": "Праверыць абнаўленні",
-    "version_request_error": "Памылка пры праверцы наяўнасці абнаўленняў. Праверце ваша інтэрнэт-злучэнне.",
     "dns_privacy": "Зашыфраваны DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Ужывайце радок <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Ужывайце радок <1>{{address}}</1>.",
@@ -517,10 +516,10 @@
     "filter_updated": "Спіс паспяхова абноўлены",
     "statistics_configuration": "Канфігурацыя статыстыкі",
     "statistics_retention": "Захаванне статыстыкі",
-    "statistics_retention_desc": "Калі вы паменшыце значэнне інтэрвалу, некаторыя даныя могуць быць страчаны",
+    "statistics_retention_desc": "Калі вы зменшыце значэнне інтэрвалу, некаторыя дадзеныя могуць быць згублены",
     "statistics_clear": "Ачысціць статыстыку",
     "statistics_clear_confirm": "Вы ўпэўнены, што хочаце ачысціць статыстыку?",
-    "statistics_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання статыстыкі? Пры памяншэнні інтэрвалу, некаторыя даныя могуць быць страчаны",
+    "statistics_retention_confirm": "Вы ўпэўнены, што хочаце змяніць тэрмін захоўвання статыстыкі? Пры скарачэнні інтэрвалу дадзеныя могуць быць згублены",
     "statistics_cleared": "Статыстыка паспяхова вычышчана",
     "statistics_enable": "Уключыць статыстыку",
     "interval_hours": "{{count}} гадзіна",
@@ -568,7 +567,7 @@
     "check_desc": "Праверыць фільтрацыю імя хаста",
     "check": "Праверыць",
     "form_enter_host": "Увядзіце імя хаста",
-    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстальніцкіх правіл фільтрацыі",
+    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстацкіх правілаў фільтрацыі",
     "choose_from_list": "Абраць са спіса",
     "add_custom_list": "Дадаць свой спіс",
     "host_whitelisted": "Хост занесены ў белы спіс",
@@ -598,7 +597,7 @@
     "show_blocked_responses": "Заблакавана",
     "show_whitelisted_responses": "Белы спіс",
     "show_processed_responses": "Апрацавана",
-    "blocked_safebrowsing": "Заблакіравана згодна з базай даных Safe Browsing",
+    "blocked_safebrowsing": "Заблакавана згодна базе дадзеных Safe Browsing",
     "blocked_adult_websites": "Заблакавана Бацькоўскім кантролем",
     "blocked_threats": "Заблакавана пагроз",
     "allowed": "Дазволены",
@@ -639,9 +638,5 @@
     "safe_browsing": "Бяспечны інтэрнэт",
     "served_from_cache": "{{value}} <i>(атрымана з кэша)</i>",
     "form_error_password_length": "Пароль павінен быць не менш за {{value}} сімвалаў",
-    "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
-    "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
-    "cache_cleared": "Кэш DNS паспяхова ачышчаны",
-    "clear_cache": "Ачысціць кэш",
-    "protection_section_label": "Ахова"
+    "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яго ў <1>Агульных наладах</1> ."
 }

client/src/__locales/cs.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Nastavení DHCP IPv6",
     "form_error_required": "Povinné pole",
     "form_error_ip4_format": "Neplatná adresa IPv4",
+    "form_error_ip4_range_start_format": "Neplatná adresa IPv4 na začátku rozsahu",
+    "form_error_ip4_range_end_format": "Neplatná adresa IPv4 na konci rozsahu",
     "form_error_ip4_gateway_format": "Neplatná adresa IPv4 brány",
     "form_error_ip6_format": "Neplatná adresa IPv6",
     "form_error_ip_format": "Neplatná IP adresa",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Musí být mimo rozsah \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Musí být menší než začátek rozsahu",
     "greater_range_start_error": "Musí být větší než začátek rozsahu",
+    "greater_range_end_error": "Musí být větší než konec rozsahu",
     "subnet_error": "Adresy musí být v jedné podsíti",
     "gateway_or_subnet_invalid": "Neplatná maska podsítě",
     "dhcp_form_gateway_input": "IP brána",
@@ -165,9 +168,8 @@
     "enabled_safe_browsing_toast": "Zapnuté bezpečné prohlížení",
     "disabled_parental_toast": "Vypnutá Rodičovská kontrola",
     "enabled_parental_toast": "Zapnutá Rodičovská kontrola",
-    "disabled_safe_search_toast": "Vypnuté bezpečné vyhledávání",
-    "enabled_save_search_toast": "Zapnuté bezpečné vyhledávání",
-    "updated_save_search_toast": "Nastavení Bezpečného vyhledávání aktualizováno",
+    "disabled_safe_search_toast": "Zapnuté bezpečné vyhledávání",
+    "enabled_save_search_toast": "Vypnuté bezpečné vyhledávání",
     "enabled_table_header": "Zapnuto",
     "name_table_header": "Název",
     "list_url_table_header": "Seznam URL",
@@ -257,12 +259,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": "Rotace protokolů dotazů",
+    "query_log_retention": "Uchování 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 rotaci protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
+    "query_log_retention_confirm": "Opravdu chcete změnit uchovávání 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Rychlostní limit",
     "edns_enable": "Povolit klientskou podsíť EDNS",
     "edns_cs_desc": "Přidá možnost podsítě klienta EDNS (ECS) do odchozích požadavků a zaznamá hodnoty odeslané klienty do protokolu dotazů.",
-    "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)",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Odezva s kódem NXDOMAIN",
     "blocking_mode_null_ip": "Nulová IP: Odezva s nulovou IP adresou (0.0.0.0 pro A; :: pro AAAA)",
     "blocking_mode_custom_ip": "Vlastní IP. odezva s ručně nastavenou IP adresou",
-    "theme_auto": "Autom.",
-    "theme_light": "Světlý",
-    "theme_dark": "Tmavý",
     "upstream_dns_client_desc": "Pokud toto pole ponecháte prázdné, AdGuard Home použije servery nakonfigurované v<0>DNS nastavení</0>.",
     "tracker_source": "Zdroj slídiče",
     "source_label": "Zdroj",
@@ -457,7 +454,6 @@
     "updates_checked": "Nová verze AdGuard Home je k dispozici\n",
     "updates_version_equal": "AdGuard Home je aktuální",
     "check_updates_now": "Zkontrolovat aktualizace nyní",
-    "version_request_error": "Kontrola aktualizace se nezdařila. Zkontrolujte prosím připojení k Internetu.",
     "dns_privacy": "Soukromí DNS",
     "setup_dns_privacy_1": "<0>DNS skrze TLS:</0> Použít <1>{{address}}</1> řetězec.",
     "setup_dns_privacy_2": "<0>DNS skrze HTTPS:</0> Použít <1>{{address}}</1> řetězec.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Opravdu chcete změnit uchovávání statistik? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
     "statistics_cleared": "Statistiky úspěšně vyčištěny",
     "statistics_enable": "Povolit statistiky",
-    "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í",
     "interval_hours": "Hodiny: {{count}}",
     "interval_hours_plural": "Hodiny: {{count}}",
     "filters_configuration": "Konfigurace filtrů",
@@ -646,33 +638,5 @@
     "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é",
-    "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",
-    "clear_cache": "Vymazat mezipaměť",
-    "make_static": "Nastavit jako statickou",
-    "theme_auto_desc": "Automatický (podle barevného motivu vašeho zařízení)",
-    "theme_dark_desc": "Tmavý motiv",
-    "theme_light_desc": "Světlý motiv",
-    "disable_for_seconds": "Na {{count}} sek.",
-    "disable_for_seconds_plural": "Na {{count}} sek.",
-    "disable_for_minutes": "Na {{count}} min.",
-    "disable_for_minutes_plural": "Na {{count}} min.",
-    "disable_for_hours": "Na {{count}} hod.",
-    "disable_for_hours_plural": "Na {{count}} hod.",
-    "disable_until_tomorrow": "Do zítřka",
-    "disable_notify_for_seconds": "Vypnout ochranu na {{count}} sek.",
-    "disable_notify_for_seconds_plural": "Vypnout ochranu na {{count}} sek.",
-    "disable_notify_for_minutes": "Vypnout ochranu na {{count}} min.",
-    "disable_notify_for_minutes_plural": "Vypnout ochranu na {{count}} min.",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Poznámka:</0> Anonymizace IP je zapnuta. Můžete ji vypnout v <1>Obecných nastaveních</1>."
 }

client/src/__locales/da.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6-indstillinger",
     "form_error_required": "Obligatorisk felt",
     "form_error_ip4_format": "Ugyldig IPv4-adresse",
+    "form_error_ip4_range_start_format": "Ugyldig IPv4-startadresse for området",
+    "form_error_ip4_range_end_format": "Ugyldig IPv4-slutadresse for området",
     "form_error_ip4_gateway_format": "Ugyldig IPv4 gateway-adresse",
     "form_error_ip6_format": "Ugyldig IPv6-adresse",
     "form_error_ip_format": "Ugyldig IP-adresse",
@@ -49,8 +51,9 @@
     "out_of_range_error": "Skal være uden for området \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Skal være mindre end starten på området",
     "greater_range_start_error": "Skal være større end starten på ​​området",
+    "greater_range_end_error": "Skal være større end områdeslutning",
     "subnet_error": "Adresser ska være i ét undernet",
-    "gateway_or_subnet_invalid": "Ugyldig undernetmaske",
+    "gateway_or_subnet_invalid": "Undernetmaske ugyldig",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Undernetmaske",
     "dhcp_form_range_title": "Interval af IP-adresser",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Forældrekontrol aktiveret",
     "disabled_safe_search_toast": "Sikker søgning deaktiveret",
     "enabled_save_search_toast": "Sikker søgning aktiveret",
-    "updated_save_search_toast": "Sikker søgning opdateret",
     "enabled_table_header": "Aktiveret",
     "name_table_header": "Navn",
     "list_url_table_header": "Liste-URL",
@@ -257,12 +259,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": "Rotation af forespørgselslog",
+    "query_log_retention": "Opbevar forespørgselslogger i",
     "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 forespørgselsloggens rotationstid skal ændres? Mindskes intervalværdien, mistes nogle data",
+    "query_log_retention_confirm": "Sikker på, at du vil ændre forespørgselsloggens opbevaringperiode? Mindskes intervalværdien, mistes 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Hyppighedsgrænse",
     "edns_enable": "Aktivér EDNS-klientundernet",
     "edns_cs_desc": "Tilføj indstillingen EDNS Client Subnet (ECS) til upstream-forespørgsler og log de af klienterne sendte værdier i forespørgselsloggen.",
-    "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)",
     "blocking_ipv4_desc": "Returneret IP-adresse for en blokeret A-forespørgsel",
     "blocking_ipv6_desc": "Returneret IP-adresse for en blokeret AAAA-forespørgsel",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-kode",
     "blocking_mode_null_ip": "Null IP: Svar med nul IP-adresse (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt indstillet IP-adresse",
-    "theme_auto": "Auto",
-    "theme_light": "Lyst",
-    "theme_dark": "Mørkt",
     "upstream_dns_client_desc": "Holdes dette felt tomt, bruger AdGuard Home de i <0>DNS-indstillingerne</0> opsatte servere.",
     "tracker_source": "Tracker-kilde",
     "source_label": "Kilde",
@@ -457,7 +454,6 @@
     "updates_checked": "En ny version af AdGuard Home er tilgængelig\n",
     "updates_version_equal": "AdGuard Home er opdateret",
     "check_updates_now": "Søg efter opdateringer nu",
-    "version_request_error": "Opdateringstjek mislykkedes. Tjek internetforbindelsen.",
     "dns_privacy": "DNS-fortrolighed",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Brug <1>{{address}}</1> streng.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Brug <1>{{address}}</1> streng.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Sikker på, at du vil ændre på statistikbevaring? Mindskes intervalværdien, vil nogle data gå tabt",
     "statistics_cleared": "Statistikkerne er ryddet",
     "statistics_enable": "Aktivér statistikker",
-    "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",
     "interval_hours": "{{count}} time",
     "interval_hours_plural": "{{count}} timer",
     "filters_configuration": "Filteropsætninger",
@@ -646,33 +638,5 @@
     "safe_browsing": "Sikker Browsing",
     "served_from_cache": "{{value}} <i>(leveret fra cache)</i>",
     "form_error_password_length": "Adgangskoden skal udgøre mindst {{value}} tegn.",
-    "anonymizer_notification": "<0>Bemærk:</0> IP-anonymisering er aktiveret. Det kan deaktiveres via <1>Generelle indstillinger</1>.",
-    "confirm_dns_cache_clear": "Sikker på, at DNS-cache skal ryddes?",
-    "cache_cleared": "DNS-cache hermed ryddet",
-    "clear_cache": "Ryd cache",
-    "make_static": "Gør statisk",
-    "theme_auto_desc": "Auto (baseret på enhedens farveskema)",
-    "theme_dark_desc": "Mørkt tema",
-    "theme_light_desc": "Lyst tema",
-    "disable_for_seconds": "I {{count}} sekund",
-    "disable_for_seconds_plural": "I {{count}} sekunder",
-    "disable_for_minutes": "I {{count}} minut",
-    "disable_for_minutes_plural": "I {{count}} minutter",
-    "disable_for_hours": "I {{count}} time",
-    "disable_for_hours_plural": "I {{count}} timer",
-    "disable_until_tomorrow": "Indtil i morgen",
-    "disable_notify_for_seconds": "Deaktivere beskyttelse i {{count}} sekund",
-    "disable_notify_for_seconds_plural": "Deaktivere beskyttelse i {{count}} sekunder",
-    "disable_notify_for_minutes": "Deaktivere beskyttelse i {{count}} minut",
-    "disable_notify_for_minutes_plural": "Deaktivere beskyttelse i {{count}} minutter",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Bemærk:</0> IP-anonymisering er aktiveret. Det kan deaktiveres via <1>Generelle indstillinger</1>."
 }

client/src/__locales/de.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP-IPv6-Einstellungen",
     "form_error_required": "Pflichtfeld",
     "form_error_ip4_format": "Ungültige IPv4-Adresse",
+    "form_error_ip4_range_start_format": "Ungültiger Bereichsbeginn der IPv4-Adresse",
+    "form_error_ip4_range_end_format": "Ungültiges Bereichsende der IPv4-Adresse",
     "form_error_ip4_gateway_format": "Ungültige IPv4-Adresse des Gateways",
     "form_error_ip6_format": "Ungültige IPv6-Adresse",
     "form_error_ip_format": "Ungültige IP-Adresse",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Muss außerhalb des Bereichs „{{start}}“-„{{end}}“ liegen",
     "lower_range_start_error": "Muss niedriger als der Bereichsbeginn sein",
     "greater_range_start_error": "Muss größer als der Bereichsbeginn sein",
+    "greater_range_end_error": "Muss größer als das Bereichsende sein",
     "subnet_error": "Die Adressen müssen innerhalb eines Subnetzes liegen",
     "gateway_or_subnet_invalid": "Ungültige Subnetzmaske",
     "dhcp_form_gateway_input": "Gateway-IP",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Kindersicherung aktiviert",
     "disabled_safe_search_toast": "Sichere Suche deaktiviert",
     "enabled_save_search_toast": "Sichere Suche aktiviert",
-    "updated_save_search_toast": "Einstellungen für die sichere Suche aktualisiert",
     "enabled_table_header": "Aktiviert",
     "name_table_header": "Name",
     "list_url_table_header": "Adressliste",
@@ -257,12 +259,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": "Rotation der Abfrageprotokolle",
+    "query_log_retention": "Abfrageprotokolle aufbewahren",
     "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 Abfrageprotokollrotation wirklich ändern? Wenn Sie den Intervallwert verringern, gehen einige Daten verloren",
+    "query_log_retention_confirm": "Möchten Sie die Aufbewahrung des Abfrageprotokolls wirklich ändern? Wenn Sie den Zeitabstand 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Begrenzungswert",
     "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.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Mit NXDOMAIN-Code antworten",
     "blocking_mode_null_ip": "Null-IP: Antworten mit Null-IP-Adresse (0.0.0.0.0 für A; :: für AAAA)",
     "blocking_mode_custom_ip": "Benutzerdefinierte IP: Mit einer manuell eingestellten IP-Adresse antworten",
-    "theme_auto": "Auto",
-    "theme_light": "Hell",
-    "theme_dark": "Dunkel",
     "upstream_dns_client_desc": "Wenn Sie dieses Feld leer lassen, verwendet AdGuard Home die Server, die in den <0>DNS-Einstellungen</0> konfiguriert sind.",
     "tracker_source": "Tracker-Quelle",
     "source_label": "Quelle",
@@ -457,7 +454,6 @@
     "updates_checked": "Neue Version von AdGuard Home ist jetzt verfügbar",
     "updates_version_equal": "AdGuard Home ist aktuell",
     "check_updates_now": "Jetzt nach Aktualisierungen suchen",
-    "version_request_error": "Aktualisierungsprüfung fehlgeschlagen. Bitte überprüfen Sie Ihre Internetverbindung.",
     "dns_privacy": "DNS-Datenschutz",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Zeichenkette <1>{{address}}</1> verwenden.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Möchten Sie wirklich die Aufbewahrung der Statistiken ändern? Wenn Sie den Zeitabstand verringern, gehen einige Daten verloren.",
     "statistics_cleared": "Statistiken wurden erfolgreich gelöscht",
     "statistics_enable": "Statistiken aktivieren",
-    "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",
     "interval_hours": "{{count}} Stunde",
     "interval_hours_plural": "{{count}} Stunden",
     "filters_configuration": "Filterkonfiguration",
@@ -646,33 +638,5 @@
     "safe_browsing": "Internetsicherheit",
     "served_from_cache": "{{value}} <i>(aus dem Cache abgerufen)</i>",
     "form_error_password_length": "Das Passwort muss mindestens {{value}} Zeichen enthalten",
-    "anonymizer_notification": "<0>Hinweis:</0> Die IP-Anonymisierung ist aktiviert. Sie können sie in den <1>Allgemeinen Einstellungen</1> deaktivieren.",
-    "confirm_dns_cache_clear": "Möchten Sie den DNS-Cache wirklich leeren?",
-    "cache_cleared": "DNS-Cache erfolgreich geleert",
-    "clear_cache": "Cache leeren",
-    "make_static": "Statisch machen",
-    "theme_auto_desc": "Automatisch (basierend auf dem Farbschema Ihres Geräts)",
-    "theme_dark_desc": "Dunkles Farbschema",
-    "theme_light_desc": "Helles Farbschema",
-    "disable_for_seconds": "Für {{count}} Sekunde",
-    "disable_for_seconds_plural": "Für {{count}} Sekunden",
-    "disable_for_minutes": "Für {{count}} Minute",
-    "disable_for_minutes_plural": "Für {{count}} Minuten",
-    "disable_for_hours": "Für {{count}} Stunde",
-    "disable_for_hours_plural": "Für {{count}} Stunden",
-    "disable_until_tomorrow": "Bis morgen",
-    "disable_notify_for_seconds": "Schutz für {{count}} Sekunde deaktivieren",
-    "disable_notify_for_seconds_plural": "Schutz für {{count}} Sekunden deaktivieren",
-    "disable_notify_for_minutes": "Schutz für {{count}} Minute deaktivieren",
-    "disable_notify_for_minutes_plural": "Schutz für {{count}} Minuten deaktivieren",
-    "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",
-    "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"
+    "anonymizer_notification": "<0>Hinweis:</0> Die IP-Anonymisierung ist aktiviert. Sie können sie in den <1>Allgemeinen Einstellungen</1> deaktivieren."
 }

client/src/__locales/en.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 Settings",
     "form_error_required": "Required field",
     "form_error_ip4_format": "Invalid IPv4 address",
+    "form_error_ip4_range_start_format": "Invalid IPv4 address of the range start",
+    "form_error_ip4_range_end_format": "Invalid IPv4 address of the range end",
     "form_error_ip4_gateway_format": "Invalid IPv4 address of the gateway",
     "form_error_ip6_format": "Invalid IPv6 address",
     "form_error_ip_format": "Invalid IP address",
@@ -49,8 +51,9 @@
     "out_of_range_error": "Must be out of range \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Must be lower than range start",
     "greater_range_start_error": "Must be greater than range start",
+    "greater_range_end_error": "Must be greater than range end",
     "subnet_error": "Addresses must be in one subnet",
-    "gateway_or_subnet_invalid": "Invalid subnet mask",
+    "gateway_or_subnet_invalid": "Subnet mask invalid",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Range of IP addresses",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Enabled Parental Control",
     "disabled_safe_search_toast": "Disabled Safe Search",
     "enabled_save_search_toast": "Enabled Safe Search",
-    "updated_save_search_toast": "Safe Search settings updated",
     "enabled_table_header": "Enabled",
     "name_table_header": "Name",
     "list_url_table_header": "List URL",
@@ -257,12 +259,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 rotation",
+    "query_log_retention": "Query logs retention",
     "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 rotation? If you decrease the interval value, some data will be lost",
+    "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",
     "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",
@@ -291,8 +293,6 @@
     "rate_limit": "Rate limit",
     "edns_enable": "Enable EDNS client subnet",
     "edns_cs_desc": "Add the EDNS Client Subnet option (ECS) to upstream requests and log the values sent by the clients in the query log.",
-    "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.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Respond with NXDOMAIN code",
     "blocking_mode_null_ip": "Null IP: Respond with zero IP address (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Custom IP: Respond with a manually set IP address",
-    "theme_auto": "Auto",
-    "theme_light": "Light",
-    "theme_dark": "Dark",
     "upstream_dns_client_desc": "If you keep this field empty, AdGuard Home will use the servers configured in the <0>DNS settings</0>.",
     "tracker_source": "Tracker source",
     "source_label": "Source",
@@ -457,7 +454,6 @@
     "updates_checked": "A new version of AdGuard Home is available",
     "updates_version_equal": "AdGuard Home is up-to-date",
     "check_updates_now": "Check for updates now",
-    "version_request_error": "Update check failed. Please check your Internet connection.",
     "dns_privacy": "DNS Privacy",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Use <1>{{address}}</1> string.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Are you sure you want to change statistics retention? If you decrease the interval value, some data will be lost",
     "statistics_cleared": "Statistics successfully cleared",
     "statistics_enable": "Enable statistics",
-    "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",
     "interval_hours": "{{count}} hour",
     "interval_hours_plural": "{{count}} hours",
     "filters_configuration": "Filters configuration",
@@ -646,33 +638,5 @@
     "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",
-    "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",
-    "clear_cache": "Clear cache",
-    "make_static": "Make static",
-    "theme_auto_desc": "Auto (based on the color scheme of your device)",
-    "theme_dark_desc": "Dark theme",
-    "theme_light_desc": "Light theme",
-    "disable_for_seconds": "For {{count}} second",
-    "disable_for_seconds_plural": "For {{count}} seconds",
-    "disable_for_minutes": "For {{count}} minute",
-    "disable_for_minutes_plural": "For {{count}} minutes",
-    "disable_for_hours": "For {{count}} hour",
-    "disable_for_hours_plural": "For {{count}} hours",
-    "disable_until_tomorrow": "Until tomorrow",
-    "disable_notify_for_seconds": "Disable protection for {{count}} second",
-    "disable_notify_for_seconds_plural": "Disable protection for {{count}} seconds",
-    "disable_notify_for_minutes": "Disable protection for {{count}} minute",
-    "disable_notify_for_minutes_plural": "Disable protection for {{count}} minutes",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Note:</0> IP anonymization is enabled. You can disable it in <1>General settings</1>."
 }

client/src/__locales/es.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Configuración DHCP IPv6",
     "form_error_required": "Campo obligatorio",
     "form_error_ip4_format": "Dirección IPv4 no válida",
+    "form_error_ip4_range_start_format": "Dirección IPv4 no válida del inicio de rango",
+    "form_error_ip4_range_end_format": "Dirección IPv4 no válida del final de rango",
     "form_error_ip4_gateway_format": "Dirección IPv4 no válida de la puerta de enlace",
     "form_error_ip6_format": "Dirección IPv6 no válida",
     "form_error_ip_format": "Dirección IP no válida",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Debe estar fuera del rango \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Debe ser inferior que el inicio de rango",
     "greater_range_start_error": "Debe ser mayor que el inicio de rango",
+    "greater_range_end_error": "Debe ser mayor que el final de rango",
     "subnet_error": "Las direcciones deben estar en una subred",
     "gateway_or_subnet_invalid": "Máscara de subred no válida",
     "dhcp_form_gateway_input": "IP de puerta de enlace",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Control parental habilitado",
     "disabled_safe_search_toast": "Búsqueda segura deshabilitada",
     "enabled_save_search_toast": "Búsqueda segura habilitada",
-    "updated_save_search_toast": "Configuración de búsqueda segura actualizada",
     "enabled_table_header": "Habilitado",
     "name_table_header": "Nombre",
     "list_url_table_header": "URL de la lista",
@@ -257,12 +259,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": "Rotanción de registros de consultas",
+    "query_log_retention": "Retenció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á seguro de que deseas cambiar la rotación del registro de consultas? Si reduces el valor del intervalo, se perderán algunos datos",
+    "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",
     "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",
@@ -291,8 +293,6 @@
     "rate_limit": "Límite de cantidad",
     "edns_enable": "Habilitar subred de cliente EDNS",
     "edns_cs_desc": "Añade la opción subred de cliente EDNS (ECS) a las peticiones del DNS de subida y registra los valores enviados por los clientes en el registro de consultas.",
-    "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.",
     "blocking_ipv4_desc": "Dirección IP devolverá una petición A bloqueada",
     "blocking_ipv6_desc": "Dirección IP devolverá una petición AAAA bloqueada",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Responde con el código NXDOMAIN",
     "blocking_mode_null_ip": "IP nulo: Responde con dirección IP cero (0.0.0.0 para A; :: para AAAA)",
     "blocking_mode_custom_ip": "IP personalizada: Responde con una dirección IP establecida manualmente",
-    "theme_auto": "Auto",
-    "theme_light": "Claro",
-    "theme_dark": "Oscuro",
     "upstream_dns_client_desc": "Si se mantiene este campo vacío, AdGuard Home utilizará los servidores configurados en la <0>configuración del DNS</0>.",
     "tracker_source": "Fuente del rastreador",
     "source_label": "Fuente",
@@ -457,7 +454,6 @@
     "updates_checked": "La nueva versión de AdGuard Home está disponible",
     "updates_version_equal": "AdGuard Home está actualizado",
     "check_updates_now": "Buscar actualizaciones ahora",
-    "version_request_error": "Error buscar la actualización. Comprueba tu conexión a Internet.",
     "dns_privacy": "DNS cifrado",
     "setup_dns_privacy_1": "<0>DNS mediante TLS:</0> Utiliza la cadena <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS mediante HTTPS:</0> Utiliza la cadena <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "¿Estás seguro de que deseas cambiar la retención de estadísticas? Si disminuye el valor del intervalo, se perderán algunos datos",
     "statistics_cleared": "Estadísticas borradas correctamente",
     "statistics_enable": "Habilitar estadísticas",
-    "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",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
     "filters_configuration": "Configuración de filtros",
@@ -646,33 +638,5 @@
     "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",
-    "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",
-    "clear_cache": "Borrar caché",
-    "make_static": "Hacer estático",
-    "theme_auto_desc": "Automático (basado en el esquema de colores de tu dispositivo)",
-    "theme_dark_desc": "Tema oscuro",
-    "theme_light_desc": "Tema claro",
-    "disable_for_seconds": "Por {{count}} segundo",
-    "disable_for_seconds_plural": "Por {{count}} segundos",
-    "disable_for_minutes": "Por {{count}} minuto",
-    "disable_for_minutes_plural": "Por {{count}} minutos",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Nota:</0> La anonimización de IP está habilitada. Puedes deshabilitarla en <1>Configuración general</1>."
 }

client/src/__locales/fa.json

@@ -32,6 +32,8 @@
     "dhcp_config_saved": "پیکربندی سرور DHCP ذخیره شده است",
     "form_error_required": "فیلد مورد نیاز",
     "form_error_ip4_format": "فرمت نامعتبر IPv4",
+    "form_error_ip4_range_start_format": "قالب IPv4 شروع دامنه نامعتبر است",
+    "form_error_ip4_range_end_format": "قالب IPv4 پایان دامنه نامعتبر است",
     "form_error_ip4_gateway_format": "قالب IPv4 درگاه نامعتبر است",
     "form_error_ip6_format": "فرمت نامعتبر IPv6",
     "form_error_ip_format": "فرمت IPv4 نامعتبر است",
@@ -42,6 +44,7 @@
     "out_of_range_error": "باید خارج از دامنه باشد\"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "باید کمتر از شروع دامنه باشد",
     "greater_range_start_error": "باید بیشتر از شروع دامنه باشد",
+    "greater_range_end_error": "باید بیشتر از پایان دامنه باشد",
     "subnet_error": "آدرس ها باید در یک زیرشبکه باشند",
     "gateway_or_subnet_invalid": "پوشش زیرشبکه نامعتبر است",
     "dhcp_form_gateway_input": "آی پی دروازه",
@@ -268,8 +271,6 @@
     "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": "منبع",
@@ -421,7 +422,6 @@
     "updates_checked": "نسخه جدیدی از AdGuard Home در دسترس است",
     "updates_version_equal": "AdGuard Home بروز است",
     "check_updates_now": "حالا بررسی برای بروز رسانی",
-    "version_request_error": "بررسی بروزرسانی موفق نشد.لطفا ارتباط اینترنتی خود را بررسی کنید",
     "dns_privacy": "حریم خصوصی DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> استفاده از<1>{{address}}</1> .",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> استفاده از <1>{{address}}</1> .",
@@ -569,6 +569,5 @@
     "use_saved_key": "از کلید ذخیره شده قبلی استفاده کنید",
     "parental_control": "نظارت والدین",
     "safe_browsing": "وب گردی اَمن",
-    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد.",
-    "protection_section_label": "حفاظت"
+    "form_error_password_length": "رمزعبور باید حداقل {{value}} کاراکتر باشد."
 }

client/src/__locales/fi.json

@@ -9,12 +9,12 @@
     "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_desc": "DNS-palvelimet, joita AdGuard Home käyttää paikallisille PTR-kyselyille. Näitä palvelimia käytetään yksityistä IP-osoitetta käyttävien PTR-kyselyiden 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",
     "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).",
+    "resolve_clients_desc": "Selvitä päätelaitteiden IP-osoitteiden isäntänimet käänteisesti lähettämällä PTR-kyselyt sopiville resolvereille (yksityiset DNS-palvelimet paikallisille päätelaitteille, lähtevät palvelimet päätelaitteille, joilla on julkiset IP-osoitteet).",
     "use_private_ptr_resolvers_title": "Käytä yksityisiä käänteisiä DNS-resolvereita",
     "use_private_ptr_resolvers_desc": "Suorita käänteiset DNS-selvitykset paikallisesti tarjotuille osoitteille käyttäen näitä ylävirran palvelimia. Jos ei käytössä, vastaa AdGuard Home kaikkiin sen tyyppisiin PTR-pyyntöihin NXDOMAIN-arvolla, pois lukien DHCP, /etc/hosts, yms. -tiedoista tunnistettut päätelaitteet.",
     "check_dhcp_servers": "Etsi DHCP-palvelimia",
@@ -24,7 +24,7 @@
     "unavailable_dhcp": "DHCP ei ole käytettävissä",
     "unavailable_dhcp_desc": "AdGuard Home ei voi suorittaa DHCP-palvelinta käyttöjärjestelmässäsi",
     "dhcp_title": "DHCP-palvelin (kokeellinen!)",
-    "dhcp_description": "Jollei reitittimesi tarjoa DHCP-asetuksia, voit käyttää AdGuard Homen omaa sisäänrakennettua DHCP-palvelinta.",
+    "dhcp_description": "Jos reitittimessäsi ei ole DHCP-asetuksia, voit käyttää AdGuard Homen omaa sisäänrakennettua DHCP-palvelinta.",
     "dhcp_enable": "Ota DHCP-palvelin käyttöön",
     "dhcp_disable": "Poista DHCP-palvelin käytöstä",
     "dhcp_not_found": "On turvallista ottaa sisäänrakennettu DHCP-palvelin käyttöön, koska AdGuard Home ei havainnut verkossa muita aktiivisia DHCP-palvelimia. Suosittelemme, että varmistat tämän vielä itse, koska automaattinen tunnistus ei ole 100% varma.",
@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP:n IPv6-asetukset",
     "form_error_required": "Pakollinen kenttä",
     "form_error_ip4_format": "Virheellinen IPv4-osoite",
+    "form_error_ip4_range_start_format": "Virheellinen IPv4-osoitealueen aloitusosoite",
+    "form_error_ip4_range_end_format": "Virheellinen IPv4-osoitealueen päätösosoite",
     "form_error_ip4_gateway_format": "Virheellinen yhdyskäytävän IPv4-osoite",
     "form_error_ip6_format": "Virheellinen IPv6-osoite",
     "form_error_ip_format": "Virheellinen IP-osoite",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Oltava alueen \"{{start}}\" - \"{{end}}\" ulkopuolella",
     "lower_range_start_error": "Oltava alueen aloitusarvoa pienempi",
     "greater_range_start_error": "Oltava alueen aloitusarvoa suurempi",
+    "greater_range_end_error": "Oltava alueen päätösarvoa pienempi",
     "subnet_error": "Osoitteiden tulee olla yhdessä aliverkossa",
     "gateway_or_subnet_invalid": "Virheellinen aliverkon peite",
     "dhcp_form_gateway_input": "Yhdyskäytävän IP-osoite",
@@ -75,7 +78,7 @@
     "dhcp_add_static_lease": "Lisää kiinteä laina",
     "dhcp_reset_leases": "Tyhjennä kaikki lainat",
     "dhcp_reset_leases_confirm": "Haluatko varmasti tyhjentää kaikki lainat?",
-    "dhcp_reset_leases_success": "DHCP-lainojen tyhjennys onnistui",
+    "dhcp_reset_leases_success": "DHCP-lainat tyhjennettiin",
     "dhcp_reset": "Haluatko varmasti palauttaa DHCP-asetukset?",
     "country": "Maa",
     "city": "Kaupunki",
@@ -86,7 +89,7 @@
     "request_details": "Pyynnön tiedot",
     "client_details": "Päätelaitteen tiedot",
     "details": "Yksityiskohdat",
-    "back": "Palaa takaisin",
+    "back": "Takaisin",
     "dashboard": "Tila",
     "settings": "Asetukset",
     "filters": "Suodattimet",
@@ -146,8 +149,8 @@
     "no_servers_specified": "Palvelimia ei ole määritetty",
     "general_settings": "Yleiset asetukset",
     "dns_settings": "DNS-asetukset",
-    "dns_blocklists": "DNS-estot",
-    "dns_allowlists": "DNS-sallinnat",
+    "dns_blocklists": "DNS-estolistat",
+    "dns_allowlists": "DNS-sallittujen listat",
     "dns_blocklists_desc": "AdGuard Home estää estolistalla olevat verkkotunnukset.",
     "dns_allowlists_desc": "DNS-sallittujen listalla olevat verkkotunnukset sallitaan myös silloin, jos ne ovat jollain muulla estolistalla.",
     "custom_filtering_rules": "Omat suodatussäännöt",
@@ -167,11 +170,10 @@
     "enabled_parental_toast": "Lapsilukko otettiin käyttöön",
     "disabled_safe_search_toast": "Turvallinen haku poistettiin käytöstä",
     "enabled_save_search_toast": "Turvallinen haku otettiin käyttöön",
-    "updated_save_search_toast": "Turvallisen haun asetukset päivitettiin",
     "enabled_table_header": "Käytössä",
     "name_table_header": "Nimi",
     "list_url_table_header": "Listan URL",
-    "rules_count_table_header": "Sääntöjen määrä",
+    "rules_count_table_header": "Sääntöjä",
     "last_time_updated_table_header": "Viimeisin päivitys",
     "actions_table_header": "Toiminnot",
     "request_table_header": "Pyyntö",
@@ -254,15 +256,15 @@
     "query_log_response_status": "Tila: {{value}}",
     "query_log_filtered": "Suodattanut {{filter}}",
     "query_log_confirm_clear": "Haluatko varmasti tyhjentää pyyntöhistorian?",
-    "query_log_cleared": "Pyyntöhistorian tyhjennys onnistui",
-    "query_log_updated": "Pyyntöhistorian päivitys onnistui",
+    "query_log_cleared": "Pyyntöhistoria tyhjennettiin",
+    "query_log_updated": "Pyyntöhistoria päivitettiin",
     "query_log_clear": "Tyhjennä pyyntöhistoria",
-    "query_log_retention": "Kyselylokien kierto",
+    "query_log_retention": "Pyyntöhistorian säilytys",
     "query_log_enable": "Käytä historiaa",
     "query_log_configuration": "Historian määritys",
     "query_log_disabled": "Pyyntöhistoria ei ole käytössä. Voit ottaa sen käyttöön <0>asetuksissa</0>",
     "query_log_strict_search": "Käytä tarkalle haulle lainausmerkkejä",
-    "query_log_retention_confirm": "Haluatko varmasti muuttaa kyselylokin kiertoa? Jos pienennät intervalliarvoa, osa tiedoista menetetään",
+    "query_log_retention_confirm": "Haluatko varmasti muuttaa pyyntöhistoriasi säilytysaikaa? Jos lyhennät aikaa, joitakin tietoja menetetään",
     "anonymize_client_ip": "Piilota päätelaitteen IP-osoite",
     "anonymize_client_ip_desc": "Älä tallenna päätelaitteen täydellistä IP-osoitetta historiaan ja tilastoihin.",
     "dns_config": "DNS-palvelimen määritys",
@@ -273,7 +275,7 @@
     "nxdomain": "NXDOMAIN",
     "refused": "REFUSED",
     "null_ip": "Tyhjä IP",
-    "custom_ip": "Mukautettu IP-osoite",
+    "custom_ip": "Oma IP-osoite",
     "blocking_ipv4": "IPv4-esto",
     "blocking_ipv6": "IPv6-esto",
     "dnscrypt": "DNSCrypt",
@@ -291,8 +293,6 @@
     "rate_limit": "Pyyntöjen ajoitus",
     "edns_enable": "Käytä EDNS-päätelaitealivekkoa",
     "edns_cs_desc": "Lähetä päätelaitteiden aliverkot DNS-palvelimille.",
-    "edns_use_custom_ip": "Käytä omaa IP-osoitetta EDNS:lle",
-    "edns_use_custom_ip_desc": "Salli oman IP-osoitteen käyttö EDNS-mekanismille.",
     "rate_limit_desc": "Päätelaitteelle sallittu pyyntöjen enimmäismäärä sekunnissa. Arvo 0 tarkoittaa rajatonta.",
     "blocking_ipv4_desc": "Estettyyn A-pyyntöön palautettava IP-osoite",
     "blocking_ipv6_desc": "Estettyyn AAAA-pyyntöön palautettava IP-osoite",
@@ -300,10 +300,7 @@
     "blocking_mode_refused": "REFUSED: Vastaa REFUSED-koodilla",
     "blocking_mode_nxdomain": "NXDOMAIN: Vastaa NXDOMAIN-koodilla",
     "blocking_mode_null_ip": "Tyhjä IP: Vastaa IP-nollaosoitteella (0.0.0.0 korvaa A; :: korvaa AAAA)",
-    "blocking_mode_custom_ip": "Mukautettu IP: Vastaa manuaalisesti määritetyllä IP-osoitteella",
-    "theme_auto": "Automaattinen",
-    "theme_light": "Vaalea",
-    "theme_dark": "Tumma",
+    "blocking_mode_custom_ip": "Oma IP: Vastaa itse määritetyllä IP-osoitteella",
     "upstream_dns_client_desc": "Jos tämä on tyhjä, käyttää AdGuard Home <0>DNS-asetuksissa</0> määritettyjä palvelimia.",
     "tracker_source": "Seurannan lähde",
     "source_label": "Lähde",
@@ -370,7 +367,7 @@
     "encryption_config_saved": "Salausasetukset tallennettiin",
     "encryption_server": "Palvelimen nimi",
     "encryption_server_enter": "Syötä verkkotunnuksesi",
-    "encryption_server_desc": "Jos määritetty, AdGuard Home tunnistaa ClientID-tunnisteet, vastaa DDR-pyyntöihin ja suorittaa yhteyden lisätarkistuksia. Jos ei määritetty, nämä ominaisuudet eivät ole käytössä. On vastattava yhtä varmenteen DNS-nimistä.",
+    "encryption_server_desc": "Jos määritetty, AdGuard Home tunnistaa ClientID-tunnisteet, vastaa DDR-kyselyihin ja suorittaa yhteyden lisätarkistuksia. Jos ei määritetty, nämä ominaisuudet eivät ole käytössä. On vastattava yhtä varmenteen DNS-nimistä.",
     "encryption_redirect": "Automaattinen HTTPS-ohjaus",
     "encryption_redirect_desc": "Jos käytössä, AdGuard Home ohjaa HTTP-osoitteet automaattisesti HTTPS-osoitteisiin.",
     "encryption_https": "HTTPS-portti",
@@ -419,7 +416,7 @@
     "clients_title": "Pysyvät päätelaitteet",
     "clients_desc": "Määritä pysyvät AdGuard Homeen yhdistetyt päätelaitetiedot.",
     "settings_global": "Yleinen",
-    "settings_custom": "Mukautettu",
+    "settings_custom": "Muut aiheet",
     "table_client": "Asiakas",
     "table_name": "Nimi",
     "save_btn": "Tallenna",
@@ -457,7 +454,6 @@
     "updates_checked": "Uusi versio AdGuard Home -ohjelmasta on saatavana\n",
     "updates_version_equal": "AdGuard Home on ajan tasalla",
     "check_updates_now": "Tarkista päivitykset nyt",
-    "version_request_error": "Päivitystarkistus epäonnistui. Tarkista Internet-yhteytesi.",
     "dns_privacy": "DNS-tietosuoja",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Käytä merkkijonoa <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Käytä merkkijonoa <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Haluatko varmasti muuttaa tilastojen säilytysaikaa? Jos aikaa lyhennetään, joitakin tietoja menetetään.",
     "statistics_cleared": "Tilastot tyhjennettiin",
     "statistics_enable": "Ota tilastointi käyttöön",
-    "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.",
     "interval_hours": "{{count}} tunti",
     "interval_hours_plural": "{{count}} tuntia",
     "filters_configuration": "Suodatinten määritys",
@@ -625,9 +617,9 @@
     "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.",
+    "cache_optimistic_desc": "Pakota AdGuard Home vastaamaan välimuistista vaikka sen tiedot olisivat vanhentuneet. Pyri samalla myös päivittämään tiedot.",
     "filter_category_general": "Yleiset",
-    "filter_category_security": "Tietoturva",
+    "filter_category_security": "Turvallisuus",
     "filter_category_regional": "Alueelliset",
     "filter_category_other": "Muut",
     "filter_category_general_desc": "Listat, jotka estävät seurannan ja mainokset useimmilla laitteilla",
@@ -646,33 +638,5 @@
     "safe_browsing": "Turvallinen selaus",
     "served_from_cache": "{{value}} <i>(jaettu välimuistista)</i>",
     "form_error_password_length": "Salasanan on oltava ainakin {{value}} merkkiä",
-    "anonymizer_notification": "<0>Huomioi:</0> IP-osoitteen anonymisointi on käytössä. Voit poistaa sen käytöstä <1>Yleisistä asetuksista</1>.",
-    "confirm_dns_cache_clear": "Haluatko varmasti tyhjentää DNS-välimuistin?",
-    "cache_cleared": "DNS-välimuistin tyhjennys onnistui",
-    "clear_cache": "Tyhjennä välimuisti",
-    "make_static": "Tallenna kiinteäksi",
-    "theme_auto_desc": "Automaattinen (seuraa laitteen väriteemaa)",
-    "theme_dark_desc": "Tumma teema",
-    "theme_light_desc": "Vaalea teema",
-    "disable_for_seconds": "{{count}} sekunniksi",
-    "disable_for_seconds_plural": "{{count}} sekunniksi",
-    "disable_for_minutes": "{{count}} minuutiksi",
-    "disable_for_minutes_plural": "{{count}} minuutiksi",
-    "disable_for_hours": "{{count}} tunniksi",
-    "disable_for_hours_plural": "{{count}} tunniksi",
-    "disable_until_tomorrow": "Huomiseen asti",
-    "disable_notify_for_seconds": "Poista suojaus käytöstä {{count}} sekunniksi",
-    "disable_notify_for_seconds_plural": "Poista suojaus käytöstä {{count}} sekunniksi",
-    "disable_notify_for_minutes": "Poista suojaus käytöstä {{count}} minuutiksi",
-    "disable_notify_for_minutes_plural": "Poista suojaus käytöstä {{count}} minuutiksi",
-    "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",
-    "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"
+    "anonymizer_notification": "<0>Huomioi:</0> IP-osoitteen anonymisointi on käytössä. Voit poistaa sen käytöstä <1>Yleisistä asetuksista</1>."
 }

client/src/__locales/fr.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Paramètres IPv6 du DHCP",
     "form_error_required": "Champ requis",
     "form_error_ip4_format": "Adresse IPv4 invalide",
+    "form_error_ip4_range_start_format": "Adresse de début de plage IPv4 incorrecte",
+    "form_error_ip4_range_end_format": "Adresse de fin de plage IPv4 incorrecte",
     "form_error_ip4_gateway_format": "Adresse de passerelle IPv4 invalide",
     "form_error_ip6_format": "Adresse IPv6 invalide",
     "form_error_ip_format": "Adresse IP invalide",
@@ -49,8 +51,9 @@
     "out_of_range_error": "Doit être hors plage « {{start}} » - « {{end}} »",
     "lower_range_start_error": "Doit être inférieur au début de plage",
     "greater_range_start_error": "Doit être supérieur au début de plage",
+    "greater_range_end_error": "Doit être supérieur à la fin de plage",
     "subnet_error": "Les adresses doivent être dans le même sous-réseau",
-    "gateway_or_subnet_invalid": "Masque de sous-réseau invalide.",
+    "gateway_or_subnet_invalid": "Masque de sous-réseau invalide",
     "dhcp_form_gateway_input": "IP de la passerelle",
     "dhcp_form_subnet_input": "Masque de sous-réseau",
     "dhcp_form_range_title": "Rangée des adresses IP",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Contrôle Parental activé",
     "disabled_safe_search_toast": "Recherche Sécurisée désactivée",
     "enabled_save_search_toast": "Recherche Sécurisée activée",
-    "updated_save_search_toast": "Les paramètres de Recherche sécurisée sont mis à jour",
     "enabled_table_header": "Activé",
     "name_table_header": "Nom",
     "list_url_table_header": "URL de la liste",
@@ -223,7 +225,7 @@
     "updated_upstream_dns_toast": "Serveurs en amont enregistrés",
     "dns_test_ok_toast": "Les serveurs DNS spécifiés fonctionnent correctement",
     "dns_test_not_ok_toast": "Impossible d'utiliser le serveur « {{key}} »: veuillez vérifier si le nom saisi est bien correct",
-    "dns_test_warning_toast": "L'amont « {{key}} » ne répond pas aux demandes de test et peut ne pas fonctionner correctement",
+    "dns_test_warning_toast": "L'amont «{{key}}» ne répond pas aux demandes de test et peut ne pas fonctionner correctement",
     "unblock": "Débloquer",
     "block": "Bloquer",
     "disallow_this_client": "Interdire ce client",
@@ -257,12 +259,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": "Rotation des journaux de requêtes",
+    "query_log_retention": "Rétention du journal des 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 souhaiter modifier la rotation 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 vouloir modifier la rétention 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Limite de taux",
     "edns_enable": "Activer le sous-réseau du client EDNS",
     "edns_cs_desc": "Ajouter l'option du sous-réseau Client EDNS (ECS) au requêtes en amont et enregistrer les valeurs envoyées par les clients dans le journal des requêtes.",
-    "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é.",
     "blocking_ipv4_desc": "Adresse IP à renvoyer pour une demande A bloquée",
     "blocking_ipv6_desc": "Adresse IP à renvoyer pour une demande AAAA bloquée",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN : Répondre avec le code NXDOMAIN",
     "blocking_mode_null_ip": "IP nulle : Répondre avec une adresse IP nulle (0.0.0.0 pour A ; :: pour AAAA)",
     "blocking_mode_custom_ip": "IP personnalisée : Répondre avec une adresse IP définie manuellement",
-    "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>.",
     "tracker_source": "Source du traceur",
     "source_label": "Source",
@@ -457,7 +454,6 @@
     "updates_checked": "Une nouvelle version de AdGuard Home est disponible",
     "updates_version_equal": "AdGuard Home est à jour",
     "check_updates_now": "Vérifier les mises à jour",
-    "version_request_error": "Impossible de vérifier les mises à jour. Veuillez vérifier votre connexion internet.",
     "dns_privacy": "Confidentialité DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS :</0> Utiliser le string <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS :</0> Utiliser le string <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Êtes-vous sûr de vouloir modifier le maintien des statistiques ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
     "statistics_cleared": "Statistiques effacées",
     "statistics_enable": "Activer les statistiques",
-    "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",
     "interval_hours": "{{count}} heure",
     "interval_hours_plural": "{{count}} heures",
     "filters_configuration": "Configuration des filtres",
@@ -646,33 +638,5 @@
     "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",
-    "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é",
-    "clear_cache": "Vider le cache",
-    "make_static": "Rendre statique",
-    "theme_auto_desc": "Auto (en fonction de la palette de couleurs de votre appareil)",
-    "theme_dark_desc": "Thème sombre",
-    "theme_light_desc": "Thème clair",
-    "disable_for_seconds": "Pendant {{count}} seconde",
-    "disable_for_seconds_plural": "Pendant {{count}} secondes",
-    "disable_for_minutes": "Pendant {{count}} minute",
-    "disable_for_minutes_plural": "Pendant {{count}} minutes",
-    "disable_for_hours": "Pendant {{count}} heure",
-    "disable_for_hours_plural": "Pendant {{count}} heures",
-    "disable_until_tomorrow": "Jusqu'à demain",
-    "disable_notify_for_seconds": "Désactiver la protection pendant {{count}} seconde",
-    "disable_notify_for_seconds_plural": "Désactiver la protection pendant {{count}} secondes",
-    "disable_notify_for_minutes": "Désactiver la protection pendant {{count}} minute",
-    "disable_notify_for_minutes_plural": "Désactiver la protection pendant {{count}} minutes",
-    "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}}",
-    "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"
+    "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>."
 }

client/src/__locales/hr.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 postavke",
     "form_error_required": "Obavezno polje",
     "form_error_ip4_format": "Nevažeća IPv4 adresa",
+    "form_error_ip4_range_start_format": "Nepravilan početak ranga IPv4 adresa",
+    "form_error_ip4_range_end_format": "Nepravilan kraj ranga IPv4 adresa",
     "form_error_ip4_gateway_format": "Nepravilna IPV4 adresa čvora",
     "form_error_ip6_format": "Nevažeći IPv6 adresa",
     "form_error_ip_format": "Nepravilna IP adresa",
@@ -49,8 +51,9 @@
     "out_of_range_error": "Mora biti izvan ranga \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Mora biti niže od početnog ranga",
     "greater_range_start_error": "Mora biti veće od krajnjeg ranga",
+    "greater_range_end_error": "Mora biti veće od krajnjeg ranga",
     "subnet_error": "Adrese moraju biti iz iste podmreže",
-    "gateway_or_subnet_invalid": "Nevažeća podmrežna maska",
+    "gateway_or_subnet_invalid": "Maska podmreže je neprvilna",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Subnet maskiranje",
     "dhcp_form_range_title": "Raspon IP adresa",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Omogućen roditeljski nadzor",
     "disabled_safe_search_toast": "Onemogućeno sigurno pretraživanje",
     "enabled_save_search_toast": "Omogućeno sigurno pretraživanje",
-    "updated_save_search_toast": "Ažurirane postavke sigurnog pretraživanja",
     "enabled_table_header": "Omogućeno",
     "name_table_header": "Naziv",
     "list_url_table_header": "URL popisa",
@@ -257,12 +259,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": "Rotacija dnevnika upita",
+    "query_log_retention": "Spremanje zapisnika 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 rotaciju dnevnika upita? Ako smanjite vrijednost intervala, neki će se podaci izgubiti",
+    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje zapisnika upita? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
     "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",
@@ -291,8 +293,6 @@
     "rate_limit": "Ograničenje",
     "edns_enable": "Omogući podmrežu klijenta EDNS-a",
     "edns_cs_desc": "Dodajte opciju EDNS klijentske podmreže (ECS) uzvodnim zahtjevima i zabilježite vrijednosti koje su klijenti poslali u dnevnik upita.",
-    "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.",
     "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve",
     "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Odgovor s NXDOMAIN kôdom",
     "blocking_mode_null_ip": "Nuliran IP: Odgovor s nuliranom IP adresom (0.0.0.0 za A; :: za AAAA)",
     "blocking_mode_custom_ip": "Prilagođeni IP: Odgovor s ručno postavljenom IP adresom",
-    "theme_auto": "Auto",
-    "theme_light": "Svijetla",
-    "theme_dark": "Tamna",
     "upstream_dns_client_desc": "Ako ovo polje ostane prazno, AdGuard Home će upotrijebiti poslužitelje postavljene u <0>DNS postavkama</0>.",
     "tracker_source": "Izvor pratitelja",
     "source_label": "Izvor",
@@ -457,7 +454,6 @@
     "updates_checked": "Dostupna je nova verzija AdGuard Home-a",
     "updates_version_equal": "AdGuard Home je ažuriran",
     "check_updates_now": "Provjeri ažuriranja sada",
-    "version_request_error": "Ne uspješna provjera ažuriranja. Provjerite vašu Internetsku vezu.",
     "dns_privacy": "DNS privatnost",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Koristite <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Koristite <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje statistike? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
     "statistics_cleared": "Statistika je uspješno uklonjenja",
     "statistics_enable": "Omogući statistiku",
-    "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",
     "interval_hours": "{{count}} sata/i",
     "interval_hours_plural": "{{count}} sata/i",
     "filters_configuration": "Postavke filtara",
@@ -646,33 +638,5 @@
     "safe_browsing": "Sigurno surfanje",
     "served_from_cache": "{{value}} <i>(dohvaćeno iz predmemorije)</i>",
     "form_error_password_length": "Lozinka mora imati najmanje {{value}} znakova",
-    "anonymizer_notification": "<0>Napomena:</0>IP anonimizacija je omogućena. Možete ju onemogućiti u <1>općim postavkama</1>.",
-    "confirm_dns_cache_clear": "Jeste li sigurni da želite očistiti DNS predmemoriju?",
-    "cache_cleared": "DNS predmemorija je uspješno izbrisana",
-    "clear_cache": "Očisti predmemoriju",
-    "make_static": "Učini statičnim",
-    "theme_auto_desc": "Automatski (na temelju sheme boja vašeg uređaja)",
-    "theme_dark_desc": "Tamna tema",
-    "theme_light_desc": "Svijetla tema",
-    "disable_for_seconds": "Za {{count}} sekundi",
-    "disable_for_seconds_plural": "Za {{count}} sekundi",
-    "disable_for_minutes": "Za {{count}} minuta",
-    "disable_for_minutes_plural": "Za {{count}} minuta",
-    "disable_for_hours": "Za {{count}} sati",
-    "disable_for_hours_plural": "Za {{count}} sati",
-    "disable_until_tomorrow": "Do sutra",
-    "disable_notify_for_seconds": "Isključi zaštitu na {{count}} sekundi",
-    "disable_notify_for_seconds_plural": "Onemogući zaštitu na {{count}} sekundi",
-    "disable_notify_for_minutes": "Isključi zaštitu na {{count}} minuta",
-    "disable_notify_for_minutes_plural": "Isključi zaštitu na {{count}} minuta",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Napomena:</0>IP anonimizacija je omogućena. Možete ju onemogućiti u <1>općim postavkama</1>."
 }

client/src/__locales/hu.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 Beállítások",
     "form_error_required": "Kötelező mező",
     "form_error_ip4_format": "Érvénytelen IPv4 cím",
+    "form_error_ip4_range_start_format": "Érvénytelen IPv4-cím a tartomány kezdetéhez",
+    "form_error_ip4_range_end_format": "Érvénytelen IPv4-cím a tartomány végén",
     "form_error_ip4_gateway_format": "Az átjáróhoz (gateway) érvénytelen IPv4 cím lett megadva",
     "form_error_ip6_format": "Érvénytelen IPv6 cím",
     "form_error_ip_format": "Érvénytelen IP-cím",
@@ -49,6 +51,7 @@
     "out_of_range_error": "A következő tartományon kívül legyen: \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Kisebb legyen, mint a tartomány kezdete",
     "greater_range_start_error": "Nagyobbnak kell lennie, mint a tartomány kezdete",
+    "greater_range_end_error": "Nagyobb legyen, mint a tartomány vége",
     "subnet_error": "A címeknek egy alhálózatban kell lenniük",
     "gateway_or_subnet_invalid": "Az alhálózati maszk érvénytelen",
     "dhcp_form_gateway_input": "Átjáró IP",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Az NXDOMAIN kóddal fog válaszolni",
     "blocking_mode_null_ip": "Null IP: Nullákból álló IP-címmel válaszol (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Egyedi IP: Válasz egy kézzel beállított IP címmel",
-    "theme_auto": "Auto",
-    "theme_light": "Világos",
-    "theme_dark": "Sötét",
     "upstream_dns_client_desc": "Ha üresen hagyja ezt a mezőt, az AdGuard Home azokat a szervereket fogja használni, amik a <0>DNS beállításokban</0> vannak beállítva.",
     "tracker_source": "Követő forrása",
     "source_label": "Forrás",
@@ -454,7 +454,6 @@
     "updates_checked": "Elérhető az AdGuard Home új verziója",
     "updates_version_equal": "Az AdGuard Home naprakész",
     "check_updates_now": "Frissítések ellenőrzése most",
-    "version_request_error": "A frissítések ellenőrzése sikertelen. Ellenőrizze az internetkapcsolatot.",
     "dns_privacy": "DNS Adatvédelem",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Használja a(z) <1>{{address}}</1> szöveget.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Használja a(z) <1>{{address}}</1> szöveget.",
@@ -639,9 +638,5 @@
     "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",
-    "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",
-    "protection_section_label": "Védelem"
+    "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> ."
 }

client/src/__locales/id.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Pengaturan DHCP IPv6",
     "form_error_required": "Kolom yang harus diisi",
     "form_error_ip4_format": "Alamat IPv4 tidak valid",
+    "form_error_ip4_range_start_format": "Alamat IPv4 tidak valid dari rentang awal",
+    "form_error_ip4_range_end_format": "Alamat IPv4 tidak valid dari rentang akhir",
     "form_error_ip4_gateway_format": "Alamat IPv4 gateway tidak valid",
     "form_error_ip6_format": "Alamat IPv6 tidak valid",
     "form_error_ip_format": "Alamat IP tidak valid",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Harus di luar rentang \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Harus lebih rendah dari rentang awal",
     "greater_range_start_error": "Harus lebih besar dari rentang awal",
+    "greater_range_end_error": "Harus lebih besar dari rentang akhir",
     "subnet_error": "Alamat harus dalam satu subnet",
     "gateway_or_subnet_invalid": "Subnet mask tidak valid",
     "dhcp_form_gateway_input": "IP gateway",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Respon pakai kode NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Respon pakai alamat IP kosong (0.0.0.0 untuk A; :: untuk AAAA)",
     "blocking_mode_custom_ip": "IP kustom: respon dengan alamat IP yang diset secara manual",
-    "theme_auto": "Auto",
-    "theme_light": "Terang",
-    "theme_dark": "Gelap",
     "upstream_dns_client_desc": "Jika Anda biarkan bidang ini kosong, AdGuard Home akan memakai server yang dikonfigurasi di<0>Pengaturan DNS</0>.",
     "tracker_source": "Sumber pelacak",
     "source_label": "Sumber",
@@ -638,9 +638,5 @@
     "safe_browsing": "Penjelajahan Aman",
     "served_from_cache": "{{value}} <i>(disajikan dari cache)</i>",
     "form_error_password_length": "Kata sandi harus minimal {{value}} karakter",
-    "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
-    "confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
-    "cache_cleared": "Cache DNS berhasil dibersihkan",
-    "clear_cache": "Hapus cache",
-    "protection_section_label": "Perlindungan"
+    "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> ."
 }

client/src/__locales/it.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Impostazioni DHCP IPv6",
     "form_error_required": "Campo richiesto",
     "form_error_ip4_format": "Indirizzo IPv4 non valido",
+    "form_error_ip4_range_start_format": "Indirizzo IPV4 non valido dell'intervallo iniziale",
+    "form_error_ip4_range_end_format": "Indirizzo IPV4 non valido dell'intervallo finale",
     "form_error_ip4_gateway_format": "Indirizzo gateway IPv4 non valido",
     "form_error_ip6_format": "Indirizzo IPv6 non valido",
     "form_error_ip_format": "Indirizzo IP non valido",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Deve essere fuori intervallo \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Deve essere inferiore dell'intervallo di inizio",
     "greater_range_start_error": "Deve essere maggiore dell'intervallo di inizio",
+    "greater_range_end_error": "Deve essere maggiore dell'intervallo di fine",
     "subnet_error": "Gli indirizzi devono trovarsi in una sottorete",
     "gateway_or_subnet_invalid": "Maschera di sottorete non valida",
     "dhcp_form_gateway_input": "IP Gateway",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Il Controllo Parentale è attivo",
     "disabled_safe_search_toast": "La Ricerca Sicura è disattivata",
     "enabled_save_search_toast": "La Ricerca Sicura è attiva",
-    "updated_save_search_toast": "Impostazioni di Safe Search aggiornate",
     "enabled_table_header": "Attivo",
     "name_table_header": "Nome",
     "list_url_table_header": "Elenco URL",
@@ -257,12 +259,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": "Rotazione dei registri richieste",
+    "query_log_retention": "Conservazione dei registri richieste",
     "query_log_enable": "Attiva registro",
     "query_log_configuration": "Configurazione registri",
     "query_log_disabled": "Il registro richieste è stato disattivato e può essere configurata dalle <0>impostazioni</0>",
     "query_log_strict_search": "Utilizzare le doppie virgolette per una ricerca precisa",
-    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se si riduce il valore dell'intervallo, alcuni dati andranno persi",
+    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se il valore di intervallo dovesse diminuire, 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Limite delle richieste",
     "edns_enable": "Attiva client di sottorete EDNS",
     "edns_cs_desc": "Aggiunge l'opzione EDNS Client Subnet (ECS) alle richieste upstream e registra i valori inviati dai client nel registro delle richieste.",
-    "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.",
     "blocking_ipv4_desc": "Indirizzo IP per una richiesta DNS IPv4 bloccata",
     "blocking_ipv6_desc": "Indirizzo IP restituito per una richiesta DNS IPv6 bloccata",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Rispondi con il codice NXDOMAIN",
     "blocking_mode_null_ip": "IP nullo: Rispondi con indirizzo IP zero (0.0.0.0 per A; :: per AAAA)",
     "blocking_mode_custom_ip": "IP personalizzato: Rispondi con un indirizzo IP impostato manualmente",
-    "theme_auto": "Auto",
-    "theme_light": "Chiaro",
-    "theme_dark": "Scuro",
     "upstream_dns_client_desc": "Se lasci questo spazio vuoto, AdGuard Home utilizzerà i server configurati nelle <0>impostazioni DNS</0>.",
     "tracker_source": "Origine del tracciatore",
     "source_label": "Fonte",
@@ -457,7 +454,6 @@
     "updates_checked": "Nuova versione di AdGuard Home è disponibile",
     "updates_version_equal": "AdGuard Home è aggiornato",
     "check_updates_now": "Ricerca aggiornamenti ora",
-    "version_request_error": "Ricerca aggiornamenti non riuscita. Per favore controlla la tua connessione internet.",
     "dns_privacy": "Privacy DNS",
     "setup_dns_privacy_1": "<0>DNS su TLS:</0> Utilizza la stringa <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS su HTTPS:</0> Utilizza la stringa <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Sei sicuro di voler modificare la conservazione delle statistiche? Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
     "statistics_cleared": "Statistiche azzerate correttamente",
     "statistics_enable": "Attiva statistiche",
-    "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",
     "interval_hours": "{{count}} ora",
     "interval_hours_plural": "{{count}} ore",
     "filters_configuration": "Configurazione filtri",
@@ -646,33 +638,5 @@
     "safe_browsing": "Navigazione Sicura",
     "served_from_cache": "{{value}} <i>(fornito dalla cache)</i>",
     "form_error_password_length": "La password deve contenere almeno {{value}} caratteri",
-    "anonymizer_notification": "<0>Attenzione:</0> L'anonimizzazione dell'IP è abilitata. Puoi disabilitarla in <1>Impostazioni generali</1>.",
-    "confirm_dns_cache_clear": "Sei sicuro di voler cancellare la cache DNS?",
-    "cache_cleared": "Cache DNS è stata cancellata correttamente",
-    "clear_cache": "Cancella cache",
-    "make_static": "Rendere statico",
-    "theme_auto_desc": "Auto (in base alla combinazione di colori del tuo dispositivo)",
-    "theme_dark_desc": "Tema scuro",
-    "theme_light_desc": "Tema chiaro",
-    "disable_for_seconds": "Per {{count}} secondo",
-    "disable_for_seconds_plural": "Per {{count}} secondi",
-    "disable_for_minutes": "Per {{count}} minuto",
-    "disable_for_minutes_plural": "Per {{count}} minuti",
-    "disable_for_hours": "Per {{count}} ora",
-    "disable_for_hours_plural": "Per {{count}} ore",
-    "disable_until_tomorrow": "Fino a domani",
-    "disable_notify_for_seconds": "Disattiva la protezione per {{count}} secondo",
-    "disable_notify_for_seconds_plural": "Disattiva la protezione per {{count}} secondi",
-    "disable_notify_for_minutes": "Disattiva protezione per {{count}} minuto",
-    "disable_notify_for_minutes_plural": "Disattiva la protezione per {{count}} minuti",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Attenzione:</0> L'anonimizzazione dell'IP è abilitata. Puoi disabilitarla in <1>Impostazioni generali</1>."
 }

client/src/__locales/ja.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 設定",
     "form_error_required": "必須項目です",
     "form_error_ip4_format": "IPv4アドレスが無効です",
+    "form_error_ip4_range_start_format": "範囲開始のIPv4アドレスが無効です",
+    "form_error_ip4_range_end_format": "範囲終了のIPv4アドレスが無効です",
     "form_error_ip4_gateway_format": "ゲートウェイのIPv4アドレスが無効です",
     "form_error_ip6_format": "IPv6アドレスが無効です",
     "form_error_ip_format": "IPアドレスが無効です",
@@ -49,6 +51,7 @@
     "out_of_range_error": "\"{{start}}\"〜\"{{end}}\" の範囲外である必要があります",
     "lower_range_start_error": "範囲開始よりも低い値である必要があります",
     "greater_range_start_error": "範囲開始値より大きい値でなければなりません",
+    "greater_range_end_error": "範囲終了値より大きい値でなければなりません",
     "subnet_error": "両アドレスが同じサブネット内にある必要があります",
     "gateway_or_subnet_invalid": "サブネットマスクが無効です",
     "dhcp_form_gateway_input": "ゲートウェイIP",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "ペアレンタルコントロールが有効になりました",
     "disabled_safe_search_toast": "セーフサーチが無効になりました",
     "enabled_save_search_toast": "セーフサーチが有効になりました",
-    "updated_save_search_toast": "セーフ サーチの設定が更新されました。",
     "enabled_table_header": "有効",
     "name_table_header": "名称",
     "list_url_table_header": "URLリスト",
@@ -257,12 +259,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サーバ設定",
@@ -291,8 +293,6 @@
     "rate_limit": "頻度制限",
     "edns_enable": "EDNSクライアントサブネットを有効にする",
     "edns_cs_desc": "アップストリームリクエストにEDNSクライアントサブネットオプション（ECS）を追加し、クライアントから送信された値をクエリログに記録します。",
-    "edns_use_custom_ip": "EDNSにカスタムIPを使用する",
-    "edns_use_custom_ip_desc": "EDNS に対してカスタム IP の使用を許可します。",
     "rate_limit_desc": "一つのクライアントに対して許可される1秒あたりのリクエスト数（「0」に設定すると、制限なしになります）",
     "blocking_ipv4_desc": "ブロックされたAリクエストに対して応答されるIPアドレス",
     "blocking_ipv6_desc": "ブロックされたAAAAリクエストに対して応答されるIPアドレス",
@@ -301,9 +301,6 @@
     "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>で構成されたサーバを使用します。",
     "tracker_source": "追跡元",
     "source_label": "ソース",
@@ -457,7 +454,6 @@
     "updates_checked": "AdGuard Homeの新バージョンが利用可能です。",
     "updates_version_equal": "AdGuard Homeは既に最新です",
     "check_updates_now": "今すぐアップデートを確認する",
-    "version_request_error": "アップデート確認に失敗しました。インターネット接続を確認してください。",
     "dns_privacy": "DNSプライバシー",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1>という文字列を使用してください。",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1>という文字列を使用してください。",
@@ -526,10 +522,6 @@
     "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": "フィルタ設定",
@@ -646,33 +638,5 @@
     "safe_browsing": "セーフブラウジング",
     "served_from_cache": "{{value}} <i>(キャッシュから応答)</i>",
     "form_error_password_length": "パスワードは{{value}}文字以上にしてください",
-    "anonymizer_notification": "【<0>注意</0>】IPの匿名化が有効になっています。 <1>一般設定</1>で無効にできます。",
-    "confirm_dns_cache_clear": "DNS キャッシュをクリアしてもよろしいですか？",
-    "cache_cleared": "DNSキャッシュのクリア完了です。",
-    "clear_cache": "キャッシュをクリアする",
-    "make_static": "静的（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": "AdGuardによる保護",
-    "log_and_stats_section_label": "クエリ・ログと統計情報",
-    "ignore_query_log": "クエリ・ログでこのクライアントを無視する",
-    "ignore_statistics": "統計でこのクライアントを無視する"
+    "anonymizer_notification": "【<0>注意</0>】IPの匿名化が有効になっています。 <1>一般設定</1>で無効にできます。"
 }

client/src/__locales/ko.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 설정",
     "form_error_required": "필수 영역",
     "form_error_ip4_format": "잘못된 IPv4 형식",
+    "form_error_ip4_range_start_format": "잘못된 범위 시작 IPv4 형식",
+    "form_error_ip4_range_end_format": "잘못된 범위 종료 IPv4 형식",
     "form_error_ip4_gateway_format": "잘못된 게이트웨이 IPv4 형식",
     "form_error_ip6_format": "잘못된 IPv6 주소",
     "form_error_ip_format": "잘못된 IP 주소",
@@ -49,6 +51,7 @@
     "out_of_range_error": "'{{start}}'-'{{end}}' 범위 밖이어야 합니다",
     "lower_range_start_error": "범위 시작보다 작은 값이어야 합니다",
     "greater_range_start_error": "범위 시작보다 큰 값이어야 합니다",
+    "greater_range_end_error": "범위 종료보다 큰 값이어야 합니다",
     "subnet_error": "주소는 하나의 서브넷에 있어야 합니다",
     "gateway_or_subnet_invalid": "잘못된 서브넷 마스크",
     "dhcp_form_gateway_input": "게이트웨이 IP",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "자녀 보호 활성화됨",
     "disabled_safe_search_toast": "세이프서치 비활성화됨",
     "enabled_save_search_toast": "세이프서치 활성화됨",
-    "updated_save_search_toast": "세이프서치 설정 업데이트됨",
     "enabled_table_header": "활성화됨",
     "name_table_header": "이름",
     "list_url_table_header": "리스트 URL",
@@ -221,7 +223,7 @@
     "example_upstream_tcp_hostname": "일반 DNS (TCP를 통한, 호스트명);",
     "all_lists_up_to_date_toast": "모든 리스트가 이미 최신입니다",
     "updated_upstream_dns_toast": "업스트림 서버가 성공적으로 저장되었습니다",
-    "dns_test_ok_toast": "지정된 DNS 서버가 올바르게 작동하고 있습니다.",
+    "dns_test_ok_toast": "특정 DNS 서버들은 정상적으로 동작 중입니다",
     "dns_test_not_ok_toast": "서버 '{{key}}': 사용할 수 없습니다, 제대로 작성했는지 확인하세요",
     "dns_test_warning_toast": "업스트림 '{{key}}'이(가) 테스트 요청에 응답하지 않으며 제대로 작동하지 않을 수 있습니다",
     "unblock": "차단 해제",
@@ -257,12 +259,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 서버 설정",
@@ -291,8 +293,6 @@
     "rate_limit": "한도 제한",
     "edns_enable": "EDNS 클라이언트 서브넷 활성화",
     "edns_cs_desc": "업스트림 요청에 EDNS 클라이언트 서브넷 옵션(ECS)을 추가하고 쿼리 로그에 클라이언트가 보낸 값을 기록합니다.",
-    "edns_use_custom_ip": "EDNS에 사용자 지정 IP 사용",
-    "edns_use_custom_ip_desc": "EDNS에 사용자 지정 IP 사용하도록 허용합니다.",
     "rate_limit_desc": "단일 클라이언트에서 허용 가능한 초 당 요청 생성 숫자 (0: 무제한)",
     "blocking_ipv4_desc": "차단된 A 요청에 대해서 반환할 IP 주소",
     "blocking_ipv6_desc": "차단된 AAAA 요청에 대해서 반환할 IP 주소",
@@ -301,9 +301,6 @@
     "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>에 설정되어 있는 값을 사용합니다.",
     "tracker_source": "추적기 소스",
     "source_label": "소스",
@@ -457,7 +454,6 @@
     "updates_checked": "AdGuard Home의 새 버전을 사용할 수 있습니다",
     "updates_version_equal": "AdGuard Home 최신 상태입니다.",
     "check_updates_now": "지금 업데이트 확인",
-    "version_request_error": "업데이트 체크에 실패했습니다. 인터넷 연결 상태를 확인해주세요.",
     "dns_privacy": "DNS 프라이버시",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> 사용하세요.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> 사용하세요.",
@@ -526,10 +522,6 @@
     "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": "필터 구성",
@@ -646,33 +638,5 @@
     "safe_browsing": "세이프 브라우징",
     "served_from_cache": "{{value}} <i>(캐시에서 제공)</i>",
     "form_error_password_length": "비밀번호는 {{value}}자 이상이어야 합니다",
-    "anonymizer_notification": "<0>참고:</0> IP 익명화가 활성화되었습니다. <1>일반 설정</1>에서 비활성화할 수 있습니다.",
-    "confirm_dns_cache_clear": "정말로 DNS 캐시를 지우시겠습니까?",
-    "cache_cleared": "DNS 캐시를 성공적으로 지웠습니다",
-    "clear_cache": "캐시 지우기",
-    "make_static": "정적으로 만들기",
-    "theme_auto_desc": "자동(기기의 색 구성표에 따라 설정)",
-    "theme_dark_desc": "다크 테마",
-    "theme_light_desc": "라이트 테마",
-    "disable_for_seconds": "{{count}}초",
-    "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": "통계에서 이 클라이언트 무시"
+    "anonymizer_notification": "<0>참고:</0> IP 익명화가 활성화되었습니다. <1>일반 설정</1>에서 비활성화할 수 있습니다."
 }

client/src/__locales/nl.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 instellingen",
     "form_error_required": "Vereist veld",
     "form_error_ip4_format": "Ongeldig IPv4-adres",
+    "form_error_ip4_range_start_format": "Ongeldig IPv4-adres start bereik",
+    "form_error_ip4_range_end_format": "Ongeldig IPv4-adres einde bereik",
     "form_error_ip4_gateway_format": "Ongeldig IPv4-adres van de gateway",
     "form_error_ip6_format": "Ongeldig IPv6-adres",
     "form_error_ip_format": "Ongeldig IP-adres",
@@ -49,8 +51,9 @@
     "out_of_range_error": "Moet buiten bereik zijn \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Moet lager zijn dan begin reeks",
     "greater_range_start_error": "Moet groter zijn dan begin reeks",
+    "greater_range_end_error": "Moet groter zijn dan einde reeks",
     "subnet_error": "Adressen moeten in één subnet vallen",
-    "gateway_or_subnet_invalid": "Ongeldig subnetmasker",
+    "gateway_or_subnet_invalid": "Subnetmasker ongeldig",
     "dhcp_form_gateway_input": "Gateway IP",
     "dhcp_form_subnet_input": "Subnet mask",
     "dhcp_form_range_title": "Bereik van IP adressen",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Ingeschakeld Ouderlijk toezicht",
     "disabled_safe_search_toast": "Uitgeschakeld Veilig zoeken",
     "enabled_save_search_toast": "Ingeschakeld Veilig zoeken",
-    "updated_save_search_toast": "Safe Search-instellingen bijgewerkt",
     "enabled_table_header": "Ingeschakeld",
     "name_table_header": "Naam",
     "list_url_table_header": "URL lijst",
@@ -257,12 +259,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 rotatie",
+    "query_log_retention": "Query logs bewaartermijn",
     "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 rotatie van het querylogboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
+    "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",
     "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",
@@ -291,8 +293,6 @@
     "rate_limit": "Ratio limiet",
     "edns_enable": "EDNS client subnet inschakelen",
     "edns_cs_desc": "De EDNS Client Subnet-optie (ECS) toevoegen aan upstream-verzoeken en de waarden die door de clients zijn verzonden registreren in het querylogboek.",
-    "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.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
     "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
     "blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
-    "theme_auto": "Automatisch",
-    "theme_light": "Licht",
-    "theme_dark": "Donker",
     "upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.",
     "tracker_source": "Bron volger",
     "source_label": "Bron",
@@ -457,7 +454,6 @@
     "updates_checked": "Een nieuwe versie van AdGuard Home is beschikbaar\n",
     "updates_version_equal": "AdGuard Home is actueel",
     "check_updates_now": "Controleer 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.",
     "setup_dns_privacy_2": "<0>DNS-via-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Weet u zeker dat u de bewaartermijn van de statistieken wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
     "statistics_cleared": "Statistieken succesvol gewist",
     "statistics_enable": "Statistieken inschakelen",
-    "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",
     "interval_hours": "{{count}} uur",
     "interval_hours_plural": "{{count}} uren",
     "filters_configuration": "Filters instellingen",
@@ -646,33 +638,5 @@
     "safe_browsing": "Veilig browsen",
     "served_from_cache": "{{value}} <i>(geleverd vanuit cache)</i>",
     "form_error_password_length": "Wachtwoord moet minimaal {{value}} tekens lang zijn",
-    "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>.",
-    "confirm_dns_cache_clear": "Weet je zeker dat je de DNS-cache wilt wissen?",
-    "cache_cleared": "DNS-cache succesvol gewist",
-    "clear_cache": "Cache wissen",
-    "make_static": "Statisch maken",
-    "theme_auto_desc": "Automatisch (op basis van het kleurenschema van jouw apparaat)",
-    "theme_dark_desc": "Donker thema",
-    "theme_light_desc": "Licht thema",
-    "disable_for_seconds": "Voor {{count}} seconde",
-    "disable_for_seconds_plural": "Voor {{count}} seconden",
-    "disable_for_minutes": "Voor {{count}} minuut",
-    "disable_for_minutes_plural": "Voor {{count}} minuten",
-    "disable_for_hours": "Voor {{count}} uur",
-    "disable_for_hours_plural": "Voor {{count}} uren",
-    "disable_until_tomorrow": "Tot morgen",
-    "disable_notify_for_seconds": "Beveiliging uitschakelen voor {{count}} seconde",
-    "disable_notify_for_seconds_plural": "Beveiliging uitschakelen voor {{count}} seconden",
-    "disable_notify_for_minutes": "Beveiliging uitschakelen voor {{count}} minuut",
-    "disable_notify_for_minutes_plural": "Beveiliging uitschakelen voor {{count}} minuten",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Opmerking:</0> IP-anonimisering is ingeschakeld. Je kunt het uitschakelen in <1>Algemene instellingen</1>."
 }

client/src/__locales/no.json

@@ -281,9 +281,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-koden",
     "blocking_mode_null_ip": "Null IP: Svar med en 0-IP-adresse (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt valgt IP-adresse",
-    "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",
@@ -436,7 +433,6 @@
     "updates_checked": "En ny versjon av AdGuard Home er tilgjengelig",
     "updates_version_equal": "AdGuard Home er fullt oppdatert",
     "check_updates_now": "Se etter oppdateringer nå",
-    "version_request_error": "Oppdateringssjekken mislyktes. Vennligst sjekk internettforbindelsen din.",
     "dns_privacy": "DNS-privatliv",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Benytt <1>{{address}}</1>-strengen.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Benytt <1>{{address}}</1>-strengen.",
@@ -616,6 +612,5 @@
     "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>",
-    "protection_section_label": "Beskyttelse"
+    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>"
 }

client/src/__locales/pl.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Ustawienia serwera DHCP IPv6",
     "form_error_required": "Pole wymagane",
     "form_error_ip4_format": "Nieprawidłowy adres IPv4",
+    "form_error_ip4_range_start_format": "Nieprawidłowy adres IPv4 początku zakresu",
+    "form_error_ip4_range_end_format": "Nieprawidłowy adres IPv4 końca zakresu",
     "form_error_ip4_gateway_format": "Nieprawidłowy adres IPv4 bramy",
     "form_error_ip6_format": "Nieprawidłowy adres IPv6",
     "form_error_ip_format": "Nieprawidłowy adres IP",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Musi być spoza zakresu \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Musi być niższy niż początek zakresu",
     "greater_range_start_error": "Musi być większy niż początek zakresu",
+    "greater_range_end_error": "Musi być większy niż koniec zakresu",
     "subnet_error": "Adresy muszą należeć do jednej podsieci",
     "gateway_or_subnet_invalid": "Nieprawidłowa maska podsieci",
     "dhcp_form_gateway_input": "Adres IP bramy",
@@ -167,7 +170,6 @@
     "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",
@@ -222,7 +224,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że być użyte, sprawdź, czy zapisano go poprawnie",
+    "dns_test_not_ok_toast": "Serwer \"{{key}}\": nie można go użyć, sprawdź, czy napisałeś 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",
@@ -257,12 +259,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": "Rotacja dzienników zapytań",
+    "query_log_retention": "Przechowywanie 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ć rotację dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
+    "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",
     "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",
@@ -291,8 +293,6 @@
     "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ń.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Odpowiedz kodem NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Odpowiedz z zerowym adresem IP (0.0.0.0 dla A; :: dla AAAA)",
     "blocking_mode_custom_ip": "Niestandardowy adres IP: Odpowiedz ręcznie ustawionym adresem IP",
-    "theme_auto": "Auto",
-    "theme_light": "Jasny",
-    "theme_dark": "Ciemny",
     "upstream_dns_client_desc": "Jeśli to pole pozostanie puste, AdGuard Home użyje serwerów skonfigurowanych w <0>Ustawieniach DNS</0>.",
     "tracker_source": "Źródło skryptu śledzącego",
     "source_label": "Źródło",
@@ -346,7 +343,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 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_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ć.",
@@ -396,7 +393,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": "Uwaga!",
     "topline_expiring_certificate": "Twój certyfikat SSL wkrótce wygaśnie. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "topline_expired_certificate": "Twój certyfikat SSL wygasł. Zaktualizuj <0>Ustawienia szyfrowania</0>.",
     "form_error_port_range": "Wpisz numer portu z zakresu 80-65535",
@@ -457,7 +454,6 @@
     "updates_checked": "Dostępna jest nowa wersja programu AdGuard Home\n",
     "updates_version_equal": "AdGuard Home jest aktualny",
     "check_updates_now": "Sprawdź aktualizacje teraz",
-    "version_request_error": "Sprawdzanie aktualizacji zakończone niepowodzeniem. Sprawdź swoje połączenie z internetem.",
     "dns_privacy": "Prywatny DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Skorzystaj z adresu <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Skorzystaj z adresu <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "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 dla tych domen nie są zapisywane do statystyk",
-    "ignore_domains_desc_query": "Zapytania dla tych domen nie są zapisywane do dziennika",
     "interval_hours": "{{count}} godzina",
     "interval_hours_plural": "{{count}} godziny",
     "filters_configuration": "Konfiguracja filtrów",
@@ -542,7 +534,7 @@
     "password_placeholder": "Wpisz hasło",
     "sign_in": "Zaloguj się",
     "sign_out": "Wyloguj się",
-    "forgot_password": "Zapomniano hasła?",
+    "forgot_password": "Zapomniałeś hasła?",
     "forgot_password_desc": "Wykonaj <0>te kroki</0>, aby utworzyć nowe hasło do konta użytkownika.",
     "location": "Lokalizacja",
     "orgname": "Nazwa firmy",
@@ -646,33 +638,5 @@
     "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",
-    "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ą",
-    "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"
+    "anonymizer_notification": "<0>Uwaga:</0> Anonimizacja IP jest włączona. Możesz ją wyłączyć w <1>Ustawieniach ogólnych</1>."
 }

client/src/__locales/pt-br.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Configurações DHCP IPv6",
     "form_error_required": "Campo obrigatório",
     "form_error_ip4_format": "Endereço de IPv4 inválido",
+    "form_error_ip4_range_start_format": "Endereço IPv4 de início de intervalo inválido",
+    "form_error_ip4_range_end_format": "Endereço IPv4 de fim de intervalo inválido.",
     "form_error_ip4_gateway_format": "Endereço IPv4 de gateway inválido",
     "form_error_ip6_format": "Endereço de IPv6 inválido",
     "form_error_ip_format": "Endereço de IP inválido",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Deve estar fora do intervalo \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Deve ser inferior ao início do intervalo",
     "greater_range_start_error": "Deve ser maior que o início do intervalo",
+    "greater_range_end_error": "Deve ser maior que o fim do intervalo",
     "subnet_error": "Endereços devem estar em uma sub-rede",
     "gateway_or_subnet_invalid": "Máscara de sub-rede inválida",
     "dhcp_form_gateway_input": "IP do gateway",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Controle parental ativado",
     "disabled_safe_search_toast": "Pesquisa segura desativada",
     "enabled_save_search_toast": "Pesquisa segura ativada",
-    "updated_save_search_toast": "Configurações de Pesquisa Segura atualizadas",
     "enabled_table_header": "Ativado",
     "name_table_header": "Nome",
     "list_url_table_header": "URL da lista",
@@ -257,12 +259,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": "Rotação de registros de consulta",
+    "query_log_retention": "Arquivamento de registros de consultas",
     "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": "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",
+    "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",
     "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",
@@ -291,8 +293,6 @@
     "rate_limit": "Taxa limite",
     "edns_enable": "Ativar a sub-rede do cliente EDNS",
     "edns_cs_desc": "Adicione a opção de sub-rede de cliente EDNS (ECS) às solicitações de servidor DNS primário e registre os valores enviados pelos clientes no registro de consulta.",
-    "edns_use_custom_ip": "Usar IP personalizado para EDNS",
-    "edns_use_custom_ip_desc": "Permitir o uso de IP personalizado para EDNS",
     "rate_limit_desc": "O número de solicitações por segundo permitidas por cliente. Definir como 0 significa que não há limite.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Responder com o código NXDOMAIN",
     "blocking_mode_null_ip": "IP nulo: Responder com endereço IP zero (0.0.0.0 para A; :: para AAAA)",
     "blocking_mode_custom_ip": "IP personalizado: Responder com um endereço IP definido manualmente",
-    "theme_auto": "Automático",
-    "theme_light": "Claro",
-    "theme_dark": "Escuro",
     "upstream_dns_client_desc": "Se você mantiver este campo vazio, o AdGuard Home usará os servidores configurados nas configurações <0>DNS</0>.",
     "tracker_source": "Fonte do rastreador",
     "source_label": "Fonte",
@@ -457,7 +454,6 @@
     "updates_checked": "Uma nova versão do AdGuard Home está disponível\n",
     "updates_version_equal": "O AdGuard Home está atualizado.",
     "check_updates_now": "Verificar atualizações",
-    "version_request_error": "A verificação de atualização falhou. Por favor, verifique sua conexão com a internet.",
     "dns_privacy": "Privacidade de DNS",
     "setup_dns_privacy_1": "<0>DNS-sobre-TLS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-sobre-HTTPS:</0> Use <1>{{address}}</1> string.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Você tem certeza que quer alterar o arquivamento das estatísticas? Se diminuir o valor do intervalo, alguns dados serão perdidos",
     "statistics_cleared": "As estatísticas foram limpas com sucesso",
     "statistics_enable": "Ativar estatísticas",
-    "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 registro de consulta",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
     "filters_configuration": "Configuração de filtros",
@@ -646,33 +638,5 @@
     "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",
-    "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",
-    "clear_cache": "Limpar cache",
-    "make_static": "Tornar estático",
-    "theme_auto_desc": "Automático (com base no esquema de cores do seu dispositivo)",
-    "theme_dark_desc": "Tema escuro",
-    "theme_light_desc": "Tema claro",
-    "disable_for_seconds": "Por {{count}} segundo",
-    "disable_for_seconds_plural": "Por {{count}} segundos",
-    "disable_for_minutes": "Por {{count}} minuto",
-    "disable_for_minutes_plural": "Por {{count}} minutos",
-    "disable_for_hours": "Por {{count}} hora",
-    "disable_for_hours_plural": "Por {{count}} horas",
-    "disable_until_tomorrow": "Até amanhã",
-    "disable_notify_for_seconds": "Desativar proteção por {{count}} segundo",
-    "disable_notify_for_seconds_plural": "Desativar proteção por {{count}} segundos",
-    "disable_notify_for_minutes": "Desativar proteção por {{count}} minuto",
-    "disable_notify_for_minutes_plural": "Desativar proteção por {{count}} minutos",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-lo em <1>Configurações gerais</1>."
 }

client/src/__locales/pt-pt.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Definições DHCP IPv6",
     "form_error_required": "Campo obrigatório",
     "form_error_ip4_format": "Endereço de IPv4 inválido",
+    "form_error_ip4_range_start_format": "Endereço IPv4 de início de intervalo inválido",
+    "form_error_ip4_range_end_format": "Endereço IPv4 de fim de intervalo inválido",
     "form_error_ip4_gateway_format": "Endereço IPv4 de gateway inválido",
     "form_error_ip6_format": "Endereço de IPv6 inválido",
     "form_error_ip_format": "Endereço de email inválido",
@@ -49,7 +51,8 @@
     "out_of_range_error": "Deve estar fora do intervalo \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Deve ser inferior ao início do intervalo",
     "greater_range_start_error": "Deve ser maior que o início do intervalo",
-    "subnet_error": "Os endereços devem estar numa sub-rede",
+    "greater_range_end_error": "Deve ser maior que o fim do intervalo",
+    "subnet_error": "Os endereços devem estar em uma sub-rede",
     "gateway_or_subnet_invalid": "Máscara de sub-rede inválida",
     "dhcp_form_gateway_input": "IP do gateway",
     "dhcp_form_subnet_input": "Máscara de sub-rede",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Controlo parental ativado",
     "disabled_safe_search_toast": "Pesquisa segura desativada",
     "enabled_save_search_toast": "Pesquisa segura ativada",
-    "updated_save_search_toast": "Configurações de pesquisa segura actualizadas",
     "enabled_table_header": "Ativado",
     "name_table_header": "Nome",
     "list_url_table_header": "URL da lista",
@@ -257,12 +259,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": "Rotação de registros de consulta",
+    "query_log_retention": "Retenção de registos 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 quer alterar a rotaçã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 deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
     "anonymize_client_ip": "Tornar anónimo o IP do cliente",
     "anonymize_client_ip_desc": "Não gurda o endereço de IP completo do cliente em registo ou estatísticas",
     "dns_config": "Definição do servidor DNS",
@@ -291,8 +293,6 @@
     "rate_limit": "Limite de taxa",
     "edns_enable": "Ativar a sub-rede do cliente EDNS",
     "edns_cs_desc": "Adicione a opção de sub-rede de cliente EDNS (ECS) às solicitações de servidor DNS primário e registre os valores enviados pelos clientes no registo de consulta.",
-    "edns_use_custom_ip": "Usar IP personalizado para EDNS",
-    "edns_use_custom_ip_desc": "Permitir a utilização de IP personalizado para EDNS",
     "rate_limit_desc": "O número de solicitações por segundo permitido por cliente. Configurando para 0 significa sem limite.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Responder com o código NXDOMAIN",
     "blocking_mode_null_ip": "IP nulo: Responder com endereço IP zero (0.0.0.0 para A; :: para AAAA)",
     "blocking_mode_custom_ip": "IP personalizado: Responder com um endereço IP definido manualmente",
-    "theme_auto": "Automático",
-    "theme_light": "Claro",
-    "theme_dark": "Escuro",
     "upstream_dns_client_desc": "Se mantiver esse campo vazio, o AdGuard Home usará os servidores configurados nas <0>Definições de DNS</0>.",
     "tracker_source": "Fonte do rastreador",
     "source_label": "Fonte",
@@ -338,10 +335,10 @@
     "install_devices_router": "Router",
     "install_devices_router_desc": "Esta configuração cobre automaticamente todos os dispositivos conectados ao seu router doméstico, sem a necessidade de configurar cada um deles manualmente.",
     "install_devices_address": "O servidor de DNS do AdGuard Home está a capturar os seguintes endereços",
-    "install_devices_router_list_1": "Abra as preferências do seu router. Normalmente, tu podes acessá-lo de teu navegador por meio de um URL, como http://192.168.0.1/ ou http://192.168.1.1/. Tu podes ser solicitado a inserir uma palavra-passe. Se tu não se lembrar, muitas vezes tu podes repor a palavra-passe pressionando um botão no próprio roteador, mas esteja ciente de que se esse procedimento for escolhido, tu provavelmente perderás toda a definição do router. Se o teu router requer uma aplicação para configurá-lo, instale a aplicação no seu telefone ou PC e use-o para acessar as definições do router.",
+    "install_devices_router_list_1": "Abra as preferências do seu roteador. Normalmente, tu podes acessá-lo de teu navegador por meio de um URL, como http://192.168.0.1/ ou http://192.168.1.1/. Tu podes ser solicitado a inserir uma palavra-passe. Se tu não se lembrar, muitas vezes tu podes repor a palavra-passe pressionando um botão no próprio roteador, mas esteja ciente de que se esse procedimento for escolhido, tu provavelmente perderás toda a definição do roteador. Se o teu roteador requer uma aplicação para configurá-lo, instale a aplicação no seu telefone ou PC e use-o para acessar as definições do roteador.",
     "install_devices_router_list_2": "Encontre as configurações de DNS. Procure as letras DNS ao lado de um campo que permite dois ou três conjuntos de números, cada um dividido em quatro grupos de um a três números.",
     "install_devices_router_list_3": "Insira aqui seu servidor do AdGuard Home.",
-    "install_devices_router_list_4": "Em alguns tipos de router, um servidor DNS personalizado não pode ser configurado. Nesse caso, configurar o AdGuard Home como um <0>Servidor DHCP</0> pode ajudar. Caso contrário, tu deves verificar o manual do router sobre como personalizar os servidores DNS no seu modelo de router específico.",
+    "install_devices_router_list_4": "Em alguns tipos de roteador, um servidor DNS personalizado não pode ser configurado. Nesse caso, configurar o AdGuard Home como um <0>Servidor DHCP</0> pode ajudar. Caso contrário, tu deve verificar o manual do router sobre como personalizar os servidores DNS em seu modelo de router específico.",
     "install_devices_windows_list_1": "Abra o Painel de Controlo através do Menu Iniciar ou pela Pesquisa do Windows.",
     "install_devices_windows_list_2": "Entre na categoria Rede e Internet e depois clique em Central de Rede e Partilha.",
     "install_devices_windows_list_3": "No painel esquerdo, clique em \"Alterar configurações do adaptador\".",
@@ -457,7 +454,6 @@
     "updates_checked": "Uma nova versão do AdGuard Home está disponível\n",
     "updates_version_equal": "O AdGuard Home está atualizado",
     "check_updates_now": "Verificar atualizações",
-    "version_request_error": "A verificação de atualização falhou. Verifique a sua ligação à internet.",
     "dns_privacy": "Privacidade de DNS",
     "setup_dns_privacy_1": "<0>DNS-sobre-TLS:</0> Use <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-sobre-HTTPS:</0> Use <1>{{address}}</1> string.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Tem a certeza que quer alterar a retenção de estatísticas? Se diminuir o valor do intervalo, alguns dados serão perdidos",
     "statistics_cleared": "As estatísticas foram apagadas com sucesso",
     "statistics_enable": "Ativar estatísticas",
-    "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ão aparecem no registo de consultas",
     "interval_hours": "{{count}} hora",
     "interval_hours_plural": "{{count}} horas",
     "filters_configuration": "Definição dos filtros",
@@ -590,7 +582,7 @@
     "client_blocked": "Cliente \"{{ip}}\" foi bloqueado com sucesso",
     "client_unblocked": "Cliente \"{{ip}}\" foi desbloqueado com sucesso",
     "static_ip": "Endereço de IP estático",
-    "static_ip_desc": "O AdGuard Home é um servidor, portanto, ele precisa de um endereço de IP estático para funcionar corretamente. Caso contrário, em algum momento, seu router poderá atribuir um novo endereço de IP neste dispositivo.",
+    "static_ip_desc": "O AdGuard Home é um servidor, portanto, ele precisa de um endereço de IP estático para funcionar corretamente. Caso contrário, em algum momento, seu roteador poderá atribuir um novo endereço de IP neste dispositivo.",
     "set_static_ip": "Definir um endereço de IP estático",
     "install_static_ok": "Boas notícias! O endereço de IP estático já está configurado",
     "install_static_error": "O AdGuard Home não pode configurar automaticamente para esta interface de rede. Por favor, procure uma instrução sobre como fazer isso manualmente.",
@@ -646,33 +638,5 @@
     "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",
-    "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",
-    "clear_cache": "Limpar cache",
-    "make_static": "Tornar estático",
-    "theme_auto_desc": "Automático (com base no esquema de cores do seu dispositivo)",
-    "theme_dark_desc": "Tema escuro",
-    "theme_light_desc": "Tema claro",
-    "disable_for_seconds": "Por {{count}} segundo",
-    "disable_for_seconds_plural": "Por {{count}} segundos",
-    "disable_for_minutes": "Por {{count}} minuto",
-    "disable_for_minutes_plural": "Por {{count}} minutos",
-    "disable_for_hours": "Por {{count}} hora",
-    "disable_for_hours_plural": "Por {{count}} horas",
-    "disable_until_tomorrow": "Até amanhã",
-    "disable_notify_for_seconds": "Desativar proteção por {{count}} segundo",
-    "disable_notify_for_seconds_plural": "Desativar proteção por {{count}} segundos",
-    "disable_notify_for_minutes": "Desativar proteção por {{count}} minuto",
-    "disable_notify_for_minutes_plural": "Desativar proteção por {{count}} minutos",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Observação:</0> A anonimização de IP está ativada. Você pode desativá-la em <1>Definições gerais</1>."
 }

client/src/__locales/ro.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Setări DHCP IPv6",
     "form_error_required": "Câmp obligatoriu",
     "form_error_ip4_format": "Adresă IPv4 nevalidă",
+    "form_error_ip4_range_start_format": "Adresă IPv4 nevalidă pentru începutul intervalului",
+    "form_error_ip4_range_end_format": "Adresă IPv4 nevalidă a sfârșitului intervalului",
     "form_error_ip4_gateway_format": "Adresă IPv4 nevalidă a gateway-ului",
     "form_error_ip6_format": "Adresa IPv6 nevalidă",
     "form_error_ip_format": "Adresă IP nevalidă",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Trebuie să fie în afara intervalului „{{start}}”-„{{end}}”",
     "lower_range_start_error": "Trebuie să fie mai mică decât începutul intervalului",
     "greater_range_start_error": "Trebuie să fie mai mare decât începutul intervalului",
+    "greater_range_end_error": "Trebuie să fie mai mare decât sfârșitul intervalului",
     "subnet_error": "Adresele trebuie să fie în aceeași subrețea",
     "gateway_or_subnet_invalid": "Mască de subrețea nevalidă",
     "dhcp_form_gateway_input": "IP Gateway",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Răspunde cu codul NXDOMAIN",
     "blocking_mode_null_ip": "IP nul: răspunde cu o adresă IP zero (0.0.0.0 pentru A; :: pentru AAAA)",
     "blocking_mode_custom_ip": "IP personalizat: răspunde cu o adresă IP setată manual",
-    "theme_auto": "Auto",
-    "theme_light": "Luminoasă",
-    "theme_dark": "Sombră",
     "upstream_dns_client_desc": "Dacă mențineți acest câmp gol, AdGuard Home va folosi serverele configurate în <0>setările DNS</0>.",
     "tracker_source": "Sursă tracker",
     "source_label": "Sursă",
@@ -454,7 +454,6 @@
     "updates_checked": "Este disponibilă o nouă versiune de AdGuard Home\n",
     "updates_version_equal": "AdGuard Home este la zi",
     "check_updates_now": "Verificați actualizările acum",
-    "version_request_error": "Verificarea actualizării nu a reușit. Verificați conexiunea internet.",
     "dns_privacy": "Confidențialitate DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Folosiți stringul <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Folosiți stringul <1>{{address}}</1>.",
@@ -639,9 +638,5 @@
     "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",
-    "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",
-    "protection_section_label": "Protecție"
+    "anonymizer_notification": "<0>Nota:</0> Anonimizarea IP este activată. Puteți să o dezactivați în <1>Setări generale</1>."
 }

client/src/__locales/ru.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Настройки DHCP IPv6",
     "form_error_required": "Обязательное поле",
     "form_error_ip4_format": "Некорректный IPv4-адрес",
+    "form_error_ip4_range_start_format": "Некорректный IPv4-адрес начала диапазона",
+    "form_error_ip4_range_end_format": "Некорректный IPv4-адрес конца диапазона",
     "form_error_ip4_gateway_format": "Некорректный IPv4-адрес шлюза",
     "form_error_ip6_format": "Некорректный IPv6-адрес",
     "form_error_ip_format": "Некорректный IP-адрес",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Должно быть вне диапазона «{{start}}»-«{{end}}»",
     "lower_range_start_error": "Должно быть меньше начала диапазона",
     "greater_range_start_error": "Должно быть больше начала диапазона",
+    "greater_range_end_error": "Должно быть больше конца диапазона",
     "subnet_error": "Адреса должны быть внутри одной подсети",
     "gateway_or_subnet_invalid": "Некорректная маска подсети",
     "dhcp_form_gateway_input": "IP-адрес шлюза",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Родительский контроль вкл.",
     "disabled_safe_search_toast": "Безопасный поиск выкл.",
     "enabled_save_search_toast": "Безопасный поиск вкл.",
-    "updated_save_search_toast": "Настройки безопасного поиска обновлены",
     "enabled_table_header": "Вкл.",
     "name_table_header": "Имя",
     "list_url_table_header": "URL-адрес списка",
@@ -257,12 +259,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-сервера",
@@ -291,8 +293,6 @@
     "rate_limit": "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 — неограниченно).",
     "blocking_ipv4_desc": "IP-адрес, возвращаемый при блокировке A-запроса",
     "blocking_ipv6_desc": "IP-адрес, возвращаемый при блокировке AAAA-запроса",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Отвечает с кодом NXDOMAIN\n",
     "blocking_mode_null_ip": "Нулевой IP: Отвечает с нулевым IP-адресом (0.0.0.0 для A; :: для AAAA)",
     "blocking_mode_custom_ip": "Пользовательский IP: Отвечает с вручную настроенным IP-адресом",
-    "theme_auto": "Авто",
-    "theme_light": "Светлая",
-    "theme_dark": "Тёмная",
     "upstream_dns_client_desc": "Если оставить поле пустым, AdGuard Home будет обращаться к серверам, указанным в <0>настройках DNS</0>.",
     "tracker_source": "Источник трекинга",
     "source_label": "Источник",
@@ -457,7 +454,6 @@
     "updates_checked": "Доступна новая версия AdGuard Home",
     "updates_version_equal": "Версия AdGuard Home актуальна",
     "check_updates_now": "Проверить обновления",
-    "version_request_error": "Ошибка при проверке наличия обновлений. Проверьте ваше интернет-соединение.",
     "dns_privacy": "Зашифрованный DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Используйте строку <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Используйте строку <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "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": "Настройка фильтров",
@@ -646,33 +638,5 @@
     "safe_browsing": "Безопасный интернет",
     "served_from_cache": "{{value}} <i>(получено из кеша)</i>",
     "form_error_password_length": "Пароль должен быть длиной не меньше {{value}} символов",
-    "anonymizer_notification": "<0>Внимание:</0> включена анонимизация IP-адресов. Вы можете отключить её в разделе <1>Основные настройки</1>.",
-    "confirm_dns_cache_clear": "Вы уверены, что хотите очистить кеш DNS?",
-    "cache_cleared": "Кеш DNS успешно очищен",
-    "clear_cache": "Очистить кеш",
-    "make_static": "Сделать статической",
-    "theme_auto_desc": "Авто (на основе цветовой схемы вашего устройства)",
-    "theme_dark_desc": "Тёмная тема",
-    "theme_light_desc": "Светлая тема",
-    "disable_for_seconds": "На {{count}} секунд",
-    "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": "Игнорировать этого клиента в статистике"
+    "anonymizer_notification": "<0>Внимание:</0> включена анонимизация IP-адресов. Вы можете отключить её в разделе <1>Основные настройки</1>."
 }

client/src/__locales/si-lk.json

@@ -30,6 +30,8 @@
     "dhcp_ipv6_settings": "ග.ධා.වි.කෙ. අ.ජා.කෙ. 6 සැකසුම්",
     "form_error_required": "ඇවැසි ක්‍ෂේත්‍රයකි",
     "form_error_ip4_format": "IPv4 ලිපිනය වලංගු නොවේ",
+    "form_error_ip4_range_start_format": "පරාසය ආරම්භයේ වලංගු නොවන අ.ජා.කෙ.4 ලිපිනයකි",
+    "form_error_ip4_range_end_format": "පරාසය අවසානයේ වලංගු නොවන අ.ජා.කෙ.4 ලිපිනයකි",
     "form_error_ip6_format": "වලංගු නොවන අ.ජා.කෙ.6 ලිපිනයකි",
     "form_error_ip_format": "අ.ජා.කෙ. (IP) ලිපිනය වලංගු නොවේ",
     "form_error_mac_format": "මා.ප්‍ර.පා. ලිපිනය වලංගු නොවේ",
@@ -40,6 +42,7 @@
     "out_of_range_error": "\"{{start}}\"-\"{{end}}\" පරාසයෙන් පිට විය යුතුය",
     "lower_range_start_error": "පරාසය ආරම්භයට වඩා අඩු විය යුතුය",
     "greater_range_start_error": "පරාසය ආරම්භයට වඩා වැඩි විය යුතුය",
+    "greater_range_end_error": "පරාසය අවසානයට වඩා වැඩි විය යුතුය",
     "subnet_error": "ලිපින එක් අනුජාලයක තිබිය යුතුය",
     "dhcp_form_range_title": "අ.ජා. කෙ. (IP) ලිපින පරාසය",
     "dhcp_form_range_start": "පරාසය ආරම්භය",

client/src/__locales/sk.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Nastavenia DHCP IPv6",
     "form_error_required": "Povinná položka.",
     "form_error_ip4_format": "Neplatná IPv4 adresa",
+    "form_error_ip4_range_start_format": "Neplatný začiatok rozsahu IPv4 formátu",
+    "form_error_ip4_range_end_format": "Neplatný koniec rozsahu IPv4 formátu",
     "form_error_ip4_gateway_format": "Neplatná IPv4 adresa brány",
     "form_error_ip6_format": "Neplatná IPv6 adresa",
     "form_error_ip_format": "Neplatná IP adresa",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Musí byť mimo rozsahu \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Musí byť nižšie ako začiatok rozsahu",
     "greater_range_start_error": "Musí byť väčšie ako začiatok rozsahu",
+    "greater_range_end_error": "Musí byť väčšie ako koniec rozsahu",
     "subnet_error": "Adresy musia byť v spoločnej podsieti",
     "gateway_or_subnet_invalid": "Maska podsiete je neplatná",
     "dhcp_form_gateway_input": "IP brána",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Zapnutá Rodičovská kontrola",
     "disabled_safe_search_toast": "Vypnuté Bezpečné vyhľadávanie",
     "enabled_save_search_toast": "Zapnuté Bezpečné vyhľadávanie",
-    "updated_save_search_toast": "Nastavenia Bezpečného vyhľadávania boli aktualizované",
     "enabled_table_header": "Zapnuté",
     "name_table_header": "Meno",
     "list_url_table_header": "Zoznam URL adries",
@@ -257,12 +259,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": "Rotácia denníkov dopytov",
+    "query_log_retention": "Obdobie záznamu denníka 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ť rotáciu denníka dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
+    "query_log_retention_confirm": "Naozaj chcete zmeniť uchovávanie denníku 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Rýchlostný limit",
     "edns_enable": "Povoliť klientsku podsiete EDNS",
     "edns_cs_desc": "Pridáva možnosť EDNS Client Subnet (ECS) do upstream požiadaviek a zapíše hodnoty odoslané klientmi do denníka dopytov.",
-    "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.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Odpovedať kódom NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Odpoveď s nulovou IP adresou (0.0.0.0 pre A; :: pre AAAA)",
     "blocking_mode_custom_ip": "Vlastná IP adresa: Odpovedzte s manuálne nastavenou IP adresou",
-    "theme_auto": "Auto",
-    "theme_light": "Svetlá",
-    "theme_dark": "Tmavá",
     "upstream_dns_client_desc": "Ak ponecháte toto pole prázdne, AdGuard Home použije servery nakonfigurované v <0>nastaveniach DNS</0>.",
     "tracker_source": "Zdroj sledovania",
     "source_label": "Zdroj",
@@ -457,7 +454,6 @@
     "updates_checked": "K dispozícii je nová verzia aplikácie AdGuard Home\n",
     "updates_version_equal": "AdGuard Home je aktuálny",
     "check_updates_now": "Skontrolovať aktualizácie teraz",
-    "version_request_error": "Kontrola aktualizácie zlyhala. Skontrolujte svoje internetové pripojenie.",
     "dns_privacy": "DNS súkromie",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Použiť <1>{{address}}</1> reťazec.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Použiť <1>{{address}}</1> reťazec.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Naozaj chcete zmeniť uchovávanie štatistík? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
     "statistics_cleared": "Štatistika bola úspešne vynulovaná",
     "statistics_enable": "Zapnúť štatistiku",
-    "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",
     "interval_hours": "{{count}} hodina",
     "interval_hours_plural": "{{count}} hodín",
     "filters_configuration": "Konfigurácia filtrov",
@@ -646,33 +638,5 @@
     "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",
-    "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á",
-    "clear_cache": "Vymazať vyrovnávaciu pamäť",
-    "make_static": "Vytvárať štatistiku",
-    "theme_auto_desc": "Automaticky (na základe farebnej schémy Vášho zariadenia)",
-    "theme_dark_desc": "Tmavá téma",
-    "theme_light_desc": "Svetlá téma",
-    "disable_for_seconds": "Na {{count}} sekundu",
-    "disable_for_seconds_plural": "Na {{count}} sekúnd",
-    "disable_for_minutes": "Na {{count}} minútu",
-    "disable_for_minutes_plural": "Na {{count}} minút",
-    "disable_for_hours": "Na {{count}} hodinu",
-    "disable_for_hours_plural": "Na {{count}} hodín",
-    "disable_until_tomorrow": "Do zajtra",
-    "disable_notify_for_seconds": "Vypnite ochranu na {{count}} sekundu",
-    "disable_notify_for_seconds_plural": "Vypnite ochranu na {{count}} sekúnd",
-    "disable_notify_for_minutes": "Vypnite ochranu na {{count}} minútu",
-    "disable_notify_for_minutes_plural": "Vypnite ochranu na {{count}} minút",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Poznámka:</0> Anonymizácia IP je zapnutá. Môžete ju vypnúť vo <1>Všeobecných nastaveniach</1>."
 }

client/src/__locales/sl.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Nastavitve DHCP IPv6",
     "form_error_required": "Zahtevano polje.",
     "form_error_ip4_format": "Neveljaven naslov IPv4.",
+    "form_error_ip4_range_start_format": "Neveljaven začetek razpona naslova IPv4",
+    "form_error_ip4_range_end_format": "Neveljaven konec razpona naslova IPv4",
     "form_error_ip4_gateway_format": "Neveljaven naslov IPv4 prehoda",
     "form_error_ip6_format": "Neveljaven naslov IPv6",
     "form_error_ip_format": "Neveljaven naslov IP",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Mora biti izven razpona \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Mora biti manjši od začetka razpona",
     "greater_range_start_error": "Mora biti večji od začetka razpona",
+    "greater_range_end_error": "Mora biti večji od konca razpona",
     "subnet_error": "Naslovi morajo biti v enem podomrežju",
     "gateway_or_subnet_invalid": "Maska podomrežja ni veljavna",
     "dhcp_form_gateway_input": "IP prehoda",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Omogočen starševski nadzor",
     "disabled_safe_search_toast": "Onemogočeno Varno iskanje",
     "enabled_save_search_toast": "Omogočeno Varno iskanje",
-    "updated_save_search_toast": "Nastavitve varnega iskanja so posodobljene",
     "enabled_table_header": "Omogočeno",
     "name_table_header": "Ime",
     "list_url_table_header": "Seznam URL naslovov",
@@ -257,12 +259,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": "Rotacija dnevnikov poizvedb",
+    "query_log_retention": "Zadrževanje 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 rotacijo dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
+    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje 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",
@@ -291,8 +293,6 @@
     "rate_limit": "Omejitev hitrosti",
     "edns_enable": "Omogoči odjemalsko podomrežje EDNS",
     "edns_cs_desc": "Dodaj možnost podomrežja odjemalca EDNS (ECS) zahtevam v gorvodnem toku in zabeleži vrednosti, ki jih pošljejo odjemalci, v dnevnik poizvedb.",
-    "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.",
     "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",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Odziv s kodo NXDOMAIN",
     "blocking_mode_null_ip": "Prazen IP: Odziv z ničelnim naslovom IP (0.0.0.0 za A; :: za AAAA)",
     "blocking_mode_custom_ip": "IP po meri: Odziv z ročno nastavljenim naslovom IP",
-    "theme_auto": "Auto",
-    "theme_light": "Svetla tema",
-    "theme_dark": "Temna tema",
     "upstream_dns_client_desc": "Če pustite to polje prazno, bo AdGuard Home uporabil strežnike, konfigurirane v <0>nastavitvah DNS</0>.",
     "tracker_source": "Vir sledilca",
     "source_label": "Vir",
@@ -457,7 +454,6 @@
     "updates_checked": "Na voljo je nova različica programa AdGuard Home\n",
     "updates_version_equal": "AdGuard Home je posodobljen",
     "check_updates_now": "Preveri obstoj posodobitev zdaj",
-    "version_request_error": "Posodobitev ni uspela. Preverite vašo internetno povezavo.",
     "dns_privacy": "Zasebnost DNS",
     "setup_dns_privacy_1": "<0>DNS-prek-TLS:</0> Uporabite niz <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-prek-HTTPS:</0> Uporabite niz <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje statistike? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
     "statistics_cleared": "Statistika je bila uspešno počiščena",
     "statistics_enable": "Omogoči statistiko",
-    "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",
     "interval_hours": "{{count}} ur",
     "interval_hours_plural": "{{count}} ur",
     "filters_configuration": "Nastavitve filtrov",
@@ -646,33 +638,5 @@
     "safe_browsing": "Varno brskanje",
     "served_from_cache": "{{value}} <i>(postreženo iz predpomnilnika)</i>",
     "form_error_password_length": "Geslo mora vsebovati najmanj {{value}} znakov",
-    "anonymizer_notification": "<0>Opomba:</0> Anonimizacija IP je omogočena. Onemogočite ga lahko v <1>Splošnih nastavitvah</1>.",
-    "confirm_dns_cache_clear": "Ali ste prepričani, da želite počistiti predpomnilnik DNS?",
-    "cache_cleared": "Predpomnilnik DNS je bil uspešno počiščen",
-    "clear_cache": "Počisti predpomnilnik",
-    "make_static": "Naredi statično",
-    "theme_auto_desc": "Samodejno (glede na barvno shemo vaše naprave)",
-    "theme_dark_desc": "Temna tema",
-    "theme_light_desc": "Svetla tema",
-    "disable_for_seconds": "Za {{count}} sekundo",
-    "disable_for_seconds_plural": "Za {{count}} sekund",
-    "disable_for_minutes": "Za {{count}} minuto",
-    "disable_for_minutes_plural": "Za {{count}} minut",
-    "disable_for_hours": "Za {{count}} uro",
-    "disable_for_hours_plural": "Za {{count}} ur",
-    "disable_until_tomorrow": "Do jutri",
-    "disable_notify_for_seconds": "Onemogoči zaščito za {{count}} sekundo",
-    "disable_notify_for_seconds_plural": "Onemogoči zaščito za {{count}} sekund",
-    "disable_notify_for_minutes": "Onemogoči zaščito za {{count}} minuto",
-    "disable_notify_for_minutes_plural": "Onemogoči zaščito za {{count}} minut",
-    "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}}",
-    "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"
+    "anonymizer_notification": "<0>Opomba:</0> Anonimizacija IP je omogočena. Onemogočite ga lahko v <1>Splošnih nastavitvah</1>."
 }

client/src/__locales/sr-cs.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 postavke",
     "form_error_required": "Obavezno polje",
     "form_error_ip4_format": "Nevažeća IPv4 adresa",
+    "form_error_ip4_range_start_format": "Nevažeća IPv4 addresa početnog opsega",
+    "form_error_ip4_range_end_format": "Nevažeća IPv4 addresa završnog opsega",
     "form_error_ip4_gateway_format": "Nevažeća IPv4 addresa prozala",
     "form_error_ip6_format": "Nevažeća IPv6 adresa",
     "form_error_ip_format": "Nevažeća IP adresa",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Mora biti izvan opsega \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Mora biti manje od početnog opsega",
     "greater_range_start_error": "Mora biti veće od početnog opsega",
+    "greater_range_end_error": "Mora biti veće od završnog opsega",
     "subnet_error": "Asrese moraju biti u jednoj subnet",
     "gateway_or_subnet_invalid": "Subnet mask nevažeća",
     "dhcp_form_gateway_input": "IP mrežnog prolaza",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Odgovara sa NXDOMAIN kodom",
     "blocking_mode_null_ip": "Null IP: Odgovara sa zero IP adresom (0.0.0.0 za A; :: za AAAA)",
     "blocking_mode_custom_ip": "Prilagođeni IP: Odgovara sa ručno podešenom IP adresom",
-    "theme_auto": "Auto",
-    "theme_light": "Svetla tema",
-    "theme_dark": "Tamna tema",
     "upstream_dns_client_desc": "AKo ovo polje ostavite prazno, AdGuard Home će koristiti servere konfigurisane u <0>DNS postavkama</0>.",
     "tracker_source": "Izvor praćenja",
     "source_label": "Izvor",
@@ -454,7 +454,6 @@
     "updates_checked": "Dostupna je nova verzija AdGuard Home-a",
     "updates_version_equal": "AdGuard Home je ažuriran na najnoviju verziju",
     "check_updates_now": "Proveri da li postoje ispravke",
-    "version_request_error": "Provera ažuriranja nije uspela. Proverite svoju vezu sa internetom.",
     "dns_privacy": "DNS privatnost",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> koristi <1>{{address}}</1> string.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> koristi <1>{{address}}</1> string.",
@@ -639,9 +638,5 @@
     "safe_browsing": "Sigurno pregledanje",
     "served_from_cache": "{{value}} <i>(posluženo iz predmemorije)</i>",
     "form_error_password_length": "Lozinka mora imati najmanje {{value}} znakova",
-    "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>.",
-    "confirm_dns_cache_clear": "Želite li zaista da obrišite DNS keš?",
-    "cache_cleared": "DNS keš je uspešno očišćen",
-    "clear_cache": "Obriši keš memoriju",
-    "protection_section_label": "Zaštita"
+    "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>."
 }

client/src/__locales/sv.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 inställningar",
     "form_error_required": "Obligatoriskt fält",
     "form_error_ip4_format": "Ogiltig IPv4-adress",
+    "form_error_ip4_range_start_format": "Ogiltig IPv4-adress för starten av intervallet",
+    "form_error_ip4_range_end_format": "Ogiltig IPv4-adress för slutet av intervallet",
     "form_error_ip4_gateway_format": "Ogiltig IPv4 adress för gatewayen",
     "form_error_ip6_format": "Ogiltig IPv6-adress",
     "form_error_ip_format": "Ogiltig IP-adress",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Måste vara utanför intervallet \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Måste vara lägre än starten på intervallet",
     "greater_range_start_error": "Måste vara högre än starten på intervallet",
+    "greater_range_end_error": "Måste vara större än intervallets slut",
     "subnet_error": "Adresser måste finnas i ett subnät",
     "gateway_or_subnet_invalid": "Subnätmask ogiltig",
     "dhcp_form_gateway_input": "Gateway-IP",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Svara med NXDOMAIN kod",
     "blocking_mode_null_ip": "Null IP: Svara med noll IP adress (0.0.0.0 för A; :: för AAAA)",
     "blocking_mode_custom_ip": "Anpassad IP: Svara med en manuellt inställd IP adress",
-    "theme_auto": "Auto",
-    "theme_light": "Ljust",
-    "theme_dark": "Mörkt",
     "upstream_dns_client_desc": "Om detta fält är tomt kommer AdGuard Home att använda de servrar som konfigurerats i <0>DNS inställningarna</0>.",
     "tracker_source": "Spårningskälla",
     "source_label": "Källa",
@@ -454,7 +454,6 @@
     "updates_checked": "En ny version av AdGuard Home är tillgänglig\n",
     "updates_version_equal": "AdGuard Home är uppdaterat",
     "check_updates_now": "Sök efter uppdateringar nu",
-    "version_request_error": "Uppdateringskontroll misslyckades. Kontrollera din internetanslutning.",
     "dns_privacy": "DNS-Integritet",
     "setup_dns_privacy_1": "<0>DNS-över-TLS:</0> Använd: <1>{{address}}</1>",
     "setup_dns_privacy_2": "<0>DNS-över-HTTPS:</0> Använd: <1>{{address}}</1>",
@@ -523,7 +522,6 @@
     "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_title": "Ignorerade domäner",
     "interval_hours": "{{count}} timme",
     "interval_hours_plural": "{{count}} timmar",
     "filters_configuration": "Filterinställningar",
@@ -640,17 +638,5 @@
     "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",
-    "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",
-    "theme_dark_desc": "Mörkt tema",
-    "theme_light_desc": "Ljust tema",
-    "disable_for_seconds": "I {{count}} sekund",
-    "disable_for_seconds_plural": "I {{count}} sekunder",
-    "disable_for_minutes": "I {{count}} minut",
-    "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"
+    "anonymizer_notification": "<0>Observera:</0> IP-anonymisering är aktiverad. Du kan inaktivera den i <1>Allmänna inställningar</1>."
 }

client/src/__locales/tr.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 Ayarları",
     "form_error_required": "Gerekli alan",
     "form_error_ip4_format": "Geçersiz IPv4 adresi",
+    "form_error_ip4_range_start_format": "Geçersiz başlangıç aralığı IPv4 biçimi",
+    "form_error_ip4_range_end_format": "Geçersiz bitiş aralığı IPv4 adresi",
     "form_error_ip4_gateway_format": "Geçersiz ağ geçidi IPv4 adresi",
     "form_error_ip6_format": "Geçersiz IPv6 adresi",
     "form_error_ip_format": "Geçersiz IP adresi",
@@ -49,8 +51,9 @@
     "out_of_range_error": "\"{{start}}\"-\"{{end}}\" aralığının dışında olmalıdır",
     "lower_range_start_error": "Başlangıç aralığından daha düşük olmalıdır",
     "greater_range_start_error": "Başlangıç aralığından daha büyük olmalıdır",
+    "greater_range_end_error": "Bitiş aralığından daha büyük olmalıdır",
     "subnet_error": "Adresler bir alt ağda olmalıdır",
-    "gateway_or_subnet_invalid": "Geçersiz alt ağ maskesi",
+    "gateway_or_subnet_invalid": "Alt ağ maskesi geçersiz",
     "dhcp_form_gateway_input": "Ağ geçidi IP",
     "dhcp_form_subnet_input": "Alt ağ maskesi",
     "dhcp_form_range_title": "IP adresi aralığı",
@@ -128,14 +131,14 @@
     "number_of_dns_query_days": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
     "number_of_dns_query_days_plural": "Son {{count}} gün boyunca işlenen DNS sorgularının sayısı",
     "number_of_dns_query_24_hours": "Son 24 saat içinde işlenen DNS sorgularının sayısı",
-    "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve hosts engel listeleri tarafından engellenen DNS isteklerinin sayısı",
+    "number_of_dns_query_blocked_24_hours": "Reklam engelleme filtreleri ve ana makine engel listeleri tarafından engellenen DNS isteklerinin sayısı",
     "number_of_dns_query_blocked_24_hours_by_sec": "AdGuard gezinti koruması modülü tarafından engellenen DNS isteklerinin sayısı",
     "number_of_dns_query_blocked_24_hours_adult": "Engellenen yetişkin içerikli sitelerin sayısı",
     "enforced_save_search": "Uygulanan güvenli arama",
     "number_of_dns_query_to_safe_search": "Güvenli Aramanın uygulandığı arama motorlarına gönderilen DNS isteklerinin sayısı",
     "average_processing_time": "Ortalama işlem süresi",
     "average_processing_time_hint": "Bir DNS isteğinin milisaniye cinsinden ortalama işlem süresi",
-    "block_domain_use_filters_and_hosts": "Filtre ve hosts dosyalarını kullanarak alan adlarını engelle",
+    "block_domain_use_filters_and_hosts": "Filtre ve ana makine listelerini kullanarak alan adlarını engelle",
     "filters_block_toggle_hint": "<a>Filtreler</a> ayarlarında engelleme kuralları oluşturabilirsiniz.",
     "use_adguard_browsing_sec": "AdGuard gezinti koruması web hizmetini kullan",
     "use_adguard_browsing_sec_hint": "AdGuard Home, alan adının gezinti koruması web hizmeti tarafından engellenip engellenmediğini kontrol eder. Kontrolü gerçekleştirmek için gizlilik dostu arama API'sini kullanır: sunucuya yalnızca SHA256 karma alan adının kısa bir ön eki gönderilir.",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "Ebeveyn Denetimi etkinleştirildi",
     "disabled_safe_search_toast": "Güvenli Arama devre dışı bırakıldı",
     "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",
     "list_url_table_header": "Liste URL'si",
@@ -178,7 +180,7 @@
     "edit_table_action": "Düzenle",
     "delete_table_action": "Sil",
     "elapsed": "Geçen süre",
-    "filters_and_hosts_hint": "AdGuard Home, temel reklam engelleme kurallarını ve hosts dosyalarının söz dizimini anlar.",
+    "filters_and_hosts_hint": "AdGuard Home, temel reklam engelleme kurallarını ve ana makine dosyalarının söz dizimini anlar.",
     "no_blocklist_added": "Engel listesi eklenmedi",
     "no_whitelist_added": "İzin listesi eklenmedi",
     "add_blocklist": "Engel listesi ekle",
@@ -198,8 +200,8 @@
     "form_error_url_format": "Geçersiz URL biçimi",
     "form_error_url_or_path_format": "Geçersiz URL adresi veya dosya yolu",
     "custom_filter_rules": "Özel filtreleme kuralları",
-    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklam engelleme kuralı veya hosts dosyası söz dizimi kullanabilirsiniz.",
-    "system_host_files": "Sistem hosts dosyaları",
+    "custom_filter_rules_hint": "Her satıra bir kural girin. Reklam engelleme kuralı veya ana makine dosyası söz dizimi kullanabilirsiniz.",
+    "system_host_files": "Sistem ana makine dosyaları",
     "examples_title": "Örnekler",
     "example_meaning_filter_block": "example.org'a ve tüm alt alanlarına erişimi engeller;",
     "example_meaning_filter_whitelist": "example.org'a ve tüm alt alanlarına erişimin engelini kaldırır;",
@@ -257,12 +259,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ükleri rotasyonu",
+    "query_log_retention": "Sorgu günlüklerini sakla",
     "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üğü rotasyonunu değiştirmek istediğinizden emin misiniz? Aralık değerini düşürürseniz, bazı veriler kaybolacaktır.",
+    "query_log_retention_confirm": "Sorgu günlüğü saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
     "anonymize_client_ip": "İ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ı",
@@ -291,8 +293,6 @@
     "rate_limit": "Sıklık limiti",
     "edns_enable": "EDNS istemci alt ağını etkinleştir",
     "edns_cs_desc": "Kaynak yönü isteklerine EDNS İstemci Alt Ağı seçeneğini (ECS) ekleyin ve istemciler tarafından gönderilen değerleri sorgu günlüğüne kaydedin.",
-    "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.",
     "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",
@@ -301,9 +301,6 @@
     "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)",
     "blocking_mode_custom_ip": "Özel IP: El ile ayarlanmış bir IP adresiyle yanıt verin",
-    "theme_auto": "Otomatik",
-    "theme_light": "Açık",
-    "theme_dark": "Koyu",
     "upstream_dns_client_desc": "Bu alanı boş bırakırsanız, AdGuard Home, <0>DNS ayarlarında</0> yapılandırılan sunucuları kullanır.",
     "tracker_source": "İzleyici kaynağı",
     "source_label": "Kaynak",
@@ -353,12 +350,12 @@
     "install_devices_macos_list_3": "Listedeki ilk bağlantıyı seçin ve Gelişmiş öğesine tıklayın.",
     "install_devices_macos_list_4": "DNS sekmesini seçin ve AdGuard Home sunucunuzun adreslerini girin.",
     "install_devices_android_list_1": "Android Menüsü ana ekranından Ayarlar'a dokunun.",
-    "install_devices_android_list_2": "Menüde bulunan Wi-Fi öğesine dokunun. Mevcut tüm ağlar listelenecektir (telefon ağlar için özel DNS sunucusu ayarlanamaz).",
+    "install_devices_android_list_2": "Menüde bulunan Wi-Fi öğesine dokunun. Mevcut tüm ağlar listelenecektir (mobil ağlar için özel DNS sunucusu ayarlanamaz).",
     "install_devices_android_list_3": "Bağlı olduğunuz ağın üzerine basılı tutun ve Ağı Değiştir'e dokunun.",
     "install_devices_android_list_4": "Bazı cihazlarda, diğer ayarları görmek için \"Gelişmiş\" seçeneğini seçmeniz gerekebilir. Android DNS ayarlarınızı yapmak için IP ayarlarını DHCP modundan Statik moda değiştirmeniz gerekir.",
     "install_devices_android_list_5": "DNS 1 ve DNS 2 değerlerini AdGuard Home sunucunuzun adresleriyle değiştirin.",
     "install_devices_ios_list_1": "Ana ekrandan Ayarlar'a dokunun.",
-    "install_devices_ios_list_2": "Sol menüde bulunan Wi-Fi bölümüne girin (telefon ağlar için özel DNS sunucusu ayarlanamaz).",
+    "install_devices_ios_list_2": "Sol menüde bulunan Wi-Fi bölümüne girin (mobil ağlar için özel DNS sunucusu ayarlanamaz).",
     "install_devices_ios_list_3": "O anda aktif olan ağın adına dokunun.",
     "install_devices_ios_list_4": "DNS alanına AdGuard Home sunucunuzun adreslerini girin.",
     "get_started": "Başlayın",
@@ -413,7 +410,7 @@
     "fix": "Düzelt",
     "dns_providers": "Aralarından seçim yapabileceğiniz, bilinen <0>DNS sağlayıcıların listesi</0>.",
     "update_now": "Şimdi güncelle",
-    "update_failed": "Otomatik güncellenemedi. Elle güncellemek için lütfen <a>bu adımları izleyin</a>.",
+    "update_failed": "Otomatik güncelleme başarısız oldu. Elle güncellemek için lütfen <a>bu adımları izleyin</a>.",
     "manual_update": "Elle güncellemek için lütfen <a>bu adımları uygulayın</a>.",
     "processing_update": "Lütfen bekleyin, AdGuard Home güncelleniyor",
     "clients_title": "Kalıcı istemciler",
@@ -452,12 +449,11 @@
     "access_disallowed_title": "İzin verilmeyen istemciler",
     "access_disallowed_desc": "CIDR'lerin, IP adreslerinin veya <a>İstemci Kimliklerin</a> listesi. Bu listede girişler varsa, AdGuard Home bu istemcilerden gelen istekleri keser. İzin verilen istemcilerde girişler varsa, bu alan yok sayılır.",
     "access_blocked_title": "İzin verilmeyen alan adları",
-    "access_blocked_desc": "Bu işlem filtrelerle ilgili değildir. AdGuard Home, bu alan adlarından gelen DNS sorgularını yanıtsız bırakır ve bu sorgular sorgu günlüğünde görünmez. Tam alan adlarını, joker karakterleri veya URL filtre kurallarını belirtebilirsiniz, örn. \"example.org\", \"*.example.org\" veya \"||example.org^\".",
+    "access_blocked_desc": "Bu işlem filtrelerle ilgili değildir. AdGuard Home, bu alan adlarından gelen DNS sorgularını yanıtsız bırakır ve bu sorgular sorgu günlüğünde görünmez. Tam alan adlarını, joker karakterleri veya URL filtre kurallarını belirtebilirsiniz, ör. \"example.org\", \"*.example.org\" veya \"||example.org^\".",
     "access_settings_saved": "Erişim ayarları başarıyla kaydedildi!",
     "updates_checked": "AdGuard Home'un yeni bir sürümü mevcut",
     "updates_version_equal": "AdGuard Home yazılımı güncel durumda",
     "check_updates_now": "Güncellemeleri şimdi denetle",
-    "version_request_error": "Güncelleme denetimi başarısız. Lütfen internet bağlantınızı kontrol edin.",
     "dns_privacy": "DNS Gizliliği",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> <1>{{address}}</1> dizesini kullan.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> <1>{{address}}</1> dizesini kullan.",
@@ -483,7 +479,7 @@
     "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.",
     "rewrite_applied": "Yeniden yazım kuralı uygulandı",
-    "rewrite_hosts_applied": "Hosts dosyası kuralı tarafından yeniden yazıldı",
+    "rewrite_hosts_applied": "Ana makine dosyası kuralı tarafından yeniden yazıldı",
     "dns_rewrites": "DNS yeniden yazımları",
     "form_domain": "Alan adı veya joker karakter girin",
     "form_answer": "IP adresi veya alan adı girin",
@@ -526,10 +522,6 @@
     "statistics_retention_confirm": "İstatistik saklama süresini değiştirmek istediğinizden emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
     "statistics_cleared": "İstatistikler başarıyla temizlendi",
     "statistics_enable": "İstatistikleri etkinleştir",
-    "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",
     "interval_hours": "{{count}} saat",
     "interval_hours_plural": "{{count}} saat",
     "filters_configuration": "Filtre yapılandırması",
@@ -550,7 +542,7 @@
     "network": "Ağ",
     "descr": "Açıklama",
     "whois": "WHOIS",
-    "filtering_rules_learn_more": "Kendi hosts listelerinizi oluşturma hakkında <0>daha fazla bilgi edinin</0>.",
+    "filtering_rules_learn_more": "Kendi ana makine listelerinizi oluşturma hakkında <0>daha fazla bilgi edinin</0>.",
     "blocked_by_response": "Yanıt olarak CNAME veya IP tarafından engellendi",
     "blocked_by_cname_or_ip": "CNAME veya IP tarafından engellendi",
     "try_again": "Tekrar dene",
@@ -646,33 +638,5 @@
     "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",
-    "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",
-    "clear_cache": "Önbelleği temizle",
-    "make_static": "Statik yap",
-    "theme_auto_desc": "Otomatik (cihazınızın renk düzenine göre)",
-    "theme_dark_desc": "Koyu tema",
-    "theme_light_desc": "Açık tema",
-    "disable_for_seconds": "{{count}} saniye için",
-    "disable_for_seconds_plural": "{{count}} saniye için",
-    "disable_for_minutes": "{{count}} dakika için",
-    "disable_for_minutes_plural": "{{count}} dakika için",
-    "disable_for_hours": "{{count}} saat için",
-    "disable_for_hours_plural": "{{count}} saat için",
-    "disable_until_tomorrow": "Yarına kadar",
-    "disable_notify_for_seconds": "Korumayı {{count}} saniyeliğine devre dışı bırak",
-    "disable_notify_for_seconds_plural": "Korumayı {{count}} saniyeliğine devre dışı bırak",
-    "disable_notify_for_minutes": "Korumayı {{count}} dakiklığına devre dışı bırak",
-    "disable_notify_for_minutes_plural": "Korumayı {{count}} dakiklığına devre dışı bırak",
-    "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",
-    "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"
+    "anonymizer_notification": "<0>Not:</0> IP anonimleştirme etkinleştirildi. Bunu <1>Genel ayarlardan</1> devre dışı bırakabilirsiniz."
 }

client/src/__locales/uk.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Налаштування DHCP IPv6",
     "form_error_required": "Обов'язкове поле",
     "form_error_ip4_format": "Неправильна IPv4-адреса",
+    "form_error_ip4_range_start_format": "Неправильна IPv4-адреса початку діапазону",
+    "form_error_ip4_range_end_format": "Неправильна IPv4-адреса кінця діапазону",
     "form_error_ip4_gateway_format": "Неправильна IPv4-адреса шлюзу",
     "form_error_ip6_format": "Неправильна IPv6-адреса",
     "form_error_ip_format": "Неправильна IP-адреса",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Не повинна бути в діапазоні «{{start}}»−«{{end}}»",
     "lower_range_start_error": "Має бути меншим за початкову адресу",
     "greater_range_start_error": "Має бути більшим за початкову адресу",
+    "greater_range_end_error": "Має бути більшим за кінцеву адресу",
     "subnet_error": "Адреси повинні бути в одній підмережі",
     "gateway_or_subnet_invalid": "Неправильна маска підмережі",
     "dhcp_form_gateway_input": "IP-адреса шлюзу",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "«Батьківський контроль» увімкнено",
     "disabled_safe_search_toast": "Безпечний пошук вимкнено",
     "enabled_save_search_toast": "Безпечний пошук увімкнено",
-    "updated_save_search_toast": "Налаштування Безпечного пошуку оновлено",
     "enabled_table_header": "Увімкнено",
     "name_table_header": "Назва",
     "list_url_table_header": "URL списку",
@@ -291,8 +293,6 @@
     "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» означатиме необмежену кількість.",
     "blocking_ipv4_desc": "IP-адреса, яку потрібно видати для заблокованого A запиту",
     "blocking_ipv6_desc": "IP-адреса, яку потрібно видати для заблокованого АААА запиту",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Відповісти з кодом NXDOMAIN",
     "blocking_mode_null_ip": "Нульовий IP: Відповісти з нульовою IP-адресою (0.0.0.0 для A; :: для AAAA)",
     "blocking_mode_custom_ip": "Спеціальна IP-адреса: Відповісти із вручну встановленою IP-адресою",
-    "theme_auto": "Авто",
-    "theme_light": "Світла",
-    "theme_dark": "Темна",
     "upstream_dns_client_desc": "Якщо це поле залишатиметься порожнім, AdGuard Home використовуватиме сервери, вказані в <0>налаштуваннях DNS</0>.",
     "tracker_source": "Джерело відстежувача",
     "source_label": "Джерело",
@@ -396,7 +393,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",
@@ -457,7 +454,6 @@
     "updates_checked": "Доступна нова версія AdGuard Home",
     "updates_version_equal": "AdGuard Home останньої версії",
     "check_updates_now": "Перевірити наявність оновлень",
-    "version_request_error": "Не вдалося перевірити оновлення. Будь ласка, перевірте з'єднання з інтернетом.",
     "dns_privacy": "Конфіденційність DNS",
     "setup_dns_privacy_1": "<0>DNS-over-TLS: </0>Використайте рядок <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Використайте рядок <1>{{address}}</1>.",
@@ -526,10 +522,6 @@
     "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": "Конфігурація фільтрів",
@@ -646,33 +638,5 @@
     "safe_browsing": "Безпечний перегляд",
     "served_from_cache": "{{value}} <i>(отримано з кешу)</i>",
     "form_error_password_length": "Пароль мусить мати принаймні {{value}} символів",
-    "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> .",
-    "confirm_dns_cache_clear": "Ви впевнені, що бажаєте очистити кеш DNS?",
-    "cache_cleared": "Кеш DNS успішно очищено",
-    "clear_cache": "Очистити кеш",
-    "make_static": "Зробити статичним",
-    "theme_auto_desc": "Автоматична (на основі теми вашого пристрою)",
-    "theme_dark_desc": "Темна тема",
-    "theme_light_desc": "Світла тема",
-    "disable_for_seconds": "На {{count}} секунду",
-    "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": "Ігноруйте цей клієнт в статистиці"
+    "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> ."
 }

client/src/__locales/vi.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "Cài đặt DHCP IPv6",
     "form_error_required": "Trường bắt buộc",
     "form_error_ip4_format": "Địa chỉ IPv4 không hợp lệ",
+    "form_error_ip4_range_start_format": "Địa chỉ IPv4 không hợp lệ của phạm vi bắt đầu",
+    "form_error_ip4_range_end_format": "Địa chỉ IPv4 không hợp lệ của cuối phạm vi",
     "form_error_ip4_gateway_format": "Địa chỉ IPv4 không hợp lệ của cổng kết nối",
     "form_error_ip6_format": "Địa chỉ IPv6 không hợp lệ",
     "form_error_ip_format": "Địa chỉ IP không hợp lệ",
@@ -49,6 +51,7 @@
     "out_of_range_error": "Phải nằm ngoài phạm vi \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "Phải thấp hơn khởi động phạm vi",
     "greater_range_start_error": "Phải lớn hơn khoảng bắt đầu",
+    "greater_range_end_error": "Phải lớn hơn phạm vi kết thúc",
     "subnet_error": "Địa chỉ phải nằm trong một mạng con",
     "gateway_or_subnet_invalid": "Mặt nạ mạng con không hợp lệ",
     "dhcp_form_gateway_input": "Cổng IP",
@@ -298,9 +301,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Phản hổi với mã NXDOMAIN",
     "blocking_mode_null_ip": "Null IP: Trả lời bằng không địa chỉ IP (0.0.0.0 cho A; :: cho AAAA)",
     "blocking_mode_custom_ip": "IP tùy chỉnh: Phản hồi với địa chỉ IP đã được tiết lập",
-    "theme_auto": "Tự động",
-    "theme_light": "Light theme",
-    "theme_dark": "Dark theme",
     "upstream_dns_client_desc": "Nếu để trống trường này, AdGuardHome sẽ sử dụng nhũng máy chủ được cấu hình ở <0>Cấu hình DNS</0>.",
     "tracker_source": "Nguồn theo dõi",
     "source_label": "Nguồn",
@@ -454,7 +454,6 @@
     "updates_checked": "Phiên bản mới của AdGuard Home có sẵn",
     "updates_version_equal": "AdGuard Home đã được cập nhật",
     "check_updates_now": "Kiểm tra cập nhật ngay bây giờ",
-    "version_request_error": "Cập nhật không thành công. Hãy kiểm tra kết nối internet của bạn.",
     "dns_privacy": "DNS Riêng Tư",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> Sử dụng chuỗi <1>{{address}}</1>.",
@@ -639,9 +638,5 @@
     "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ự",
-    "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",
-    "protection_section_label": "Sự bảo vệ"
+    "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>."
 }

client/src/__locales/zh-cn.json

@@ -16,7 +16,7 @@
     "resolve_clients_title": "启用客户端的 IP 地址的反向解析",
     "resolve_clients_desc": "通过发送 PTR 查询到对应的解析器 (本地客户端的私人 DNS 服务器，公共 IP 客户端的上游服务器) 将 IP 地址反向解析成其客户端主机名。",
     "use_private_ptr_resolvers_title": "使用私人反向 DNS 解析器",
-    "use_private_ptr_resolvers_desc": "使用这些上游服务器对本地服务的地址执行反向 DNS 查找。 如果禁用，则 AdGuard Home 会以 NXDOMAIN 响应所有此类 PTR 请求，从 DHCP、/etc/hosts 等获知的客户端除外。",
+    "use_private_ptr_resolvers_desc": "使用这些上游服务器对本地服务的地址执行反向 DNS 查找。 如果禁用，则 AdGuard Home会以 NXDOMAIN 响应所有此类PTR请求，从 DHCP、/ etc / hosts 等获知的客户端除外。",
     "check_dhcp_servers": "检查 DHCP 服务器",
     "save_config": "保存配置",
     "enabled_dhcp": "DHCP 服务器已启用",
@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6设置",
     "form_error_required": "必填字段",
     "form_error_ip4_format": "无效的 IPv4 地址",
+    "form_error_ip4_range_start_format": "范围起始值的 IPv4 地址无效",
+    "form_error_ip4_range_end_format": "范围终值的 IPv4 地址无效",
     "form_error_ip4_gateway_format": "网关 IPv4 地址无效",
     "form_error_ip6_format": "无效的 IPv6 地址",
     "form_error_ip_format": "无效的 IP 地址",
@@ -49,6 +51,7 @@
     "out_of_range_error": "必定超出了范围 \"{{start}}\"-\"{{end}}\"",
     "lower_range_start_error": "必须小于范围起始值",
     "greater_range_start_error": "必须大于范围起始值",
+    "greater_range_end_error": "必须大于范围终值",
     "subnet_error": "地址必须在一个子网内",
     "gateway_or_subnet_invalid": "子网掩码无效",
     "dhcp_form_gateway_input": "网关 IP",
@@ -128,7 +131,7 @@
     "number_of_dns_query_days": "过去 {{count}} 天内处理的 DNS 查询总数",
     "number_of_dns_query_days_plural": "在过去的 {{count}} 天内处理了多少个 DNS 查询",
     "number_of_dns_query_24_hours": "过去 24 小时内处理的 DNS 请求总数",
-    "number_of_dns_query_blocked_24_hours": "被广告过滤器和 Hosts 黑名单阻止的 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": "强制安全搜索",
@@ -146,10 +149,10 @@
     "no_servers_specified": "未找到指定的服务器",
     "general_settings": "常规设置",
     "dns_settings": "DNS 设置",
-    "dns_blocklists": "DNS 黑名单",
-    "dns_allowlists": "DNS 白名单",
+    "dns_blocklists": "DNS 拦截列表",
+    "dns_allowlists": "DNS 允许列表",
     "dns_blocklists_desc": "AdGuard Home将阻止匹配DNS拦截清单的域名",
-    "dns_allowlists_desc": "来自 DNS 白名单的域名将被允许，即使它们位于任意黑名单中也是如此。",
+    "dns_allowlists_desc": "来自DNS允许列表的域将被允许，即使它们位于任意阻止列表中也是如此",
     "custom_filtering_rules": "自定义过滤规则",
     "encryption_settings": "加密设置",
     "dhcp_settings": "DHCP 设置",
@@ -167,34 +170,33 @@
     "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": "清单网址",
     "rules_count_table_header": "规则数",
     "last_time_updated_table_header": "上次更新时间",
-    "actions_table_header": "操作",
+    "actions_table_header": "活跃状态",
     "request_table_header": "请求",
     "edit_table_action": "编辑",
     "delete_table_action": "删除",
     "elapsed": "耗时",
     "filters_and_hosts_hint": "AdGuard Home 可以解析基础的 adblock 规则和 Hosts 语法。",
-    "no_blocklist_added": "未添加黑名单",
-    "no_whitelist_added": "未添加白名单",
-    "add_blocklist": "添加黑名单",
-    "add_allowlist": "添加白名单",
+    "no_blocklist_added": "未添加阻止列表",
+    "no_whitelist_added": "未添加允许列表",
+    "add_blocklist": "添加阻止列表",
+    "add_allowlist": "添加允许列表",
     "cancel_btn": "取消",
     "enter_name_hint": "输入名称",
     "enter_url_or_path_hint": "请输入URL或列表的绝对路径",
     "check_updates_btn": "检查更新",
     "new_blocklist": "新封锁清单",
-    "new_allowlist": "新增白名单",
-    "edit_blocklist": "编辑黑名单",
-    "edit_allowlist": "编辑白名单",
-    "choose_blocklist": "选择黑名单",
-    "choose_allowlist": "选择白名单",
-    "enter_valid_blocklist": "输入有效的黑名单 URL",
-    "enter_valid_allowlist": "输入有效的白名单 URL",
+    "new_allowlist": "新的允许清单",
+    "edit_blocklist": "编辑阻止列表",
+    "edit_allowlist": "编辑允许列表",
+    "choose_blocklist": "选择拦截列表",
+    "choose_allowlist": "选择允许列表",
+    "enter_valid_blocklist": "输入有效的阻止列表URL",
+    "enter_valid_allowlist": "输入有效的允许列表URL",
     "form_error_url_format": "无效的 URL 格式",
     "form_error_url_or_path_format": "无效的 URL 或列表的绝对路径",
     "custom_filter_rules": "自定义过滤器规则",
@@ -257,12 +259,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 服务配置",
@@ -270,9 +272,9 @@
     "dns_cache_config_desc": "您可以在此处配置 DNS 缓存",
     "blocking_mode": "拦截模式",
     "default": "默认",
-    "nxdomain": "NXDOMAIN",
+    "nxdomain": "无效域名",
     "refused": "REFUSED",
-    "null_ip": "空 IP",
+    "null_ip": "无效 IP",
     "custom_ip": "自定义 IP",
     "blocking_ipv4": "拦截 IPv4",
     "blocking_ipv6": "拦截 IPv6",
@@ -291,19 +293,14 @@
     "rate_limit": "速度限制",
     "edns_enable": "启用 EDNS 客户端子网",
     "edns_cs_desc": "在上游请求中加入 EDNS 客户端子网（“EDNS Client Subnet”，即 ECS）选项，并在查询日志中记录客户端发送的数值。",
-    "edns_use_custom_ip": "为 EDNS 使用自定义 IP",
-    "edns_use_custom_ip_desc": "允许为 EDNS 使用自定义 IP",
     "rate_limit_desc": "每个客户端每秒钟查询次数的限制。设置为 0 意味着不限制。",
     "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_refused": "REFUSED：以 REFUSED 码响应请求",
     "blocking_mode_nxdomain": "NXDOMAIN：以NXDOMAIN码响应",
-    "blocking_mode_null_ip": "空 IP：以零 IP 地址响应（A 记录 0.0.0.0；AAAA 记录 ::）",
+    "blocking_mode_null_ip": "空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>中配置的服务器。",
     "tracker_source": "追踪器来源",
     "source_label": "源",
@@ -457,7 +454,6 @@
     "updates_checked": "AdGuard Home 的新版本现在可用",
     "updates_version_equal": "AdGuard Home已经是最新版本",
     "check_updates_now": "立即检查更新",
-    "version_request_error": "检查更新失败。请检查您的因特网连接。",
     "dns_privacy": "DNS 隐私",
     "setup_dns_privacy_1": "<0>DNS-over-TLS:</0> 使用 <1>{{address}}</1> 字符串。",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS:</0> 使用 <1>{{address}}</1> 字符串。",
@@ -526,10 +522,6 @@
     "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": "过滤器配置",
@@ -612,7 +604,7 @@
     "filtered": "已过滤",
     "rewritten": "重写项",
     "safe_search": "安全搜索",
-    "blocklist": "黑名单",
+    "blocklist": "拦截列表",
     "milliseconds_abbreviation": "毫秒",
     "cache_size": "缓存大小",
     "cache_size_desc": "DNS 缓存大小（单位：字节）。要关闭缓存，请留空。",
@@ -633,7 +625,7 @@
     "filter_category_general_desc": "在大多数设备上阻止跟踪和广告的列表",
     "filter_category_security_desc": "专用于拦截恶意软件、钓鱼或欺诈域名的列表",
     "filter_category_regional_desc": "专注于区域广告和跟踪服务器的列表",
-    "filter_category_other_desc": "其他黑名单",
+    "filter_category_other_desc": "其他阻止列表",
     "setup_config_to_enable_dhcp_server": "设置配置以启用 DHCP 服务器",
     "original_response": "原始响应",
     "click_to_view_queries": "点击查看查询",
@@ -646,33 +638,5 @@
     "safe_browsing": "安全浏览",
     "served_from_cache": "{{value}}<i>(由缓存提供)</i>",
     "form_error_password_length": "密码必须至少有 {{value}} 个字符",
-    "anonymizer_notification": "<0>注意：</0> IP 匿名化已启用。您可以在<1>常规设置</1>中禁用它。",
-    "confirm_dns_cache_clear": "您确定要清除 DNS 缓存吗？",
-    "cache_cleared": "已成功清除 DNS 缓存",
-    "clear_cache": "清除缓存",
-    "make_static": "静态化",
-    "theme_auto_desc": "自动（基于设备的配色方案）",
-    "theme_dark_desc": "暗黑主题",
-    "theme_light_desc": "浅色主题",
-    "disable_for_seconds": "{{count}} 秒",
-    "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": "在统计数据中忽略此客户端"
+    "anonymizer_notification": "<0>注意：</0> IP 匿名化已启用。您可以在<1>常规设置</1>中禁用它。"
 }

client/src/__locales/zh-hk.json

@@ -38,6 +38,8 @@
     "form_error_required": "必要欄位",
     "form_error_ip4_format": "無效的 IPv4 格式",
     "form_error_ip6_format": "無效的 IPv6 格式",
+    "form_error_ip4_range_start_format": "無效的 IPv4 範圍起始位址",
+    "form_error_ip4_range_end_format": "無效的 IPv4 範圍結束位址",
     "form_error_ip4_gateway_format": "閘道的 IPv4 位址無效",
     "form_error_ip_format": "無效的 IP 位址",
     "form_error_mac_format": "無效的 「MAC 位址」格式",

client/src/__locales/zh-tw.json

@@ -37,6 +37,8 @@
     "dhcp_ipv6_settings": "DHCP IPv6 設定",
     "form_error_required": "必填的欄位",
     "form_error_ip4_format": "無效的 IPv4 位址",
+    "form_error_ip4_range_start_format": "無效起始範圍的 IPv4 位址",
+    "form_error_ip4_range_end_format": "無效結束範圍的 IPv4 位址",
     "form_error_ip4_gateway_format": "無效閘道的 IPv4 位址",
     "form_error_ip6_format": "無效的 IPv6 位址",
     "form_error_ip_format": "無效的 IP 位址",
@@ -49,6 +51,7 @@
     "out_of_range_error": "必須在\"{{start}}\"-\"{{end}}\"範圍之外",
     "lower_range_start_error": "必須低於起始範圍",
     "greater_range_start_error": "必須大於起始範圍",
+    "greater_range_end_error": "必須大於結束範圍",
     "subnet_error": "位址必須在子網路中",
     "gateway_or_subnet_invalid": "無效的子網路遮罩",
     "dhcp_form_gateway_input": "閘道 IP",
@@ -167,7 +170,6 @@
     "enabled_parental_toast": "已啟用家長控制",
     "disabled_safe_search_toast": "已禁用安全搜尋",
     "enabled_save_search_toast": "已啟用安全搜尋",
-    "updated_save_search_toast": "安全搜尋設定更新成功",
     "enabled_table_header": "已啟用",
     "name_table_header": "名稱",
     "list_url_table_header": "清單網址",
@@ -257,12 +259,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 伺服器配置",
@@ -291,8 +293,6 @@
     "rate_limit": "速率限制",
     "edns_enable": "啟用對於 DNS 的擴充機制（EDNS）用戶端子網路",
     "edns_cs_desc": "新增對於 DNS 的擴充機制（EDNS）用戶端子網路選項到上游的請求，並在查詢記錄中記錄由用戶端傳送的數值。",
-    "edns_use_custom_ip": "為 EDNS 使用自訂的 IP",
-    "edns_use_custom_ip_desc": "允許為 EDNS 使用自訂的 IP",
     "rate_limit_desc": "每個用戶端被允許的每秒請求之數量。設定它為 0 表示無限制。",
     "blocking_ipv4_desc": "要被返回給已封鎖的 A 請求之 IP 位址",
     "blocking_ipv6_desc": "要被返回給已封鎖的 AAAA 請求之 IP 位址",
@@ -301,9 +301,6 @@
     "blocking_mode_nxdomain": "不存在的網域（NXDOMAIN）：以 NXDOMAIN 碼回覆",
     "blocking_mode_null_ip": "無效的 IP：以零值 IP 位址（0.0.0.0 供 A；:: 供 AAAA）回覆",
     "blocking_mode_custom_ip": "自訂的 IP：以一組手動地被設定的 IP 位址回覆",
-    "theme_auto": "自動",
-    "theme_light": "淺色",
-    "theme_dark": "深色",
     "upstream_dns_client_desc": "如果您將此欄位留空，AdGuard Home 將使用在 <0>DNS 設定</0>中被配置的伺服器。",
     "tracker_source": "追蹤器來源",
     "source_label": "來源",
@@ -457,7 +454,6 @@
     "updates_checked": "AdGuard Home 的新版本為可用的",
     "updates_version_equal": "AdGuard Home 為最新的",
     "check_updates_now": "立即檢查更新",
-    "version_request_error": "更新檢查已失敗。請檢查您的網際網路連線。",
     "dns_privacy": "DNS 隱私",
     "setup_dns_privacy_1": "<0>DNS-over-TLS：</0>使用 <1>{{address}}</1> 字串。",
     "setup_dns_privacy_2": "<0>DNS-over-HTTPS：</0>使用 <1>{{address}}</1> 字串。",
@@ -526,10 +522,6 @@
     "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": "過濾器配置",
@@ -646,33 +638,5 @@
     "safe_browsing": "安全瀏覽",
     "served_from_cache": "{{value}} <i>(由快取提供)</i>",
     "form_error_password_length": "密碼必須為至少長 {{value}} 個字元",
-    "anonymizer_notification": "<0>注意：</0>IP 匿名化被啟用。您可在<1>一般設定</1>中禁用它。",
-    "confirm_dns_cache_clear": "您確定您想要清除 DNS 快取嗎？",
-    "cache_cleared": "DNS 快取被成功地清除",
-    "clear_cache": "清除快取",
-    "make_static": "靜態化",
-    "theme_auto_desc": "自動（基於裝置的配色方案）",
-    "theme_dark_desc": "深色主題",
-    "theme_light_desc": "淺色主題",
-    "disable_for_seconds": "{{count}} 秒",
-    "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": "在統計資料中忽略此用戶端"
+    "anonymizer_notification": "<0>注意：</0>IP 匿名化被啟用。您可在<1>一般設定</1>中禁用它。"
 }

client/src/actions/dnsConfig.js

@@ -1,5 +1,4 @@
 import { createAction } from 'redux-actions';
-import i18next from 'i18next';
 
 import apiClient from '../api/Api';
 import { splitByNewLine } from '../helpers/helpers';
@@ -20,22 +19,6 @@ export const getDnsConfig = () => async (dispatch) => {
     }
 };
 
-export const clearDnsCacheRequest = createAction('CLEAR_DNS_CACHE_REQUEST');
-export const clearDnsCacheFailure = createAction('CLEAR_DNS_CACHE_FAILURE');
-export const clearDnsCacheSuccess = createAction('CLEAR_DNS_CACHE_SUCCESS');
-
-export const clearDnsCache = () => async (dispatch) => {
-    dispatch(clearDnsCacheRequest());
-    try {
-        const data = await apiClient.clearCache();
-        dispatch(clearDnsCacheSuccess(data));
-        dispatch(addSuccessToast(i18next.t('cache_cleared')));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(clearDnsCacheFailure());
-    }
-};
-
 export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST');
 export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE');
 export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS');

client/src/actions/encryption.js

@@ -41,22 +41,14 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
         response.certificate_chain = atob(response.certificate_chain);
         response.private_key = atob(response.private_key);
 
-        if (values.enabled && values.force_https && window.location.protocol === 'http:') {
-            window.location.reload();
-            return;
-        }
-        redirectToCurrentProtocol(response, httpPort);
-
         const dnsStatus = await apiClient.getGlobalStatus();
         if (dnsStatus) {
-            if (dnsStatus.protection_disabled_duration === 0) {
-                dnsStatus.protection_disabled_duration = null;
-            }
             dispatch(dnsStatusSuccess(dnsStatus));
         }
 
         dispatch(setTlsConfigSuccess(response));
         dispatch(addSuccessToast('encryption_config_saved'));
+        redirectToCurrentProtocol(response, httpPort);
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(setTlsConfigFailure());

client/src/actions/index.js

@@ -6,14 +6,7 @@ import endsWith from 'lodash/endsWith';
 import escapeRegExp from 'lodash/escapeRegExp';
 import React from 'react';
 import { compose } from 'redux';
-import {
-    splitByNewLine,
-    sortClients,
-    filterOutComments,
-    msToSeconds,
-    msToMinutes,
-    msToHours,
-} from '../helpers/helpers';
+import { splitByNewLine, sortClients, filterOutComments } from '../helpers/helpers';
 import {
     BLOCK_ACTIONS,
     CHECK_TIMEOUT,
@@ -21,7 +14,6 @@ import {
     SETTINGS_NAMES,
     FORM_NAME,
     MANUAL_UPDATE_LINK,
-    DISABLE_PROTECTION_TIMINGS,
 } from '../helpers/constants';
 import { areEqualVersions } from '../helpers/version';
 import { getTlsStatus } from './encryption';
@@ -32,12 +24,6 @@ import { getFilteringStatus, setRules } from './filtering';
 export const toggleSettingStatus = createAction('SETTING_STATUS_TOGGLE');
 export const showSettingsFailure = createAction('SETTINGS_FAILURE_SHOW');
 
-/**
- *
- * @param {*} settingKey = SETTINGS_NAMES
- * @param {*} status: boolean | SafeSearchConfig
- * @returns
- */
 export const toggleSetting = (settingKey, status) => async (dispatch) => {
     let successMessage = '';
     try {
@@ -63,9 +49,14 @@ export const toggleSetting = (settingKey, status) => async (dispatch) => {
                 dispatch(toggleSettingStatus({ settingKey }));
                 break;
             case SETTINGS_NAMES.safesearch:
-                successMessage = 'updated_save_search_toast';
-                await apiClient.updateSafesearch(status);
-                dispatch(toggleSettingStatus({ settingKey, value: status }));
+                if (status) {
+                    successMessage = 'disabled_safe_search_toast';
+                    await apiClient.disableSafesearch();
+                } else {
+                    successMessage = 'enabled_save_search_toast';
+                    await apiClient.enableSafesearch();
+                }
+                dispatch(toggleSettingStatus({ settingKey }));
                 break;
             default:
                 break;
@@ -80,9 +71,7 @@ export const initSettingsRequest = createAction('SETTINGS_INIT_REQUEST');
 export const initSettingsFailure = createAction('SETTINGS_INIT_FAILURE');
 export const initSettingsSuccess = createAction('SETTINGS_INIT_SUCCESS');
 
-export const initSettings = (settingsList = {
-    safebrowsing: {}, parental: {},
-}) => async (dispatch) => {
+export const initSettings = (settingsList) => async (dispatch) => {
     dispatch(initSettingsRequest());
     try {
         const safebrowsingStatus = await apiClient.getSafebrowsingStatus();
@@ -91,6 +80,7 @@ export const initSettings = (settingsList = {
         const {
             safebrowsing,
             parental,
+            safesearch,
         } = settingsList;
         const newSettingsList = {
             safebrowsing: {
@@ -102,7 +92,8 @@ export const initSettings = (settingsList = {
                 enabled: parentalStatus.enabled,
             },
             safesearch: {
-                ...safesearchStatus,
+                ...safesearch,
+                enabled: safesearchStatus.enabled,
             },
         };
         dispatch(initSettingsSuccess({ settingsList: newSettingsList }));
@@ -116,54 +107,19 @@ export const toggleProtectionRequest = createAction('TOGGLE_PROTECTION_REQUEST')
 export const toggleProtectionFailure = createAction('TOGGLE_PROTECTION_FAILURE');
 export const toggleProtectionSuccess = createAction('TOGGLE_PROTECTION_SUCCESS');
 
-const getDisabledMessage = (time) => {
-    switch (time) {
-        case DISABLE_PROTECTION_TIMINGS.HALF_MINUTE:
-            return i18next.t(
-                'disable_notify_for_seconds',
-                { count: msToSeconds(DISABLE_PROTECTION_TIMINGS.HALF_MINUTE) },
-            );
-        case DISABLE_PROTECTION_TIMINGS.MINUTE:
-            return i18next.t(
-                'disable_notify_for_minutes',
-                { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.MINUTE) },
-            );
-        case DISABLE_PROTECTION_TIMINGS.TEN_MINUTES:
-            return i18next.t(
-                'disable_notify_for_minutes',
-                { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.TEN_MINUTES) },
-            );
-        case DISABLE_PROTECTION_TIMINGS.HOUR:
-            return i18next.t(
-                'disable_notify_for_hours',
-                { count: msToHours(DISABLE_PROTECTION_TIMINGS.HOUR) },
-            );
-        case DISABLE_PROTECTION_TIMINGS.TOMORROW:
-            return i18next.t('disable_notify_until_tomorrow');
-        default:
-            return 'disabled_protection';
-    }
-};
-
-export const toggleProtection = (status, time = null) => async (dispatch) => {
+export const toggleProtection = (status) => async (dispatch) => {
     dispatch(toggleProtectionRequest());
     try {
-        const successMessage = status ? getDisabledMessage(time) : 'enabled_protection';
-        await apiClient.setProtection({ enabled: !status, duration: time });
+        const successMessage = status ? 'disabled_protection' : 'enabled_protection';
+        await apiClient.setDnsConfig({ protection_enabled: !status });
         dispatch(addSuccessToast(successMessage));
-        dispatch(toggleProtectionSuccess({ disabledDuration: time }));
+        dispatch(toggleProtectionSuccess());
     } catch (error) {
         dispatch(addErrorToast({ error }));
         dispatch(toggleProtectionFailure());
     }
 };
 
-export const setDisableDurationTime = createAction('SET_DISABLED_DURATION_TIME');
-
-export const setProtectionTimerTime = (updatedTime) => async (dispatch) => {
-    dispatch(setDisableDurationTime({ timeToEnableProtection: updatedTime }));
-};
-
 export const getVersionRequest = createAction('GET_VERSION_REQUEST');
 export const getVersionFailure = createAction('GET_VERSION_FAILURE');
 export const getVersionSuccess = createAction('GET_VERSION_SUCCESS');
@@ -185,7 +141,7 @@ export const getVersion = (recheck = false) => async (dispatch, getState) => {
             }
         }
     } catch (error) {
-        dispatch(addErrorToast({ error: 'version_request_error' }));
+        dispatch(addErrorToast({ error }));
         dispatch(getVersionFailure());
     }
 };
@@ -316,9 +272,6 @@ export const getDnsStatus = () => async (dispatch) => {
 
     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) {
@@ -410,18 +363,18 @@ export const changeLanguage = (lang) => async (dispatch) => {
     }
 };
 
-export const changeThemeRequest = createAction('CHANGE_THEME_REQUEST');
-export const changeThemeFailure = createAction('CHANGE_THEME_FAILURE');
-export const changeThemeSuccess = createAction('CHANGE_THEME_SUCCESS');
+export const getLanguageRequest = createAction('GET_LANGUAGE_REQUEST');
+export const getLanguageFailure = createAction('GET_LANGUAGE_FAILURE');
+export const getLanguageSuccess = createAction('GET_LANGUAGE_SUCCESS');
 
-export const changeTheme = (theme) => async (dispatch) => {
-    dispatch(changeThemeRequest());
+export const getLanguage = () => async (dispatch) => {
+    dispatch(getLanguageRequest());
     try {
-        await apiClient.changeTheme({ theme });
-        dispatch(changeThemeSuccess({ theme }));
+        const langSettings = await apiClient.getCurrentLanguage();
+        dispatch(getLanguageSuccess(langSettings.language));
     } catch (error) {
         dispatch(addErrorToast({ error }));
-        dispatch(changeThemeFailure());
+        dispatch(getLanguageFailure());
     }
 };
 

client/src/actions/queryLogs.js

@@ -177,7 +177,7 @@ export const getLogsConfigSuccess = createAction('GET_LOGS_CONFIG_SUCCESS');
 export const getLogsConfig = () => async (dispatch) => {
     dispatch(getLogsConfigRequest());
     try {
-        const data = await apiClient.getQueryLogConfig();
+        const data = await apiClient.getQueryLogInfo();
         dispatch(getLogsConfigSuccess(data));
     } catch (error) {
         dispatch(addErrorToast({ error }));

client/src/actions/services.js

@@ -2,6 +2,21 @@ 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');

client/src/actions/stats.js

@@ -13,7 +13,7 @@ export const getStatsConfigSuccess = createAction('GET_STATS_CONFIG_SUCCESS');
 export const getStatsConfig = () => async (dispatch) => {
     dispatch(getStatsConfigRequest());
     try {
-        const data = await apiClient.getStatsConfig();
+        const data = await apiClient.getStatsInfo();
         dispatch(getStatsConfigSuccess(data));
     } catch (error) {
         dispatch(addErrorToast({ error }));

client/src/api/Api.js

@@ -1,12 +1,8 @@
 import axios from 'axios';
 
 import { getPathWithQueryString } from '../helpers/helpers';
-import {
-    QUERY_LOGS_PAGE_LIMIT, HTML_PAGES, R_PATH_LAST_PART, THEMES,
-} from '../helpers/constants';
+import { QUERY_LOGS_PAGE_LIMIT, HTML_PAGES, R_PATH_LAST_PART } from '../helpers/constants';
 import { BASE_URL } from '../../constants';
-import i18n from '../i18n';
-import { LANGUAGES } from '../helpers/twosky';
 
 class Api {
     baseUrl = BASE_URL;
@@ -208,57 +204,41 @@ class Api {
     // Safesearch
     SAFESEARCH_STATUS = { path: 'safesearch/status', method: 'GET' };
 
-    SAFESEARCH_UPDATE = { path: 'safesearch/settings', method: 'PUT' };
+    SAFESEARCH_ENABLE = { path: 'safesearch/enable', method: 'POST' };
+
+    SAFESEARCH_DISABLE = { path: 'safesearch/disable', method: 'POST' };
 
     getSafesearchStatus() {
         const { path, method } = this.SAFESEARCH_STATUS;
         return this.makeRequest(path, method);
     }
 
-    /**
-     * interface SafeSearchConfig {
-        "enabled": boolean,
-        "bing": boolean,
-        "duckduckgo": boolean,
-        "google": boolean,
-        "pixabay": boolean,
-        "yandex": boolean,
-        "youtube": boolean
-     * }
-     * @param {*} data - SafeSearchConfig
-     * @returns 200 ok
-     */
-    updateSafesearch(data) {
-        const { path, method } = this.SAFESEARCH_UPDATE;
-        return this.makeRequest(path, method, { data });
+    enableSafesearch() {
+        const { path, method } = this.SAFESEARCH_ENABLE;
+        return this.makeRequest(path, method);
     }
 
-    // enableSafesearch() {
-    //     const { path, method } = this.SAFESEARCH_ENABLE;
-    //     return this.makeRequest(path, method);
-    // }
-
-    // disableSafesearch() {
-    //     const { path, method } = this.SAFESEARCH_DISABLE;
-    //     return this.makeRequest(path, method);
-    // }
+    disableSafesearch() {
+        const { path, method } = this.SAFESEARCH_DISABLE;
+        return this.makeRequest(path, method);
+    }
 
     // Language
+    CURRENT_LANGUAGE = { path: 'i18n/current_language', method: 'GET' };
 
-    async changeLanguage(config) {
-        const profile = await this.getProfile();
-        profile.language = config.language;
+    CHANGE_LANGUAGE = { path: 'i18n/change_language', method: 'POST' };
 
-        return this.setProfile(profile);
+    getCurrentLanguage() {
+        const { path, method } = this.CURRENT_LANGUAGE;
+        return this.makeRequest(path, method);
     }
 
-    // Theme
-
-    async changeTheme(config) {
-        const profile = await this.getProfile();
-        profile.theme = config.theme;
-
-        return this.setProfile(profile);
+    changeLanguage(config) {
+        const { path, method } = this.CHANGE_LANGUAGE;
+        const parameters = {
+            data: config,
+        };
+        return this.makeRequest(path, method, parameters);
     }
 
     // DHCP
@@ -479,12 +459,19 @@ class Api {
     }
 
     // Blocked services
+    BLOCKED_SERVICES_SERVICES = { path: 'blocked_services/services', method: 'GET' };
+
     BLOCKED_SERVICES_LIST = { path: 'blocked_services/list', method: 'GET' };
 
     BLOCKED_SERVICES_SET = { path: 'blocked_services/set', method: 'POST' };
 
     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);
@@ -506,9 +493,9 @@ class Api {
     // Settings for statistics
     GET_STATS = { path: 'stats', method: 'GET' };
 
-    GET_STATS_CONFIG = { path: 'stats/config', method: 'GET' };
+    STATS_INFO = { path: 'stats_info', method: 'GET' };
 
-    UPDATE_STATS_CONFIG = { path: 'stats/config/update', method: 'PUT' };
+    STATS_CONFIG = { path: 'stats_config', method: 'POST' };
 
     STATS_RESET = { path: 'stats_reset', method: 'POST' };
 
@@ -517,13 +504,13 @@ class Api {
         return this.makeRequest(path, method);
     }
 
-    getStatsConfig() {
-        const { path, method } = this.GET_STATS_CONFIG;
+    getStatsInfo() {
+        const { path, method } = this.STATS_INFO;
         return this.makeRequest(path, method);
     }
 
     setStatsConfig(data) {
-        const { path, method } = this.UPDATE_STATS_CONFIG;
+        const { path, method } = this.STATS_CONFIG;
         const config = {
             data,
         };
@@ -538,9 +525,9 @@ class Api {
     // Query log
     GET_QUERY_LOG = { path: 'querylog', method: 'GET' };
 
-    UPDATE_QUERY_LOG_CONFIG = { path: 'querylog/config/update', method: 'PUT' };
+    QUERY_LOG_CONFIG = { path: 'querylog_config', method: 'POST' };
 
-    GET_QUERY_LOG_CONFIG = { path: 'querylog/config', method: 'GET' };
+    QUERY_LOG_INFO = { path: 'querylog_info', method: 'GET' };
 
     QUERY_LOG_CLEAR = { path: 'querylog_clear', method: 'POST' };
 
@@ -552,13 +539,13 @@ class Api {
         return this.makeRequest(url, method);
     }
 
-    getQueryLogConfig() {
-        const { path, method } = this.GET_QUERY_LOG_CONFIG;
+    getQueryLogInfo() {
+        const { path, method } = this.QUERY_LOG_INFO;
         return this.makeRequest(path, method);
     }
 
     setQueryLogConfig(data) {
-        const { path, method } = this.UPDATE_QUERY_LOG_CONFIG;
+        const { path, method } = this.QUERY_LOG_CONFIG;
         const config = {
             data,
         };
@@ -584,24 +571,11 @@ class Api {
     // Profile
     GET_PROFILE = { path: 'profile', method: 'GET' };
 
-    UPDATE_PROFILE = { path: 'profile/update', method: 'PUT' };
-
     getProfile() {
         const { path, method } = this.GET_PROFILE;
         return this.makeRequest(path, method);
     }
 
-    setProfile(data) {
-        const theme = data.theme ? data.theme : THEMES.auto;
-        const defaultLanguage = i18n.language ? i18n.language : LANGUAGES.en;
-        const language = data.language ? data.language : defaultLanguage;
-
-        const { path, method } = this.UPDATE_PROFILE;
-        const config = { data: { theme, language } };
-
-        return this.makeRequest(path, method, config);
-    }
-
     // DNS config
     GET_DNS_CONFIG = { path: 'dns_info', method: 'GET' };
 
@@ -619,23 +593,6 @@ class Api {
         };
         return this.makeRequest(path, method, config);
     }
-
-    SET_PROTECTION = { path: 'protection', method: 'POST' };
-
-    setProtection(data) {
-        const { enabled, duration } = data;
-        const { path, method } = this.SET_PROTECTION;
-
-        return this.makeRequest(path, method, { data: { enabled, duration } });
-    }
-
-    // Cache
-    CLEAR_CACHE = { path: 'cache_clear', method: 'POST' };
-
-    clearCache() {
-        const { path, method } = this.CLEAR_CACHE;
-        return this.makeRequest(path, method);
-    }
 }
 
 const apiClient = new Api();

client/src/components/App/index.css

@@ -1,74 +1,11 @@
 :root {
-    --black: #131313;
-    --bgcolor: #f5f7fb;
-    --mcolor: #495057;
-    --scolor: rgba(74, 74, 74, 0.7);
-    --border-color: rgba(0, 40, 100, 0.12);
-    --header-bgcolor: #fff;
-    --card-bgcolor: #fff;
-    --card-border-color: rgba(0, 40, 100, 0.12);
-    --ctrl-bgcolor: #fff;
-    --ctrl-select-bgcolor: rgba(69, 79, 94, 0.12);
-    --ctrl-dropdown-color: #212529;
-    --ctrl-dropdown-bgcolor-focus: #f8f9fa;
-    --ctrl-dropdown-color-focus: #16181b;
-    --btn-success-bgcolor: #5eba00;
-    --form-disabled-bgcolor: #f8f9fa;
-    --form-disabled-color: #495057;
-    --rt-nodata-bgcolor: rgba(255,255,255,0.8);
-    --rt-nodata-color: rgba(0,0,0,0.5);
-    --modal-overlay-bgcolor: rgba(255, 255, 255, 0.75);
-    --logs__table-bgcolor: #fff;
-    --logs__row--blue-bgcolor: #e5effd;
-    --logs__row--white-bgcolor: #fff;
-    --detailed-info-color: #888888;
     --yellow-pale: rgba(247, 181, 0, 0.1);
     --green79: #67b279;
     --gray-a5: #a5a5a5;
     --gray-d8: #d8d8d8;
     --gray-f3: #f3f3f3;
-    --loading-bg: rgba(255, 255, 255, 0.48);
     --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
     --font-size-disable-autozoom: 1rem;
-    --alert-message-color: #24426c;
-    --alert-message-border: #cbdbf2;
-    --alert-message-bg: #dae5f5;
-    --checkbox-bg: #e2e2e2;
-    --radio-bg: #ffffff;
-}
-
-[data-theme="dark"] {
-    --black: #ffffff;
-    --bgcolor: #131313;
-    --mcolor: #e6e6e6;
-    --scolor: #a5a5a5;
-    --header-bgcolor: #131313;
-    --border-color: #222;
-    --card-bgcolor: #1c1c1c;
-    --card-border-color: #3d3d3d;
-    --ctrl-bgcolor: #1c1c1c;
-    --ctrl-select-bgcolor: #3d3d3d;
-    --ctrl-dropdown-color: #fff;
-    --ctrl-dropdown-bgcolor-focus: #000;
-    --ctrl-dropdown-color-focus: #fff;
-    --btn-success-bgcolor: #67b279;
-    --form-disabled-bgcolor: #2d2d2d;
-    --form-disabled-color: #a5a5a5;
-    --logs__text-color: #f3f3f3;
-    --rt-nodata-bgcolor: #1c1c1c;
-    --rt-nodata-color: #fff;
-    --modal-overlay-bgcolor: rgba(19, 19, 19, 0.75);
-    --logs__table-bgcolor: #3d3d3d;
-    --logs__row--blue-bgcolor: #467fcf;
-    --logs__row--white-bgcolor: #1c1c1c;
-    --detailed-info-color: #fff;
-    --gray300: #f3f3f3;
-    --loading-bg: #131313;
-    --alert-message-color: #e6e6e6;
-    --alert-message-border: #363648;
-    --alert-message-bg: #363648;
-    --checkbox-bg: #a4a4a4;
-    --radio-bg: #a4a4a4;
 }
 
 body {

client/src/components/App/index.js

@@ -20,13 +20,8 @@ import EncryptionTopline from '../ui/EncryptionTopline';
 import Icons from '../ui/Icons';
 import i18n from '../../i18n';
 import Loading from '../ui/Loading';
-import {
-    FILTERS_URLS,
-    MENU_URLS,
-    SETTINGS_URLS,
-    THEMES,
-} from '../../helpers/constants';
-import { getLogsUrlParams, setHtmlLangAttr, setUITheme } from '../../helpers/helpers';
+import { FILTERS_URLS, MENU_URLS, SETTINGS_URLS } from '../../helpers/constants';
+import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers';
 import Header from '../Header';
 import { changeLanguage, getDnsStatus } from '../../actions';
 
@@ -43,7 +38,6 @@ import DnsRewrites from '../../containers/DnsRewrites';
 import CustomRules from '../../containers/CustomRules';
 import Services from '../Filters/Services';
 import Logs from '../Logs';
-import ProtectionTimer from '../ProtectionTimer';
 
 const ROUTES = [
     {
@@ -115,7 +109,6 @@ const App = () => {
         isCoreRunning,
         isUpdateAvailable,
         processing,
-        theme,
     } = useSelector((state) => state.dashboard, shallowEqual);
 
     const { processing: processingEncryption } = useSelector((
@@ -145,40 +138,6 @@ const App = () => {
         setLanguage();
     }, [language]);
 
-    const handleAutoTheme = (e, accountTheme) => {
-        if (accountTheme !== THEMES.auto) {
-            return;
-        }
-
-        if (e.matches) {
-            setUITheme(THEMES.dark);
-        } else {
-            setUITheme(THEMES.light);
-        }
-    };
-
-    useEffect(() => {
-        if (theme !== THEMES.auto) {
-            setUITheme(theme);
-
-            return;
-        }
-
-        const colorSchemeMedia = window.matchMedia('(prefers-color-scheme: dark)');
-        setUITheme(theme);
-
-        if (colorSchemeMedia.addEventListener !== undefined) {
-            colorSchemeMedia.addEventListener('change', (e) => {
-                handleAutoTheme(e, theme);
-            });
-        } else {
-            // Deprecated addListener for older versions of Safari.
-            colorSchemeMedia.addListener((e) => {
-                handleAutoTheme(e, theme);
-            });
-        }
-    }, [theme]);
-
     const reloadPage = () => {
         window.location.reload();
     };
@@ -191,7 +150,6 @@ const App = () => {
         {!processingEncryption && <EncryptionTopline />}
         <LoadingBar className="loading-bar" updateTime={1000} />
         <Header />
-        <ProtectionTimer />
         <div className="container container--wrap pb-5">
             {processing && <Loading />}
             {!isCoreRunning && <div className="row row-cards">

client/src/components/Dashboard/BlockedDomains.js

@@ -29,11 +29,8 @@ const BlockedDomains = ({
     blockedFiltering,
     replacedSafebrowsing,
     replacedParental,
-    replacedSafesearch,
 }) => {
-    const totalBlocked = (
-        blockedFiltering + replacedSafebrowsing + replacedParental + replacedSafesearch
-    );
+    const totalBlocked = blockedFiltering + replacedSafebrowsing + replacedParental;
 
     return (
         <Card
@@ -74,7 +71,6 @@ BlockedDomains.propTypes = {
     topBlockedDomains: PropTypes.array.isRequired,
     blockedFiltering: PropTypes.number.isRequired,
     replacedSafebrowsing: PropTypes.number.isRequired,
-    replacedSafesearch: PropTypes.number.isRequired,
     replacedParental: PropTypes.number.isRequired,
     refreshButton: PropTypes.node.isRequired,
     subtitle: PropTypes.string.isRequired,

client/src/components/Dashboard/Dashboard.css

@@ -1,9 +1,3 @@
-.dashboard-protection-button.btn-gray {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-right-color: #a4a4a4;
-}
-
 .stats__table .popover__body {
     left: -10px;
     min-width: 270px;
@@ -40,18 +34,27 @@
     align-items: center;
 }
 
+.dashboard-title__button {
+    margin: 0 0.5rem;
+}
+
 @media (max-width: 767.98px) {
     .page-title--dashboard {
         flex-direction: column;
         align-items: flex-start;
     }
+
+    .dashboard-title__button {
+        margin: 0.5rem 0;
+        display: block;
+    }
 }
 
 .counters__row {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    border-top: 1px solid var(--card-border-color);
+    border-top: 1px solid #dee2e6;
     padding: 0.75rem 1.5rem;
 }
 

client/src/components/Dashboard/index.js

@@ -9,25 +9,18 @@ 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 {
-    msToSeconds,
-    msToMinutes,
-    msToHours,
-    msToDays,
-} from '../../helpers/helpers';
+import { SETTINGS_URLS } from '../../helpers/constants';
 
 import PageTitle from '../ui/PageTitle';
 import Loading from '../ui/Loading';
 import './Dashboard.css';
-import Dropdown from '../ui/Dropdown';
 
 const Dashboard = ({
     getAccessList,
     getStats,
     getStatsConfig,
     dashboard,
-    dashboard: { protectionEnabled, processingProtection, protectionDisabledDuration },
+    dashboard: { protectionEnabled, processingProtection },
     toggleProtection,
     stats,
     access,
@@ -43,20 +36,20 @@ const Dashboard = ({
     useEffect(() => {
         getAllStats();
     }, []);
-    const getSubtitle = () => {
-        const ONE_DAY = 1;
-        const intervalInDays = msToDays(stats.interval);
 
-        if (intervalInDays < ONE_DAY) {
+    const getSubtitle = () => {
+        if (stats.interval === 0) {
             return t('stats_disabled_short');
         }
 
-        return intervalInDays === ONE_DAY
+        return stats.interval === 1
             ? t('for_last_24_hours')
-            : t('for_last_days', { count: msToDays(stats.interval) });
+            : t('for_last_days', { count: stats.interval });
     };
 
-    const buttonClass = classNames('btn btn-sm dashboard-protection-button', {
+    const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
+
+    const buttonClass = classNames('btn btn-sm dashboard-title__button', {
         'btn-gray': protectionEnabled,
         'btn-success': !protectionEnabled,
     });
@@ -67,7 +60,7 @@ const Dashboard = ({
             title={t('refresh_btn')}
             onClick={() => getAllStats()}
     >
-        <svg className="icons icon12">
+        <svg className="icons">
             <use xlinkHref="#refresh" />
         </svg>
     </button>;
@@ -78,87 +71,16 @@ const Dashboard = ({
 
     const subtitle = getSubtitle();
 
-    const DISABLE_PROTECTION_ITEMS = [
-        {
-            text: t('disable_for_seconds', { count: msToSeconds(DISABLE_PROTECTION_TIMINGS.HALF_MINUTE) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.HALF_MINUTE,
-        },
-        {
-            text: t('disable_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.MINUTE) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.MINUTE,
-        },
-        {
-            text: t('disable_for_minutes', { count: msToMinutes(DISABLE_PROTECTION_TIMINGS.TEN_MINUTES) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.TEN_MINUTES,
-        },
-        {
-            text: t('disable_for_hours', { count: msToHours(DISABLE_PROTECTION_TIMINGS.HOUR) }),
-            disableTime: DISABLE_PROTECTION_TIMINGS.HOUR,
-        },
-        {
-            text: t('disable_until_tomorrow'),
-            disableTime: DISABLE_PROTECTION_TIMINGS.TOMORROW,
-        },
-    ];
-
-    const getDisableProtectionItems = () => (
-        Object.values(DISABLE_PROTECTION_ITEMS)
-            .map((item, index) => (
-                <div
-                    key={`disable_timings_${index}`}
-                    className="dropdown-item"
-                    onClick={() => {
-                        toggleProtection(protectionEnabled, item.disableTime - ONE_SECOND_IN_MS);
-                    }}
-                >
-                    {item.text}
-                </div>
-            ))
-    );
-
-    const getRemaningTimeText = (milliseconds) => {
-        if (!milliseconds) {
-            return '';
-        }
-
-        const date = new Date(milliseconds);
-        const hh = date.getUTCHours();
-        const mm = `0${date.getUTCMinutes()}`.slice(-2);
-        const ss = `0${date.getUTCSeconds()}`.slice(-2);
-        const formattedHH = `0${hh}`.slice(-2);
-
-        return hh ? `${formattedHH}:${mm}:${ss}` : `${mm}:${ss}`;
-    };
-
-    const getProtectionBtnText = (status) => (status ? t('disable_protection') : t('enable_protection'));
-
     return <>
         <PageTitle title={t('dashboard')} containerClass="page-title--dashboard">
-            <div className="page-title__protection">
-                <button
-                        type="button"
-                        className={buttonClass}
-                        onClick={() => {
-                            toggleProtection(protectionEnabled);
-                        }}
-                        disabled={processingProtection}
-                >
-                    {protectionDisabledDuration
-                        ? `${t('enable_protection_timer')} ${getRemaningTimeText(protectionDisabledDuration)}`
-                        : getProtectionBtnText(protectionEnabled)
-                    }
-                </button>
-
-                {protectionEnabled && <Dropdown
-                    label=""
-                    baseClassName="dropdown-protection"
-                    icon="arrow-down"
-                    controlClassName="dropdown-protection__toggle"
-                    menuClassName="dropdown-menu dropdown-menu-arrow dropdown-menu--protection"
-                >
-                    {getDisableProtectionItems()}
-                </Dropdown>}
-            </div>
+            <button
+                    type="button"
+                    className={buttonClass}
+                    onClick={() => toggleProtection(protectionEnabled)}
+                    disabled={processingProtection}
+            >
+                <Trans>{buttonText}</Trans>
+            </button>
             <button
                     type="button"
                     className="btn btn-outline-primary btn-sm"
@@ -185,7 +107,7 @@ const Dashboard = ({
                     </div>
                 )}
                 <Statistics
-                        interval={msToDays(stats.interval)}
+                        interval={stats.interval}
                         dnsQueries={stats.dnsQueries}
                         blockedFiltering={stats.blockedFiltering}
                         replacedSafebrowsing={stats.replacedSafebrowsing}
@@ -229,7 +151,6 @@ const Dashboard = ({
                         topBlockedDomains={stats.topBlockedDomains}
                         blockedFiltering={stats.numBlockedFiltering}
                         replacedSafebrowsing={stats.numReplacedSafebrowsing}
-                        replacedSafesearch={stats.numReplacedSafesearch}
                         replacedParental={stats.numReplacedParental}
                         refreshButton={refreshButton}
                 />

client/src/components/Filters/DnsBlocklist.js

@@ -12,6 +12,7 @@ import { MODAL_TYPE } from '../../helpers/constants';
 
 import {
     getCurrentFilter,
+    getObjDiff,
 } from '../../helpers/helpers';
 
 import filtersCatalog from '../../helpers/filters/filters';
@@ -21,7 +22,7 @@ class DnsBlocklist extends Component {
         this.props.getFilteringStatus();
     }
 
-    handleSubmit = (values) => {
+    handleSubmit = (values, _, { initialValues }) => {
         const { modalFilterUrl, modalType } = this.props.filtering;
 
         switch (modalType) {
@@ -34,12 +35,7 @@ class DnsBlocklist extends Component {
                 break;
             }
             case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
-                const changedValues = Object.entries(values)?.reduce((acc, [key, value]) => {
-                    if (value && key in filtersCatalog.filters) {
-                        acc[key] = value;
-                    }
-                    return acc;
-                }, {});
+                const changedValues = getObjDiff(initialValues, values);
 
                 Object.keys(changedValues)
                     .forEach((fieldName) => {

client/src/components/Filters/Table.js

@@ -100,7 +100,7 @@ class Table extends Component {
                             })
                             }
                         >
-                            <svg className="icons icon12">
+                            <svg className="icons">
                                 <use xlinkHref="#edit" />
                             </svg>
                         </button>
@@ -110,7 +110,7 @@ class Table extends Component {
                             onClick={() => handleDelete(url)}
                             title={t('delete_table_action')}
                         >
-                            <svg className="icons icon12">
+                            <svg className="icons">
                                 <use xlinkHref="#delete" />
                             </svg>
                         </button>

client/src/components/Header/Header.css

@@ -1,12 +1,12 @@
 .nav-tabs .nav-link.active {
-    border-color: var(--btn-success-bgcolor);
-    color: var(--btn-success-bgcolor);
+    border-color: var(--green-74);
+    color: var(--green-74);
     background: transparent;
 }
 
 .nav-tabs .nav-link.active:hover {
-    border-color: #4b9400;
-    color: #4b9400;
+    border-color: #58a273;
+    color: #58a273;
 }
 
 .nav-icon {
@@ -47,7 +47,7 @@
     width: 250px;
     height: 100vh;
     transition: transform 0.3s ease;
-    background-color: var(--header-bgcolor);
+    background-color: #fff;
     overflow-y: auto;
 }
 

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

@@ -162,7 +162,7 @@ const ClientCell = ({
                 {content && (
                     <button className={buttonArrowClass} disabled={processingRules}>
                         <IconTooltip
-                            className="icon24"
+                            className="h-100"
                             tooltipClass="button-action--arrow-option-container"
                             xlinkHref="chevron-down"
                             triggerClass="button-action--icon"

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

@@ -4,8 +4,7 @@
     box-shadow: 2px 4px 8px rgba(0, 0, 0, 0.2);
     border-radius: 4px !important;
     pointer-events: auto !important;
-    background-color: var(--ctrl-bgcolor);
-    color: var(--mcolor);
+    background-color: var(--white);
     z-index: 102;
     overflow-y: auto;
     max-height: 100%;

client/src/components/Logs/Filters/Form.js

@@ -129,6 +129,7 @@ const Form = (props) => {
 
     const onInputClear = async () => {
         setIsLoading(true);
+        setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
         change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
         setIsLoading(false);
     };
@@ -154,7 +155,7 @@ const Form = (props) => {
                     name={FORM_NAMES.search}
                     component={renderFilterField}
                     type="text"
-                    className={classNames('form-control form-control--search form-control--transparent', className)}
+                    className={classNames('form-control--search form-control--transparent', className)}
                     placeholder={t('domain_or_client')}
                     tooltip={t('query_log_strict_search')}
                     onClearInputClick={onInputClear}

client/src/components/Logs/Logs.css

@@ -24,12 +24,6 @@
     --option-border-radius: 4px;
 }
 
-[data-theme="dark"] {
-    --red: rgba(223, 56, 18, 0.25);
-    --green-pale: rgba(103, 178, 121, 0.25);
-    --yellow: rgba(247, 181, 0, 0.2);
-}
-
 .logs__text {
     padding: 0 1px;
     text-overflow: ellipsis;
@@ -37,19 +31,11 @@
     overflow: hidden;
     font-size: 1rem;
     font-family: var(--font-family-sans-serif);
-    color: var(--logs__text-color);
+    color: var(--gray-4d);
     letter-spacing: 0;
     line-height: 1.5rem;
 }
 
-[data-theme="dark"] .logs__text a {
-    color: var(--gray-f3);
-}
-
-[data-theme="dark"] .logs__text a:hover {
-    color: var(--gray-f3);
-}
-
 .logs__text--bold {
     font-weight: 600;
 }
@@ -62,7 +48,7 @@
 .detailed-info {
     font-size: 0.8rem;
     line-height: 1.4;
-    color: var(--detailed-info-color);
+    color: #888888;
 }
 
 .logs__text--link {
@@ -80,10 +66,6 @@
     border-radius: 4px;
 }
 
-[data-theme=dark] .icon--selected {
-    opacity: 0.75;
-}
-
 .text-pre {
     white-space: pre-wrap !important;
     overflow-wrap: break-word;
@@ -106,16 +88,6 @@
     max-height: 100% !important;
 }
 
-.icon24 {
-    width: 24px;
-    height: 24px;
-}
-
-.icon12 {
-    width: 12px;
-    height: 12px;
-}
-
 .cursor--pointer {
     cursor: pointer;
 }
@@ -131,19 +103,17 @@
 }
 
 .form-control--search {
+    box-shadow: 0 1px 0 #ddd;
     padding: 0 2.5rem;
     height: 2.25rem;
     flex-grow: 1;
 }
 
 .form-control--transparent {
+    border: 0 solid transparent !important;
     background-color: transparent !important;
 }
 
-[data-theme="dark"] .form-control--transparent option {
-    background-color: var(--card-bgcolor);
-}
-
 .input-group-search {
     background-color: transparent;
     position: relative;
@@ -204,8 +174,10 @@
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    width: 2.5rem;
-    height: 2.5rem;
+
+    --size: 2.5rem;
+    width: var(--size);
+    height: var(--size);
     padding: 0;
     margin-left: 0.9375rem;
     background-color: transparent;
@@ -237,12 +209,6 @@
     position: relative;
 }
 
-@media screen and (min-width: 1025px) {
-    .logs__cell--client {
-        width: 13rem;
-    }
-}
-
 .logs__cell--header__container > .logs__cell--header__item {
     border-right: 0;
     font-size: 1rem;
@@ -321,6 +287,7 @@
     height: 100%;
     display: flex;
     justify-content: center;
+    align-items: center;
 }
 
 .button-action:active {
@@ -377,10 +344,6 @@
     overflow: hidden;
 }
 
-[data-theme="dark"] .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
-    background: var(--ctrl-dropdown-bgcolor-focus);
-}
-
 .button-action--arrow-option-container {
     overflow: visible;
     transform-origin: left;
@@ -410,11 +373,7 @@
 
 /* QUERY_STATUS_COLORS */
 .logs__row--blue {
-    background-color: var(--logs__row--blue-bgcolor);
-}
-
-[data-theme="dark"] .logs__row--blue .logs__text--link {
-    color: var(--white);
+    background-color: var(--blue);
 }
 
 .logs__row--green {
@@ -426,7 +385,7 @@
 }
 
 .logs__row--white {
-    background-color: var(--logs__row--white-bgcolor);
+    background-color: var(--white);
 }
 
 .logs__row--yellow {
@@ -434,8 +393,8 @@
 }
 
 .logs__no-data {
-    color: var(--mcolor);
-    background-color: var(--logs__table-bgcolor);
+    color: var(--gray-4d);
+    background-color: var(--white80);
     pointer-events: none;
     font-weight: 600;
     text-align: center;
@@ -448,7 +407,7 @@
 }
 
 .logs__table {
-    background-color: var(--logs__table-bgcolor);
+    background-color: var(--white);
     border: 0;
     border-radius: 8px;
     min-height: 43rem;
@@ -515,7 +474,7 @@
 
 .filteringRules__filter {
     font-style: italic;
-    font-weight: 400;
+    font-weight: normal;
     margin-bottom: 1rem;
 }
 
@@ -527,10 +486,6 @@
     color: var(--green79);
 }
 
-[data-theme="dark"] .logs__question.icon--lightgray {
-    color: var(--gray-f3);
-}
-
 @media (max-width: 1024px) {
     .logs__question {
         display: none;
@@ -540,8 +495,3 @@
 .logs__modal {
     max-width: 720px;
 }
-
-.logs__modal-wrap {
-    padding: 1rem 1.5rem;
-    background-color: var(--card-bgcolor);
-}

client/src/components/Logs/index.js

@@ -195,11 +195,11 @@ const Logs = () => {
             onRequestClose={closeModal}
             style={{
                 content: {
-                    width: 'calc(100% - 32px)',
+                    width: '100%',
                     height: 'fit-content',
                     left: '50%',
                     top: 47,
-                    padding: '0',
+                    padding: '1rem 1.5rem 1rem',
                     maxWidth: '720px',
                     transform: 'translateX(-50%)',
                 },

client/src/components/ProtectionTimer/index.js

@@ -1,52 +0,0 @@
-import { useEffect } from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-
-import { ONE_SECOND_IN_MS } from '../../helpers/constants';
-import { setProtectionTimerTime, toggleProtectionSuccess } from '../../actions';
-
-let interval = null;
-
-const ProtectionTimer = ({
-    protectionDisabledDuration,
-    toggleProtectionSuccess,
-    setProtectionTimerTime,
-}) => {
-    useEffect(() => {
-        if (protectionDisabledDuration !== null && protectionDisabledDuration < ONE_SECOND_IN_MS) {
-            toggleProtectionSuccess({ disabledDuration: null });
-        }
-
-        if (protectionDisabledDuration) {
-            interval = setInterval(() => {
-                setProtectionTimerTime(protectionDisabledDuration - ONE_SECOND_IN_MS);
-            }, ONE_SECOND_IN_MS);
-        }
-
-        return () => {
-            clearInterval(interval);
-        };
-    }, [protectionDisabledDuration]);
-
-    return null;
-};
-
-ProtectionTimer.propTypes = {
-    setProtectionTimerTime: PropTypes.func.isRequired,
-};
-
-const mapStateToProps = (state) => {
-    const { dashboard } = state;
-    const { protectionEnabled, protectionDisabledDuration } = dashboard;
-    return { protectionEnabled, protectionDisabledDuration };
-};
-
-const mapDispatchToProps = {
-    toggleProtectionSuccess,
-    setProtectionTimerTime,
-};
-
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(ProtectionTimer);

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

@@ -7,7 +7,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import ReactTable from 'react-table';
 
 import { getAllBlockedServices } from '../../../../actions/services';
-import { initSettings } from '../../../../actions';
 import {
     splitByNewLine,
     countClientsStatistics,
@@ -39,13 +38,9 @@ const ClientsTable = ({
     const [t] = useTranslation();
     const dispatch = useDispatch();
     const services = useSelector((store) => store?.services);
-    const globalSettings = useSelector((store) => store?.settings.settingsList) || {};
-
-    const { safesearch } = globalSettings;
 
     useEffect(() => {
         dispatch(getAllBlockedServices());
-        dispatch(initSettings());
     }, []);
 
     const handleFormAdd = (values) => {
@@ -112,7 +107,6 @@ const ClientsTable = ({
             tags: [],
             use_global_settings: true,
             use_global_blocked_services: true,
-            safe_search: { ...(safesearch || {}) },
         };
     };
 
@@ -296,7 +290,7 @@ const ClientsTable = ({
                             disabled={processingUpdating}
                             title={t('edit_table_action')}
                         >
-                            <svg className="icons icon12">
+                            <svg className="icons">
                                 <use xlinkHref="#edit" />
                             </svg>
                         </button>
@@ -307,7 +301,7 @@ const ClientsTable = ({
                             disabled={processingDeleting}
                             title={t('delete_table_action')}
                         >
-                            <svg className="icons icon12">
+                            <svg className="icons">
                                 <use xlinkHref="#delete" />
                             </svg>
                         </button>

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

@@ -11,13 +11,12 @@ 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 { toggleAllServices } from '../../../helpers/helpers';
 import {
     renderInputField,
     renderGroupField,
     CheckboxField,
     renderServiceField,
-    renderTextareaField,
 } from '../../../helpers/form';
 import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
 import { CLIENT_ID_LINK, FORM_NAME } from '../../../helpers/constants';
@@ -40,16 +39,9 @@ const settingsCheckboxes = [
         name: 'parental_enabled',
         placeholder: 'use_adguard_parental',
     },
-];
-
-const logAndStatsCheckboxes = [
     {
-        name: 'ignore_querylog',
-        placeholder: 'ignore_query_log',
-    },
-    {
-        name: 'ignore_statistics',
-        placeholder: 'ignore_statistics',
+        name: 'safesearch_enabled',
+        placeholder: 'enforce_safe_search',
     },
 ];
 const validate = (values) => {
@@ -146,12 +138,8 @@ let Form = (props) => {
         processingUpdating,
         invalid,
         tagsOptions,
-        initialValues,
     } = props;
     const services = useSelector((store) => store?.services);
-    const { safe_search } = initialValues;
-    const safeSearchServices = { ...safe_search };
-    delete safeSearchServices.enabled;
 
     const [activeTabLabel, setActiveTabLabel] = useState('settings');
 
@@ -159,9 +147,6 @@ let Form = (props) => {
         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
@@ -177,41 +162,6 @@ let Form = (props) => {
                         />
                     </div>
                 ))}
-                <div className="form__group">
-                    <Field
-                        name="safe_search.enabled"
-                        type="checkbox"
-                        component={CheckboxField}
-                        placeholder={t('enforce_safe_search')}
-                        disabled={useGlobalSettings}
-                    />
-                </div>
-                <div className='form__group--inner'>
-                    {Object.keys(safeSearchServices).map((searchKey) => (
-                        <div key={searchKey}>
-                            <Field
-                                name={`safe_search.${searchKey}`}
-                                type="checkbox"
-                                component={CheckboxField}
-                                placeholder={captitalizeWords(searchKey)}
-                                disabled={useGlobalSettings}
-                            />
-                        </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: {
@@ -280,11 +230,10 @@ let Form = (props) => {
                 <Field
                     id="upstreams"
                     name="upstreams"
-                    component={renderTextareaField}
+                    component="textarea"
                     type="text"
                     className="form-control form-control--textarea mb-5"
                     placeholder={t('upstream_dns')}
-                    normalizeOnBlur={trimLinesAndRemoveEmpty}
                 />
                 <Examples />
             </div>,
@@ -407,7 +356,6 @@ Form.propTypes = {
     processingUpdating: PropTypes.bool.isRequired,
     invalid: PropTypes.bool.isRequired,
     tagsOptions: PropTypes.array.isRequired,
-    initialValues: PropTypes.object,
 };
 
 const selector = formValueSelector(FORM_NAME.CLIENT);

client/src/components/Settings/Clients/Service.css

@@ -4,7 +4,7 @@
     align-items: center;
     margin-bottom: 15px;
     padding: 10px 15px;
-    border: 1px solid var(--card-border-color);
+    border: 1px solid #eee;
     border-radius: 4px;
     cursor: pointer;
 }
@@ -54,12 +54,6 @@
     color: #495057;
 }
 
-.service__icon svg {
-    width: 20px;
-    height: 20px;
-    fill: #495057;
-}
-
 .service--global .service__icon {
     display: none;
 }

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

@@ -74,6 +74,7 @@ const FormDHCPv4 = ({
                         className="form-control"
                         placeholder={t(ipv4placeholders.subnet_mask)}
                         validate={[
+                            validateIpv4,
                             validateRequired,
                             validateGatewaySubnetMask,
                         ]}
@@ -96,6 +97,7 @@ const FormDHCPv4 = ({
                                 placeholder={t(ipv4placeholders.range_start)}
                                 validate={[
                                     validateIpv4,
+                                    validateGatewaySubnetMask,
                                     validateIpForGatewaySubnetMask,
                                 ]}
                                 disabled={!isInterfaceIncludesIpv4}
@@ -111,6 +113,7 @@ const FormDHCPv4 = ({
                                 validate={[
                                     validateIpv4,
                                     validateIpv4RangeEnd,
+                                    validateGatewaySubnetMask,
                                     validateIpForGatewaySubnetMask,
                                 ]}
                                 disabled={!isInterfaceIncludesIpv4}

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

@@ -1,11 +1,9 @@
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { Trans, withTranslation } from 'react-i18next';
 import { LEASES_TABLE_DEFAULT_PAGE_SIZE } from '../../../helpers/constants';
 import { sortIp } from '../../../helpers/helpers';
-import { toggleLeaseModal } from '../../../actions';
 
 class Leases extends Component {
     cellWrap = ({ value }) => (
@@ -16,30 +14,6 @@ class Leases extends Component {
         </div>
     );
 
-    convertToStatic = (data) => () => {
-        const { dispatch } = this.props;
-        dispatch(toggleLeaseModal(data));
-    }
-
-    makeStatic = ({ row }) => {
-        const { t, disabledLeasesButton } = this.props;
-        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('make_static')}
-                    onClick={this.convertToStatic(row)}
-                    disabled={disabledLeasesButton}
-                >
-                    <svg className="icons icon12">
-                        <use xlinkHref="#plus" />
-                    </svg>
-                </button>
-            </div>
-        );
-    }
-
     render() {
         const { leases, t } = this.props;
         return (
@@ -49,27 +23,20 @@ class Leases extends Component {
                     {
                         Header: 'MAC',
                         accessor: 'mac',
-                        minWidth: 180,
                         Cell: this.cellWrap,
                     }, {
                         Header: 'IP',
                         accessor: 'ip',
-                        minWidth: 230,
                         Cell: this.cellWrap,
                         sortMethod: sortIp,
                     }, {
                         Header: <Trans>dhcp_table_hostname</Trans>,
                         accessor: 'hostname',
-                        minWidth: 230,
                         Cell: this.cellWrap,
                     }, {
                         Header: <Trans>dhcp_table_expires</Trans>,
                         accessor: 'expires',
-                        minWidth: 220,
                         Cell: this.cellWrap,
-                    }, {
-                        Header: <Trans>actions_table_header</Trans>,
-                        Cell: this.makeStatic,
                     },
                 ]}
                 pageSize={LEASES_TABLE_DEFAULT_PAGE_SIZE}
@@ -86,8 +53,6 @@ class Leases extends Component {
 Leases.propTypes = {
     leases: PropTypes.array,
     t: PropTypes.func,
-    dispatch: PropTypes.func,
-    disabledLeasesButton: PropTypes.bool,
 };
 
-export default withTranslation()(connect(() => ({}), (dispatch) => ({ dispatch }))(Leases));
+export default withTranslation()(Leases);

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

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { useDispatch } from 'react-redux';
 
 import { renderInputField, normalizeMac } from '../../../../helpers/form';
 import {
@@ -25,7 +25,6 @@ const Form = ({
 }) => {
     const { t } = useTranslation();
     const dispatch = useDispatch();
-    const dynamicLease = useSelector((store) => store.dhcp.leaseModalConfig, shallowEqual);
 
     const onClick = () => {
         reset();
@@ -88,7 +87,7 @@ const Form = ({
                     <button
                         type="submit"
                         className="btn btn-success btn-standard"
-                        disabled={submitting || processingAdding || (pristine && !dynamicLease)}
+                        disabled={submitting || pristine || processingAdding}
                     >
                         <Trans>save_btn</Trans>
                     </button>

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

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
 import ReactModal from 'react-modal';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import Form from './Form';
 import { toggleLeaseModal } from '../../../../actions';
 
@@ -18,9 +18,6 @@ const Modal = ({
     const dispatch = useDispatch();
 
     const toggleModal = () => dispatch(toggleLeaseModal());
-    const leaseInitialData = useSelector(
-        (state) => state.dhcp.leaseModalConfig, shallowEqual,
-    ) || {};
 
     return (
         <ReactModal
@@ -40,9 +37,9 @@ const Modal = ({
                 </div>
                 <Form
                     initialValues={{
-                        mac: leaseInitialData.mac ?? '',
-                        ip: leaseInitialData.ip ?? '',
-                        hostname: leaseInitialData.hostname ?? '',
+                        mac: '',
+                        ip: '',
+                        hostname: '',
                         cidr,
                         rangeStart,
                         rangeEnd,

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

@@ -54,20 +54,17 @@ const StaticLeases = ({
                     {
                         Header: 'MAC',
                         accessor: 'mac',
-                        minWidth: 180,
                         Cell: cellWrap,
                     },
                     {
                         Header: 'IP',
                         accessor: 'ip',
-                        minWidth: 230,
                         sortMethod: sortIp,
                         Cell: cellWrap,
                     },
                     {
                         Header: <Trans>dhcp_table_hostname</Trans>,
                         accessor: 'hostname',
-                        minWidth: 230,
                         Cell: cellWrap,
                     },
                     {

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

@@ -188,8 +188,8 @@ const Dhcp = () => {
 
     const inputtedIPv4values = dhcp?.values?.v4?.gateway_ip && dhcp?.values?.v4?.subnet_mask;
     const isEmptyConfig = !Object.values(dhcp?.values?.v4 ?? {}).some(Boolean);
-    const disabledLeasesButton = Boolean(dhcp?.syncErrors || interfaces?.syncErrors
-        || !isInterfaceIncludesIpv4 || isEmptyConfig || processingConfig || !inputtedIPv4values);
+    const disabledLeasesButton = dhcp?.syncErrors || interfaces?.syncErrors
+        || !isInterfaceIncludesIpv4 || isEmptyConfig || processingConfig || !inputtedIPv4values;
     const cidr = inputtedIPv4values ? `${dhcp?.values?.v4?.gateway_ip}/${subnetMaskToBitMask(dhcp?.values?.v4?.subnet_mask)}` : '';
 
     return <>
@@ -260,7 +260,7 @@ const Dhcp = () => {
             >
                 <div className="row">
                     <div className="col">
-                        <Leases leases={leases} disabledLeasesButton={disabledLeasesButton}/>
+                        <Leases leases={leases} />
                     </div>
                 </div>
             </Card>}

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

@@ -2,12 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
 import { Trans, useTranslation } from 'react-i18next';
-import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-
+import { shallowEqual, useSelector } from 'react-redux';
 import { renderInputField, toNumber, CheckboxField } from '../../../../helpers/form';
 import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
 import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';
-import { clearDnsCache } from '../../../../actions/dnsConfig';
 
 const INPUTS_FIELDS = [
     {
@@ -34,7 +32,6 @@ const Form = ({
     handleSubmit, submitting, invalid,
 }) => {
     const { t } = useTranslation();
-    const dispatch = useDispatch();
 
     const { processingSetConfig } = useSelector((state) => state.dnsConfig, shallowEqual);
     const {
@@ -43,12 +40,6 @@ const Form = ({
 
     const minExceedsMax = cache_ttl_min > cache_ttl_max;
 
-    const handleClearCache = () => {
-        if (window.confirm(t('confirm_dns_cache_clear'))) {
-            dispatch(clearDnsCache());
-        }
-    };
-
     return <form onSubmit={handleSubmit}>
         <div className="row">
             {INPUTS_FIELDS.map(({
@@ -106,13 +97,6 @@ const Form = ({
         >
             <Trans>save_btn</Trans>
         </button>
-        <button
-            type="button"
-            className="btn btn-outline-secondary btn-standard form__button"
-            onClick={handleClearCache}
-        >
-            <Trans>clear_cache</Trans>
-        </button>
     </form>;
 };
 

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

@@ -13,11 +13,15 @@ import {
     validateIpv4,
     validateIpv6,
     validateRequiredValue,
-    validateIp,
 } from '../../../../helpers/validators';
 import { BLOCKING_MODES, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
 
 const checkboxes = [
+    {
+        name: 'edns_cs_enabled',
+        placeholder: 'edns_enable',
+        subtitle: 'edns_cs_desc',
+    },
     {
         name: 'dnssec_enabled',
         placeholder: 'dnssec_enable',
@@ -62,8 +66,6 @@ const Form = ({
     const { t } = useTranslation();
     const {
         blocking_mode,
-        edns_cs_enabled,
-        edns_cs_use_custom,
     } = useSelector((state) => state.form[FORM_NAME.BLOCKING_MODE].values ?? {}, shallowEqual);
 
     return <form onSubmit={handleSubmit}>
@@ -90,39 +92,6 @@ const Form = ({
                     />
                 </div>
             </div>
-            <div className="col-12">
-                <div className="form__group form__group--settings">
-                    <Field
-                        name="edns_cs_enabled"
-                        type="checkbox"
-                        component={CheckboxField}
-                        placeholder={t('edns_enable')}
-                        disabled={processing}
-                        subtitle={t('edns_cs_desc')}
-                    />
-                </div>
-            </div>
-            <div className="col-12 form__group form__group--inner">
-                <div className="form__group ">
-                    <Field
-                        name="edns_cs_use_custom"
-                        type="checkbox"
-                        component={CheckboxField}
-                        placeholder={t('edns_use_custom_ip')}
-                        disabled={processing || !edns_cs_enabled}
-                        subtitle={t('edns_use_custom_ip_desc')}
-                    />
-                </div>
-
-                {edns_cs_use_custom && (<Field
-                    name="edns_cs_custom_ip"
-                    component={renderInputField}
-                    className="form-control"
-                    placeholder={t('form_enter_ip')}
-                    validate={[validateIp, validateRequiredValue]}
-                />)}
-
-            </div>
             {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
                 <div className="form__group form__group--settings">
                     <Field

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

@@ -14,8 +14,6 @@ const Config = () => {
         blocking_ipv4,
         blocking_ipv6,
         edns_cs_enabled,
-        edns_cs_use_custom,
-        edns_cs_custom_ip,
         dnssec_enabled,
         disable_ipv6,
         processingSetConfig,
@@ -41,8 +39,6 @@ const Config = () => {
                         edns_cs_enabled,
                         disable_ipv6,
                         dnssec_enabled,
-                        edns_cs_use_custom,
-                        edns_cs_custom_ip,
                     }}
                     onSubmit={handleFormSubmit}
                     processing={processingSetConfig}

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

@@ -1,43 +1,21 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import {
-    change,
-    Field,
-    formValueSelector,
-    reduxForm,
-} from 'redux-form';
-import { connect } from 'react-redux';
+import { Field, reduxForm } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 
-import {
-    CheckboxField,
-    toFloatNumber,
-    renderTextareaField, renderInputField, renderRadioField,
-} from '../../../helpers/form';
-import {
-    FORM_NAME,
-    QUERY_LOG_INTERVALS_DAYS,
-    HOUR,
-    DAY,
-    RETENTION_CUSTOM,
-    RETENTION_CUSTOM_INPUT,
-    RETENTION_RANGE,
-    CUSTOM_INTERVAL,
-} from '../../../helpers/constants';
+import { CheckboxField, renderRadioField, toFloatNumber } from '../../../helpers/form';
+import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
 import '../FormButton.css';
 
-
 const getIntervalTitle = (interval, t) => {
     switch (interval) {
-        case RETENTION_CUSTOM:
-            return t('settings_custom');
-        case 6 * HOUR:
+        case 0.25:
             return t('interval_6_hour');
-        case DAY:
+        case 1:
             return t('interval_24_hour');
         default:
-            return t('interval_days', { count: interval / DAY });
+            return t('interval_days', { count: interval });
     }
 };
 
@@ -54,26 +32,11 @@ const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.
     />
 ));
 
-let Form = (props) => {
+const Form = (props) => {
     const {
-        handleSubmit,
-        submitting,
-        invalid,
-        processing,
-        processingClear,
-        handleClear,
-        t,
-        interval,
-        customInterval,
-        dispatch,
+        handleSubmit, submitting, invalid, processing, processingClear, handleClear, t,
     } = props;
 
-    useEffect(() => {
-        if (QUERY_LOG_INTERVALS_DAYS.includes(interval)) {
-            dispatch(change(FORM_NAME.LOG_CONFIG, CUSTOM_INTERVAL, null));
-        }
-    }, [interval]);
-
     return (
         <form onSubmit={handleSubmit}>
             <div className="form__group form__group--settings">
@@ -100,66 +63,14 @@ let Form = (props) => {
             </label>
             <div className="form__group form__group--settings">
                 <div className="custom-controls-stacked">
-                    <Field
-                        key={RETENTION_CUSTOM}
-                        name="interval"
-                        type="radio"
-                        component={renderRadioField}
-                        value={QUERY_LOG_INTERVALS_DAYS.includes(interval)
-                            ? RETENTION_CUSTOM
-                            : interval
-                        }
-                        placeholder={getIntervalTitle(RETENTION_CUSTOM, t)}
-                        normalize={toFloatNumber}
-                        disabled={processing}
-                    />
-                    {!QUERY_LOG_INTERVALS_DAYS.includes(interval) && (
-                        <div className="form__group--input">
-                            <div className="form__desc form__desc--top">
-                                {t('custom_rotation_input')}
-                            </div>
-                            <Field
-                                key={RETENTION_CUSTOM_INPUT}
-                                name={CUSTOM_INTERVAL}
-                                type="number"
-                                className="form-control"
-                                component={renderInputField}
-                                disabled={processing}
-                                normalize={toFloatNumber}
-                                min={RETENTION_RANGE.MIN}
-                                max={RETENTION_RANGE.MAX}
-                            />
-                        </div>
-                    )}
                     {getIntervalFields(processing, t, toFloatNumber)}
                 </div>
             </div>
-            <label className="form__label form__label--with-desc">
-                <Trans>ignore_domains_title</Trans>
-            </label>
-            <div className="form__desc form__desc--top">
-                <Trans>ignore_domains_desc_query</Trans>
-            </div>
-            <div className="form__group form__group--settings">
-                <Field
-                    name="ignored"
-                    type="textarea"
-                    className="form-control form-control--textarea font-monospace text-input"
-                    component={renderTextareaField}
-                    placeholder={t('ignore_domains')}
-                    disabled={processing}
-                />
-            </div>
             <div className="mt-5">
                 <button
                     type="submit"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={
-                        submitting
-                        || invalid
-                        || processing
-                        || (!QUERY_LOG_INTERVALS_DAYS.includes(interval) && !customInterval)
-                    }
+                    disabled={submitting || invalid || processing}
                 >
                     <Trans>save_btn</Trans>
                 </button>
@@ -184,22 +95,8 @@ Form.propTypes = {
     processing: PropTypes.bool.isRequired,
     processingClear: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
-    interval: PropTypes.number,
-    customInterval: PropTypes.number,
-    dispatch: PropTypes.func.isRequired,
 };
 
-const selector = formValueSelector(FORM_NAME.LOG_CONFIG);
-
-Form = connect((state) => {
-    const interval = selector(state, 'interval');
-    const customInterval = selector(state, CUSTOM_INTERVAL);
-    return {
-        interval,
-        customInterval,
-    };
-})(Form);
-
 export default flow([
     withTranslation(),
     reduxForm({ form: FORM_NAME.LOG_CONFIG }),

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

@@ -4,28 +4,19 @@ import { withTranslation } from 'react-i18next';
 
 import Card from '../../ui/Card';
 import Form from './Form';
-import { HOUR } from '../../../helpers/constants';
 
 class LogsConfig extends Component {
     handleFormSubmit = (values) => {
         const { t, interval: prevInterval } = this.props;
-        const { interval, customInterval, ...rest } = values;
+        const { interval } = values;
 
-        const newInterval = customInterval ? customInterval * HOUR : interval;
-
-        const data = {
-            ...rest,
-            ignored: values.ignored ? values.ignored.split('\n') : [],
-            interval: newInterval,
-        };
-
-        if (newInterval < prevInterval) {
+        if (interval !== prevInterval) {
             // eslint-disable-next-line no-alert
             if (window.confirm(t('query_log_retention_confirm'))) {
-                this.props.setLogsConfig(data);
+                this.props.setLogsConfig(values);
             }
         } else {
-            this.props.setLogsConfig(data);
+            this.props.setLogsConfig(values);
         }
     };
 
@@ -39,14 +30,7 @@ class LogsConfig extends Component {
 
     render() {
         const {
-            t,
-            enabled,
-            interval,
-            processing,
-            processingClear,
-            anonymize_client_ip,
-            ignored,
-            customInterval,
+            t, enabled, interval, processing, processingClear, anonymize_client_ip,
         } = this.props;
 
         return (
@@ -60,9 +44,7 @@ class LogsConfig extends Component {
                         initialValues={{
                             enabled,
                             interval,
-                            customInterval,
                             anonymize_client_ip,
-                            ignored: ignored.join('\n'),
                         }}
                         onSubmit={this.handleFormSubmit}
                         processing={processing}
@@ -77,11 +59,9 @@ class LogsConfig extends Component {
 
 LogsConfig.propTypes = {
     interval: PropTypes.number.isRequired,
-    customInterval: PropTypes.number,
     enabled: PropTypes.bool.isRequired,
     anonymize_client_ip: PropTypes.bool.isRequired,
     processing: PropTypes.bool.isRequired,
-    ignored: PropTypes.array.isRequired,
     processingClear: PropTypes.bool.isRequired,
     setLogsConfig: PropTypes.func.isRequired,
     clearLogs: PropTypes.func.isRequired,

client/src/components/Settings/Settings.css

@@ -18,23 +18,10 @@
     font-size: 14px;
 }
 
-.form__group--input {
-    max-width: 300px;
-    margin: 0 1.5rem 10px;
-}
-
 .form__group--checkbox {
     margin-bottom: 25px;
 }
 
-.form__group--inner .form__group--checkbox {
-    margin-bottom: 12px;
-}
-
-.form__group--inner .form__group--checkbox:last-child {
-    margin-bottom: 0;
-}
-
 .form__inline {
     display: flex;
     justify-content: flex-start;
@@ -90,7 +77,7 @@
 .form__desc {
     margin-top: 10px;
     font-size: 13px;
-    color: var(--scolor);
+    color: rgba(74, 74, 74, 0.7);
 }
 
 .form__desc--top {
@@ -105,14 +92,6 @@
     margin-bottom: 0;
 }
 
-.form__label--bot {
-    margin-bottom: 10px;
-}
-
-.form__label--top {
-    margin-top: 10px;
-}
-
 .form__status {
     margin-top: 10px;
     font-size: 14px;

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

@@ -1,63 +1,34 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import {
-    change, Field, formValueSelector, reduxForm,
-} from 'redux-form';
+import { Field, reduxForm } from 'redux-form';
 import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
-import { connect } from 'react-redux';
 
-
-import {
-    renderRadioField,
-    toNumber,
-    CheckboxField,
-    renderTextareaField,
-    toFloatNumber,
-    renderInputField,
-} from '../../../helpers/form';
-import {
-    FORM_NAME,
-    STATS_INTERVALS_DAYS,
-    DAY,
-    RETENTION_CUSTOM,
-    RETENTION_CUSTOM_INPUT,
-    CUSTOM_INTERVAL,
-    RETENTION_RANGE,
-} from '../../../helpers/constants';
+import { renderRadioField, toNumber, CheckboxField } from '../../../helpers/form';
+import { FORM_NAME, STATS_INTERVALS_DAYS, DISABLED_STATS_INTERVAL } from '../../../helpers/constants';
 import '../FormButton.css';
 
-const getIntervalTitle = (intervalMs, t) => {
-    switch (intervalMs) {
-        case RETENTION_CUSTOM:
-            return t('settings_custom');
-        case DAY:
+const getIntervalTitle = (interval, t) => {
+    switch (interval) {
+        case 1:
             return t('interval_24_hour');
         default:
-            return t('interval_days', { count: intervalMs / DAY });
+            return t('interval_days', { count: interval });
     }
 };
 
-let Form = (props) => {
+const Form = (props) => {
     const {
         handleSubmit,
+        change,
         processing,
         submitting,
         invalid,
         handleReset,
         processingReset,
         t,
-        interval,
-        customInterval,
-        dispatch,
     } = props;
 
-    useEffect(() => {
-        if (STATS_INTERVALS_DAYS.includes(interval)) {
-            dispatch(change(FORM_NAME.STATS_CONFIG, CUSTOM_INTERVAL, null));
-        }
-    }, [interval]);
-
     return (
         <form onSubmit={handleSubmit}>
             <div className="form__group form__group--settings">
@@ -67,6 +38,13 @@ let Form = (props) => {
                     component={CheckboxField}
                     placeholder={t('statistics_enable')}
                     disabled={processing}
+                    onChange={(event) => {
+                        if (event.target.checked) {
+                            change('interval', STATS_INTERVALS_DAYS[0]);
+                        } else {
+                            change('interval', DISABLED_STATS_INTERVAL);
+                        }
+                    }}
                 />
             </div>
             <label className="form__label form__label--with-desc">
@@ -77,37 +55,6 @@ let Form = (props) => {
             </div>
             <div className="form__group form__group--settings mt-2">
                 <div className="custom-controls-stacked">
-                    <Field
-                        key={RETENTION_CUSTOM}
-                        name="interval"
-                        type="radio"
-                        component={renderRadioField}
-                        value={STATS_INTERVALS_DAYS.includes(interval)
-                            ? RETENTION_CUSTOM
-                            : interval
-                        }
-                        placeholder={getIntervalTitle(RETENTION_CUSTOM, t)}
-                        normalize={toFloatNumber}
-                        disabled={processing}
-                    />
-                    {!STATS_INTERVALS_DAYS.includes(interval) && (
-                        <div className="form__group--input">
-                            <div className="form__desc form__desc--top">
-                                {t('custom_retention_input')}
-                            </div>
-                            <Field
-                                key={RETENTION_CUSTOM_INPUT}
-                                name={CUSTOM_INTERVAL}
-                                type="number"
-                                className="form-control"
-                                component={renderInputField}
-                                disabled={processing}
-                                normalize={toFloatNumber}
-                                min={RETENTION_RANGE.MIN}
-                                max={RETENTION_RANGE.MAX}
-                            />
-                        </div>
-                    )}
                     {STATS_INTERVALS_DAYS.map((interval) => (
                         <Field
                             key={interval}
@@ -118,36 +65,20 @@ let Form = (props) => {
                             placeholder={getIntervalTitle(interval, t)}
                             normalize={toNumber}
                             disabled={processing}
+                            onChange={(event) => {
+                                if (event.target.checked) {
+                                    change('enabled', true);
+                                }
+                            }}
                         />
                     ))}
                 </div>
             </div>
-            <label className="form__label form__label--with-desc">
-                <Trans>ignore_domains_title</Trans>
-            </label>
-            <div className="form__desc form__desc--top">
-                <Trans>ignore_domains_desc_stats</Trans>
-            </div>
-            <div className="form__group form__group--settings">
-                <Field
-                    name="ignored"
-                    type="textarea"
-                    className="form-control form-control--textarea font-monospace text-input"
-                    component={renderTextareaField}
-                    placeholder={t('ignore_domains')}
-                    disabled={processing}
-                />
-            </div>
             <div className="mt-5">
                 <button
                     type="submit"
                     className="btn btn-success btn-standard btn-large"
-                    disabled={
-                        submitting
-                        || invalid
-                        || processing
-                        || (!STATS_INTERVALS_DAYS.includes(interval) && !customInterval)
-                    }
+                    disabled={submitting || invalid || processing}
                 >
                     <Trans>save_btn</Trans>
                 </button>
@@ -173,22 +104,8 @@ Form.propTypes = {
     processing: PropTypes.bool.isRequired,
     processingReset: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
-    interval: PropTypes.number,
-    customInterval: PropTypes.number,
-    dispatch: PropTypes.func.isRequired,
 };
 
-const selector = formValueSelector(FORM_NAME.STATS_CONFIG);
-
-Form = connect((state) => {
-    const interval = selector(state, 'interval');
-    const customInterval = selector(state, CUSTOM_INTERVAL);
-    return {
-        interval,
-        customInterval,
-    };
-})(Form);
-
 export default flow([
     withTranslation(),
     reduxForm({ form: FORM_NAME.STATS_CONFIG }),

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

@@ -4,20 +4,11 @@ import { withTranslation } from 'react-i18next';
 
 import Card from '../../ui/Card';
 import Form from './Form';
-import { HOUR } from '../../../helpers/constants';
 
 class StatsConfig extends Component {
-    handleFormSubmit = ({
-        enabled, interval, ignored, customInterval,
-    }) => {
+    handleFormSubmit = (values) => {
         const { t, interval: prevInterval } = this.props;
-        const newInterval = customInterval ? customInterval * HOUR : interval;
-
-        const config = {
-            enabled,
-            interval: newInterval,
-            ignored: ignored ? ignored.split('\n') : [],
-        };
+        const config = { interval: values.interval };
 
         if (config.interval < prevInterval) {
             if (window.confirm(t('statistics_retention_confirm'))) {
@@ -38,13 +29,7 @@ class StatsConfig extends Component {
 
     render() {
         const {
-            t,
-            interval,
-            customInterval,
-            processing,
-            processingReset,
-            ignored,
-            enabled,
+            t, interval, processing, processingReset,
         } = this.props;
 
         return (
@@ -57,9 +42,7 @@ class StatsConfig extends Component {
                     <Form
                         initialValues={{
                             interval,
-                            customInterval,
-                            enabled,
-                            ignored: ignored.join('\n'),
+                            enabled: !!interval,
                         }}
                         onSubmit={this.handleFormSubmit}
                         processing={processing}
@@ -74,9 +57,6 @@ class StatsConfig extends Component {
 
 StatsConfig.propTypes = {
     interval: PropTypes.number.isRequired,
-    customInterval: PropTypes.number,
-    ignored: PropTypes.array.isRequired,
-    enabled: PropTypes.bool.isRequired,
     processing: PropTypes.bool.isRequired,
     processingReset: PropTypes.bool.isRequired,
     setStatsConfig: PropTypes.func.isRequired,

client/src/components/Settings/index.js

@@ -10,7 +10,7 @@ import Checkbox from '../ui/Checkbox';
 import Loading from '../ui/Loading';
 import PageTitle from '../ui/PageTitle';
 import Card from '../ui/Card';
-import { getObjectKeysSorted, captitalizeWords } from '../../helpers/helpers';
+import { getObjectKeysSorted } from '../../helpers/helpers';
 import './Settings.css';
 
 const ORDER_KEY = 'order';
@@ -28,6 +28,12 @@ const SETTINGS = {
         subtitle: 'use_adguard_parental_hint',
         [ORDER_KEY]: 1,
     },
+    safesearch: {
+        enabled: false,
+        title: 'enforce_safe_search',
+        subtitle: 'enforce_save_search_hint',
+        [ORDER_KEY]: 2,
+    },
 };
 
 class Settings extends Component {
@@ -38,7 +44,7 @@ class Settings extends Component {
         this.props.getFilteringStatus();
     }
 
-    renderSettings = (settings) => getObjectKeysSorted(SETTINGS, ORDER_KEY)
+    renderSettings = (settings) => getObjectKeysSorted(settings, ORDER_KEY)
         .map((key) => {
             const setting = settings[key];
             const { enabled } = setting;
@@ -49,35 +55,6 @@ class Settings extends Component {
             />;
         });
 
-    renderSafeSearch = () => {
-        const { settings: { settingsList: { safesearch } } } = this.props;
-        const { enabled } = safesearch || {};
-        const searches = { ...(safesearch || {}) };
-        delete searches.enabled;
-        return (
-            <>
-                <Checkbox
-                    enabled={enabled}
-                    title='enforce_safe_search'
-                    subtitle='enforce_save_search_hint'
-                    handleChange={({ target: { checked: enabled } }) => this.props.toggleSetting('safesearch', { ...safesearch, enabled })}
-                />
-                <div className='form__group--inner'>
-                    {Object.keys(searches).map((searchKey) => (
-                        <Checkbox
-                            key={searchKey}
-                            enabled={searches[searchKey]}
-                            title={captitalizeWords(searchKey)}
-                            subtitle=''
-                            disabled={!safesearch.enabled}
-                            handleChange={({ target: { checked } }) => this.props.toggleSetting('safesearch', { ...safesearch, [searchKey]: checked })}
-                        />
-                    ))}
-                </div>
-            </>
-        );
-    };
-
     render() {
         const {
             settings,
@@ -115,16 +92,13 @@ class Settings extends Component {
                                             setFiltersConfig={setFiltersConfig}
                                         />
                                         {this.renderSettings(settings.settingsList)}
-                                        {this.renderSafeSearch()}
                                     </div>
                                 </Card>
                             </div>
                             <div className="col-md-12">
                                 <LogsConfig
                                     enabled={queryLogs.enabled}
-                                    ignored={queryLogs.ignored}
                                     interval={queryLogs.interval}
-                                    customInterval={queryLogs.customInterval}
                                     anonymize_client_ip={queryLogs.anonymize_client_ip}
                                     processing={queryLogs.processingSetConfig}
                                     processingClear={queryLogs.processingClear}
@@ -135,9 +109,6 @@ class Settings extends Component {
                             <div className="col-md-12">
                                 <StatsConfig
                                     interval={stats.interval}
-                                    customInterval={stats.customInterval}
-                                    ignored={stats.ignored}
-                                    enabled={stats.enabled}
                                     processing={stats.processingSetConfig}
                                     processingReset={stats.processingReset}
                                     setStatsConfig={setStatsConfig}
@@ -168,21 +139,16 @@ Settings.propTypes = {
     stats: PropTypes.shape({
         processingGetConfig: PropTypes.bool,
         interval: PropTypes.number,
-        customInterval: PropTypes.number,
-        enabled: PropTypes.bool,
-        ignored: PropTypes.array,
         processingSetConfig: PropTypes.bool,
         processingReset: PropTypes.bool,
     }),
     queryLogs: PropTypes.shape({
         enabled: PropTypes.bool,
         interval: PropTypes.number,
-        customInterval: PropTypes.number,
         anonymize_client_ip: PropTypes.bool,
         processingSetConfig: PropTypes.bool,
         processingClear: PropTypes.bool,
         processingGetConfig: PropTypes.bool,
-        ignored: PropTypes.array,
     }),
     filtering: PropTypes.shape({
         interval: PropTypes.number,

client/src/components/Toasts/Toast.css

@@ -54,11 +54,6 @@
     cursor: pointer;
 }
 
-.toast__dismiss:hover,
-.toast__dismiss:focus {
-    outline: none;
-}
-
 .toast-enter {
     opacity: 0.01;
 }

client/src/components/ui/Checkbox.css

@@ -48,7 +48,7 @@
     height: 20px;
     min-width: 20px;
     margin-right: 10px;
-    background-color: var(--checkbox-bg);
+    background-color: #e2e2e2;
     background-repeat: no-repeat;
     background-position: center center;
     background-size: 12px 10px;
@@ -107,5 +107,5 @@
 .checkbox__label-subtitle {
     display: block;
     line-height: 1.5;
-    color: var(--scolor);
+    color: rgba(74, 74, 74, 0.7);
 }

client/src/components/ui/Checkbox.js

@@ -11,14 +11,13 @@ class Checkbox extends Component {
             subtitle,
             enabled,
             handleChange,
-            disabled,
             t,
         } = this.props;
         return (
             <div className="form__group form__group--checkbox">
                 <label className="checkbox checkbox--settings">
                 <span className="checkbox__marker"/>
-                <input type="checkbox" className="checkbox__input" onChange={handleChange} checked={enabled} disabled={disabled}/>
+                <input type="checkbox" className="checkbox__input" onChange={handleChange} checked={enabled}/>
                 <span className="checkbox__label">
                     <span className="checkbox__label-text">
                     <span className="checkbox__label-title">{ t(title) }</span>
@@ -36,7 +35,6 @@ Checkbox.propTypes = {
     subtitle: PropTypes.string.isRequired,
     enabled: PropTypes.bool.isRequired,
     handleChange: PropTypes.func.isRequired,
-    disabled: PropTypes.bool,
     t: PropTypes.func,
 };
 

client/src/components/ui/Dropdown.css

@@ -1,64 +1,8 @@
-.dropdown-item {
-    cursor: pointer;
-}
-
 .dropdown-item.active,
 .dropdown-item:active {
-    background-color: var(--btn-success-bgcolor);
+    background-color: var(--green-74);
 }
 
 .dropdown-menu {
     cursor: default;
 }
-
-.dropdown-menu.dropdown-menu--protection {
-    top: calc(100% + 8px);
-    left: 50%;
-    transform: translateX(-50%);
-}
-
-.dropdown-menu.dropdown-menu-arrow.dropdown-menu--protection::before,
-.dropdown-menu.dropdown-menu-arrow.dropdown-menu--protection::after {
-    left: 50%;
-    transform: translateX(-50%);
-}
-
-.dropdown-protection {
-    align-self: stretch;
-    width: 26px;
-    display: flex;
-    position: relative;
-    border: 1px solid #868e96;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-    border-left: none;
-    cursor: pointer;
-}
-
-.dropdown-protection__toggle {
-    width: 100%;
-    display: block;
-    position: relative;
-    background-color: #868e96;
-    transition: background-color 0.15s ease-in-out;
-}
-
-.dropdown-protection__toggle:hover {
-    background-color: #727b84;
-}
-
-.dropdown-protection__toggle .nav-icon {
-    width: 100%;
-    height: 100%;
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-    color: var(--white);
-    transition: 0.15s ease-in-out transform;
-    transform-origin: center;
-}
-
-.dropdown-protection.show .nav-icon {
-    transform: rotate(180deg);
-}

client/src/components/ui/Footer.css

@@ -18,11 +18,6 @@
     align-items: center;
 }
 
-.footer__column--theme {
-    min-width: 220px;
-    margin-bottom: 0;
-}
-
 .footer__column--language {
     min-width: 220px;
     margin-bottom: 0;
@@ -54,11 +49,6 @@
     }
 
     .footer__column--language {
-        min-width: initial;
-        margin-left: 20px;
-    }
-
-    .footer__column--theme {
         min-width: initial;
         margin-left: auto;
     }
@@ -71,38 +61,3 @@
         margin: 0 20px 0 0;
     }
 }
-
-.btn-secondary.footer__theme-button,
-[data-theme="dark"] .btn-secondary.footer__theme-button {
-    height: 38px;
-    border-color: var(--ctrl-select-bgcolor);
-}
-
-.footer__theme-icon {
-    display: inline-block;
-    vertical-align: middle;
-    width: 24px;
-    height: 24px;
-    color: var(--gray-ac);
-}
-
-[data-theme="dark"] .footer__theme-icon {
-    color: var(--mcolor);
-}
-
-.footer__theme-icon--active,
-[data-theme="dark"] .footer__theme-icon--active {
-    color: var(--btn-success-bgcolor);
-}
-
-.footer__themes {
-    margin: 0 auto 24px;
-    text-align: center;
-}
-
-@media screen and (min-width: 768px) {
-    .footer__themes {
-        margin: 0;
-        text-align: left;
-    }
-}

client/src/components/ui/Footer.js

@@ -1,17 +1,15 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
-import cn from 'classnames';
+import classNames from 'classnames';
 
-import { REPOSITORY, PRIVACY_POLICY_LINK, THEMES } from '../../helpers/constants';
+import { REPOSITORY, PRIVACY_POLICY_LINK } from '../../helpers/constants';
 import { LANGUAGES } from '../../helpers/twosky';
 import i18n from '../../i18n';
 
 import Version from './Version';
 import './Footer.css';
 import './Select.css';
-import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers';
-import { changeTheme } from '../../actions';
+import { setHtmlLangAttr } from '../../helpers/helpers';
 
 const linksData = [
     {
@@ -31,16 +29,6 @@ const linksData = [
 
 const Footer = () => {
     const { t } = useTranslation();
-    const dispatch = useDispatch();
-
-    const currentTheme = useSelector((state) => (
-        state.dashboard ? state.dashboard.theme : THEMES.auto
-    ));
-    const profileName = useSelector((state) => (
-        state.dashboard ? state.dashboard.name : ''
-    ));
-    const isLoggedIn = profileName !== '';
-    const [currentThemeLocal, setCurrentThemeLocal] = useState(THEMES.auto);
 
     const getYear = () => {
         const today = new Date();
@@ -53,15 +41,6 @@ const Footer = () => {
         setHtmlLangAttr(value);
     };
 
-    const onThemeChange = (value) => {
-        if (isLoggedIn) {
-            dispatch(changeTheme(value));
-        } else {
-            setUITheme(value);
-            setCurrentThemeLocal(value);
-        }
-    };
-
     const renderCopyright = () => <div className="footer__column">
         <div className="footer__copyright">
             {t('copyright')} &copy; {getYear()}{' '}
@@ -72,54 +51,13 @@ const Footer = () => {
     const renderLinks = (linksData) => linksData.map(({ name, href, className = '' }) => <a
             key={name}
             href={href}
-            className={cn('footer__link', className)}
+            className={classNames('footer__link', className)}
             target="_blank"
             rel="noopener noreferrer"
         >
             {t(name)}
         </a>);
 
-    const renderThemeButtons = () => {
-        const currentValue = isLoggedIn ? currentTheme : currentThemeLocal;
-
-        const content = {
-            auto: {
-                desc: t('theme_auto_desc'),
-                icon: '#auto',
-            },
-            dark: {
-                desc: t('theme_dark_desc'),
-                icon: '#dark',
-            },
-            light: {
-                desc: t('theme_light_desc'),
-                icon: '#light',
-            },
-        };
-
-        return (
-            Object.values(THEMES)
-                .map((theme) => (
-                    <button
-                        key={theme}
-                        type="button"
-                        className="btn btn-sm btn-secondary footer__theme-button"
-                        onClick={() => onThemeChange(theme)}
-                        title={content[theme].desc}
-                    >
-                        <svg
-                            className={cn(
-                                'footer__theme-icon',
-                                { 'footer__theme-icon--active': currentValue === theme },
-                            )}
-                        >
-                            <use xlinkHref={content[theme].icon} />
-                        </svg>
-                    </button>
-                ))
-        );
-    };
-
     return (
         <>
             <footer className="footer">
@@ -128,13 +66,6 @@ const Footer = () => {
                         <div className="footer__column footer__column--links">
                             {renderLinks(linksData)}
                         </div>
-                        <div className="footer__column footer__column--theme">
-                            <div className="footer__themes">
-                                <div className="btn-group">
-                                    {renderThemeButtons()}
-                                </div>
-                            </div>
-                        </div>
                         <div className="footer__column footer__column--language">
                             <select
                                 className="form-control select select--language"

client/src/components/ui/Guide/Guide.js

@@ -7,6 +7,7 @@ import { useSelector } from 'react-redux';
 import { MOBILE_CONFIG_LINKS } from '../../../helpers/constants';
 
 import Tabs from '../Tabs';
+import Icons from '../Icons';
 import MobileConfigForm from './MobileConfigForm';
 
 const renderLi = ({ label, components }) => <li key={label}>
@@ -340,6 +341,7 @@ const Guide = ({ dnsAddresses }) => {
             >
                 {activeTab}
             </Tabs>
+            <Icons />
         </div>
     );
 };

client/src/components/ui/Icons.js

@@ -86,10 +86,10 @@ const Icons = () => (
                 d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z" />
         </symbol>
 
-        <symbol id="refresh" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
-            <polyline points="23 4 23 10 17 10"></polyline>
-            <polyline points="1 20 1 14 7 14"></polyline>
-            <path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path>
+        <symbol id="refresh" viewBox="0 0 24 24" stroke="currentColor" fill="none"
+                strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <path d="M23 4v6h-6M1 20v-6h6" />
+            <path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15" />
         </symbol>
 
         <symbol id="dns_privacy" viewBox="0 0 30 30" stroke="none" fill="currentColor"
@@ -181,12 +181,6 @@ const Icons = () => (
             </svg>
         </symbol>
 
-        <symbol id="arrow-down" viewBox="0 0 24 24" fill="currentColor">
-            <svg xmlns="http://www.w3.org/2000/svg">
-                <path fillRule="evenodd" d="M6.2 8.2a.64.64 0 0 1 .94 0L12 13.32l4.86-5.1a.64.64 0 0 1 .94 0c.27.27.27.71 0 .98l-5.33 5.6a.64.64 0 0 1-.94 0L6.2 9.2a.72.72 0 0 1 0-.98Z" clipRule="evenodd"/>
-            </svg>
-        </symbol>
-
         <symbol id="arrow-right" viewBox="0 0 24 24" stroke="currentColor"
                 strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.5">
             <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
@@ -204,24 +198,11 @@ const Icons = () => (
             </svg>
         </symbol>
 
-        <symbol id="auto" width="24" height="24" viewBox="0 0 24 24" fill="none">
-            <path fillRule="evenodd" clipRule="evenodd" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z" stroke="currentColor" strokeWidth="1.5" />
-            <path fillRule="evenodd" clipRule="evenodd" d="M12 3V21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3Z" fill="currentColor" stroke="currentColor" strokeWidth="1.5" />
-        </symbol>
-
-        <symbol id="dark" width="24" height="24" viewBox="0 0 24 24" fill="none">
-            <path d="M3.80737 15.731L3.9895 15.0034C3.71002 14.9335 3.41517 15.0298 3.23088 15.2512C3.0466 15.4727 3.00545 15.7801 3.12501 16.0422L3.80737 15.731ZM14.1926 3.26892L14.3747 2.54137C14.0953 2.47141 13.8004 2.56772 13.6161 2.78917C13.4318 3.01062 13.3907 3.31806 13.5102 3.58018L14.1926 3.26892ZM12 20.2499C8.66479 20.2499 5.79026 18.2708 4.48974 15.4197L3.12501 16.0422C4.66034 19.4081 8.05588 21.7499 12 21.7499V20.2499ZM20.25 11.9999C20.25 16.5563 16.5563 20.2499 12 20.2499V21.7499C17.3848 21.7499 21.75 17.3847 21.75 11.9999H20.25ZM14.0105 3.99647C17.5955 4.89391 20.25 8.13787 20.25 11.9999H21.75C21.75 7.43347 18.6114 3.60193 14.3747 2.54137L14.0105 3.99647ZM13.5102 3.58018C13.9851 4.6211 14.25 5.77857 14.25 6.99995H15.75C15.75 5.5595 15.4371 4.1901 14.875 2.95766L13.5102 3.58018ZM14.25 6.99995C14.25 11.5563 10.5563 15.2499 5.99999 15.2499V16.7499C11.3848 16.7499 15.75 12.3847 15.75 6.99995H14.25ZM5.99999 15.2499C5.30559 15.2499 4.63225 15.1643 3.9895 15.0034L3.62525 16.4585C4.38616 16.649 5.18181 16.7499 5.99999 16.7499V15.2499Z" fill="currentColor" />
-        </symbol>
-
-        <symbol id="light" width="24" height="24" viewBox="0 0 24 24" fill="none">
-            <path d="M12 3.75C16.5563 3.75 20.25 7.44365 20.25 12H21.75C21.75 6.61522 17.3848 2.25 12 2.25V3.75ZM20.25 12C20.25 16.5563 16.5563 20.25 12 20.25V21.75C17.3848 21.75 21.75 17.3848 21.75 12H20.25ZM12 20.25C7.44365 20.25 3.75 16.5563 3.75 12H2.25C2.25 17.3848 6.61522 21.75 12 21.75V20.25ZM3.75 12C3.75 7.44365 7.44365 3.75 12 3.75V2.25C6.61522 2.25 2.25 6.61522 2.25 12H3.75Z" fill="currentColor" />
-            <path fillRule="evenodd" clipRule="evenodd" d="M12 10C10.8954 10 10 10.8954 10 12C10 13.1046 10.8954 14 12 14C13.1046 14 14 13.1046 14 12C13.9987 10.896 13.104 10.0013 12 10Z" fill="currentColor" />
-        </symbol>
-
-        <symbol id="chevron-down" width="24" height="24" viewBox="0 0 24 24">
+        <symbol id="chevron-down" viewBox="0 0 24 24">
             <g fill="none" fillRule="evenodd">
                 <path d="M0 0h24v24H0z" fill="#878787" fillOpacity=".01" />
-                <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" d="M8.036 10.93l3.93 4.07 4.068-3.93" />
+                <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"
+                      d="M8.036 10.93l3.93 4.07 4.068-3.93" />
             </g>
         </symbol>
     </svg>

client/src/components/ui/Line.css

@@ -11,10 +11,6 @@
     font-size: 0.7rem;
 }
 
-.card-chart-bg {
-    color: var(--black);
-}
-
 .card-chart-bg path[d^="M0,32"] {
     transform: translateY(32px);
 }

client/src/components/ui/Line.js

@@ -9,12 +9,11 @@ import round from 'lodash/round';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import './Line.css';
-import { msToDays } from '../../helpers/helpers';
 
 const Line = ({
     data, color = 'black',
 }) => {
-    const interval = msToDays(useSelector((state) => state.stats.interval));
+    const interval = useSelector((state) => state.stats.interval);
 
     return <ResponsiveLine
         enableArea
@@ -26,9 +25,9 @@ const Line = ({
         theme={{
             crosshair: {
                 line: {
-                    stroke: 'currentColor',
+                    stroke: 'black',
                     strokeWidth: 1,
-                    strokeOpacity: 0.5,
+                    strokeOpacity: 0.35,
                 },
             },
         }}