all: fix chlog

Updates #4557.

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

.github/ISSUE_TEMPLATE/bug.yml

@@ -10,58 +10,52 @@
           - 'label': >
                 I have checked the
                 [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
+                [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 or ask for
-                help](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
-            'required': true
-          - 'label': >
-                I have set up AdGuard Home correctly and [configured clients to
-                use it](https://github.com/AdguardTeam/AdGuardHome/wiki/Clients).
-                (Use the
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
-                for help with installing and configuring clients.)
+                I want to report a bug and not ask a question
             'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-        'description': 'On which Platform does the issue occur?'
-        'label': 'Platform (OS and CPU architecture)'
+        'description': 'On which operating system type does the issue occur?'
+        'label': 'Operating system type'
         'options':
-          - 'Darwin (aka macOS)/AMD64 (aka x86_64)'
-          - 'Darwin (aka macOS)/ARM64'
-          - 'FreeBSD/386'
-          - 'FreeBSD/AMD64 (aka x86_64)'
-          - 'FreeBSD/ARM64'
-          - 'FreeBSD/ARMv5'
-          - 'FreeBSD/ARMv6'
-          - 'FreeBSD/ARMv7'
-          - 'Linux/386'
-          - 'Linux/AMD64 (aka x86_64)'
-          - 'Linux/ARM64'
-          - 'Linux/ARMv5'
-          - 'Linux/ARMv6'
-          - 'Linux/ARMv7'
-          - 'Linux/MIPS LE'
-          - 'Linux/MIPS'
-          - 'Linux/MIPS64 LE'
-          - 'Linux/MIPS64'
-          - 'Linux/PPC64 LE'
-          - 'OpenBSD/AMD64 (aka x86_64)'
-          - 'OpenBSD/ARM64'
-          - 'Windows/386'
-          - 'Windows/AMD64 (aka x86_64)'
-          - 'Windows/ARM64'
-          - 'Custom (please mention in the description)'
+          - '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
+  - 'attributes':
+        'description': 'On which CPU architecture does the issue occur?'
+        'label': 'CPU architecture'
+        'options':
+          - 'AMD64'
+          - 'x86'
+          - '64-bit ARM'
+          - 'ARMv5'
+          - 'ARMv6'
+          - 'ARMv7'
+          - '64-bit MIPS'
+          - '64-bit MIPS LE'
+          - '32-bit MIPS'
+          - '32-bit MIPS LE'
+          - '64-bit PowerPC LE'
+          - 'Other (please mention in the description)'
+    'id': 'arch'
+    'type': 'dropdown'
+    'validations':
+        'required': true
   - 'attributes':
         'description': 'How did you install AdGuard Home?'
         'label': 'Installation'
@@ -69,7 +63,7 @@
           - 'GitHub releases or script from README'
           - 'Docker'
           - 'Snapcraft'
-          - 'Custom package (OpenWrt, HomeAssistant, etc; please mention in the description)'
+          - 'Custom port'
           - 'Other (please mention in the description)'
     'id': 'install'
     'type': 'dropdown'
@@ -95,55 +89,21 @@
     'validations':
         'required': true
   - 'attributes':
-        'description': >
-            Please describe what you did.  An `nslookup` or a `dig` command is
-            the best way.  For crashes, please provide a full failure log.
-        'label': 'Action'
+        'description': 'Please describe the bug'
+        'label': 'Description'
         'value': |
-            ```sh
-            nslookup -debug -type=a 'www.example.com' '$YOUR_AGH_ADDRESS'
-            ```
-    'id': 'failing_action'
+            #### What did you do?
+
+            #### Expected result
+
+            #### Actual result
+
+            #### Screenshots (if applicable)
+
+            #### Additional information
+    'id': 'description'
     'type': 'textarea'
     'validations':
         'required': true
-  - 'attributes':
-        'description': >
-            What did you expect to see?  Please add a description and/or
-            screenshots, if applicable.
-        'label': 'Expected result'
-        'placeholder': >
-            What did you expect to see?
-    'id': 'expected'
-    'type': 'textarea'
-    'validations':
-        'required': true
-  - 'attributes':
-        'description': >
-            What happened instead?  Please add a description and/or screenshots,
-            if applicable.
-        'label': 'Actual result'
-        'placeholder': >
-            What did you see instead?
-    'id': 'result'
-    'type': 'textarea'
-    'validations':
-        'required': true
-  - 'attributes':
-        'description': >
-            Please add additional information, such as non-standard OS or port,
-            here.  You can also put screenshots here, if applicable.  For
-            example, it is better to copy and paste text from a terminal instead
-            of posting a screenshot of the terminal.
-        'label': 'Additional information and/or screenshots'
-        'placeholder': >
-            Additional OS information, screenshots of the UI, etc.
-    'id': 'additional'
-    'type': 'textarea'
-    'validations':
-        'required': false
-'description': >
-    Open a bug report.  Please do not open bug reports for questions or help
-    with configuring clients.  If you want to ask for help, use the Discussions
-    section.
+'description': 'File a bug report'
 'name': 'Bug'

.github/ISSUE_TEMPLATE/feature.yml

@@ -23,32 +23,19 @@
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-        'description': 'Please describe the problem you are trying to solve'
-        'label': 'The problem'
-        'placeholder': >
-            Please describe the problem you are trying to solve
-    'id': 'problem'
+        '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 feature are you proposing to solve this problem?'
-        'label': 'Proposed solution'
-        'placeholder': >
-            What feature are you proposing to solve this problem?
-    'id': 'proposed_solution'
-    'type': 'textarea'
-    'validations':
-        'required': true
-  - 'attributes':
-        'label': 'Alternatives considered and additional information'
-        'placeholder': >
-            Are there any other ways to solve the problem?
-    'id': 'additional'
-    'type': 'textarea'
-    'validations':
-        'required': false
 'description': 'Suggest a feature or an enhancement for AdGuard Home'
-'labels':
-  - 'feature request'
 'name': 'Feature request or enhancement'

.github/PULL_REQUEST_TEMPLATE

@@ -1,20 +0,0 @@
-Before submitting a PR please make sure that:
-
-1.  You have discussed your solution in an issue and have got an
-    approval from a maintainer.
-
-2.  This isn't a localization fix; please send those to our
-    [CrowdIn](https://crowdin.com/project/adguard-applications/en#/adguard-home)
-    page.
-
-3.  Your code follows our
-    [code guidelines](https://github.com/AdguardTeam/CodeGuidelines/blob/master/Go/Go.md).
-
-Add a short description here.  The description should include:
-
-1.  Which issue this PR closes (`Closes #NNNN.`) or updates (`Updates
-    #NNNN.`).
-
-2.  A short description of how the change achieves that.
-
-Do not forget to remove these instructions.

.github/workflows/build.yml

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

.github/workflows/lint.yml

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

.github/workflows/potential-duplicates.yml

@@ -1,18 +0,0 @@
-'name': 'potential-duplicates'
-'on':
-    'issues':
-        'types':
-          - 'opened'
-'jobs':
-    'run':
-        'runs-on': 'ubuntu-latest'
-        'steps':
-          - 'uses': 'wow-actions/potential-duplicates@v1'
-            'with':
-                'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
-                'state': 'all'
-                'threshold': 0.6
-                'comment': |
-                    Potential duplicates: {{#issues}}
-                     *  [#{{ number }}] {{ title }} ({{ accuracy }}%)
-                    {{/issues}}

.gitignore

@@ -21,6 +21,7 @@
 /snapcraft_login
 AdGuardHome*
 coverage.txt
+leases.db
 node_modules/
 
 !/build/gitkeep

AGHTechDoc.md

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

CHANGELOG.md

@@ -14,314 +14,15 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA
 
-## [v0.107.33] - 2023-06-28 (APPROX.)
+## [v0.107.27] - 2023-03-29 (APPROX.)
 
-See also the [v0.107.33 GitHub milestone][ms-v0.107.33].
+See also the [v0.107.27 GitHub milestone][ms-v0.107.27].
 
-[ms-v0.107.33]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1
+[ms-v0.107.27]: https://github.com/AdguardTeam/AdGuardHome/milestone/63?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
-### Added
-
-- The new HTTP API, `GET /control/querylog/export`, which can be used to
-  export query log items.  See `openapi/openapi.yaml` for the full description
-  ([#3389]).
-- The ability to set inactivity periods for filtering blocked services in the
-  configuration file ([#951]).  The UI changes are coming in the upcoming
-  releases.
-- The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
-  ([#1577]).
-
-### Changed
-
-#### Configuration Changes
-
-In this release, the schema version has changed from 20 to 21.
-
-- Property `dns.blocked_services`, which in schema versions 20 and earlier used
-  to be a list containing ids of blocked services, is now an object containing
-  ids and schedule for blocked services:
-
-  ```yaml
-  # BEFORE:
-  'blocked_services':
-  - id_1
-  - id_2
-
-  # AFTER:
-  'blocked_services':
-    'ids':
-    - id_1
-    - id_2
-    'schedule':
-      'time_zone': 'Local'
-      'sun':
-        'start': '0s'
-        'end': '24h'
-      'mon':
-        'start': '10m'
-        'end': '23h30m'
-      'tue':
-        'start': '20m'
-        'end': '23h'
-      'wed':
-        'start': '30m'
-        'end': '22h30m'
-      'thu':
-        'start': '40m'
-        'end': '22h'
-      'fri':
-        'start': '50m'
-        'end': '21h30m'
-      'sat':
-        'start': '1h'
-        'end': '21h'
-  ```
-
-  To rollback this change, replace `dns.blocked_services` object with the list
-  of ids of blocked services and change the `schema_version` back to `20`.
-
-### Fixed
-
-- Queries with the question-section target `.`, for example `NS .`, are now
-  counted in the statistics and correctly shown in the query log ([#5910]).
-- Safe Search not working with `AAAA` queries for domains that don't have `AAAA`
-  records ([#5913]).
-
-[#951]:  https://github.com/AdguardTeam/AdGuardHome/issues/951
-[#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
-[#3389]: https://github.com/AdguardTeam/AdGuardHome/issues/3389
-[#5910]: https://github.com/AdguardTeam/AdGuardHome/issues/5910
-[#5913]: https://github.com/AdguardTeam/AdGuardHome/issues/5913
-
-<!--
-NOTE: Add new changes ABOVE THIS COMMENT.
--->
-
-
-
-## [v0.107.32] - 2023-06-13
-
-### Fixed
-
-- DNSCrypt upstream not resetting the client and resolver information on
-  dialing errors ([#5872]).
-
-
-
-
-## [v0.107.31] - 2023-06-08
-
-See also the [v0.107.31 GitHub milestone][ms-v0.107.31].
-
-### Fixed
-
-- Startup errors on OpenWrt ([#5872]).
-- Plain-UDP upstreams always falling back to TCP, causing outages and slowdowns
-  ([#5873], [#5874]).
-
-[#5872]: https://github.com/AdguardTeam/AdGuardHome/issues/5872
-[#5873]: https://github.com/AdguardTeam/AdGuardHome/issues/5873
-[#5874]: https://github.com/AdguardTeam/AdGuardHome/issues/5874
-
-[ms-v0.107.31]: https://github.com/AdguardTeam/AdGuardHome/milestone/67?closed=1
-
-
-
-## [v0.107.30] - 2023-06-07
-
-See also the [v0.107.30 GitHub milestone][ms-v0.107.30].
-
-### Security
-
-- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-29402, CVE-2023-29403, and CVE-2023-29404 Go vulnerabilities fixed in
-  [Go 1.19.10][go-1.19.10].
-
-### Fixed
-
-- Unquoted IPv6 bind hosts with trailing colons erroneously considered
-  unspecified addresses are now properly validated ([#5752]).
-
-  **NOTE:** the Docker healthcheck script now also doesn't interpret the `""`
-  value as unspecified address.
-- Incorrect `Content-Type` header value in `POST /control/version.json` and `GET
-  /control/dhcp/interfaces` HTTP APIs ([#5716]).
-- Provided bootstrap servers are now used to resolve the hostnames of plain
-  UDP/TCP upstream servers.
-
-[#5716]: https://github.com/AdguardTeam/AdGuardHome/issues/5716
-
-[go-1.19.10]:   https://groups.google.com/g/golang-announce/c/q5135a9d924/m/j0ZoAJOHAwAJ
-[ms-v0.107.30]: https://github.com/AdguardTeam/AdGuardHome/milestone/66?closed=1
-
-
-
-## [v0.107.29] - 2023-04-18
-
-See also the [v0.107.29 GitHub milestone][ms-v0.107.29].
-
-### Added
-
-- The ability to exclude client activity from the query log or statistics by
-  editing client's settings on the respective page in the UI ([#1717], [#4299]).
-
-### Changed
-
-- Stored DHCP leases moved from `leases.db` to `data/leases.json`.  The file
-  format has also been optimized.
-
-### Fixed
-
-- The `github.com/mdlayher/raw` dependency has been temporarily returned to
-  support raw connections on Darwin ([#5712]).
-- Incorrect recording of blocked results as “Blocked by CNAME or IP” in the
-  query log ([#5725]).
-- All Safe Search services being unchecked by default.
-- Panic when a DNSCrypt stamp is invalid ([#5721]).
-
-[#5712]: https://github.com/AdguardTeam/AdGuardHome/issues/5712
-[#5721]: https://github.com/AdguardTeam/AdGuardHome/issues/5721
-[#5725]: https://github.com/AdguardTeam/AdGuardHome/issues/5725
-[#5752]: https://github.com/AdguardTeam/AdGuardHome/issues/5752
-
-[ms-v0.107.29]: https://github.com/AdguardTeam/AdGuardHome/milestone/65?closed=1
-
-
-
-## [v0.107.28] - 2023-04-12
-
-See also the [v0.107.28 GitHub milestone][ms-v0.107.28].
-
-### 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
@@ -364,7 +65,7 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
 
 - 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.
+  fields ([#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.
 
@@ -372,6 +73,8 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
 
 #### Configuration Changes
 
+In this release, the schema version has changed from 16 to 17.
+
 - 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:
@@ -392,7 +95,7 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
   ```
 
   To rollback this change, move the value of `dns.edns_client_subnet.enabled`
-  into the `dns.edns_client_subnet`, remove the properties
+  into the `dns.edns_client_subnet`, remove the fields
   `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`.
@@ -423,6 +126,10 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
 [ms-v0.107.26]: https://github.com/AdguardTeam/AdGuardHome/milestone/62?closed=1
 [rfc3696]:      https://datatracker.ietf.org/doc/html/rfc3696
 
+<!--
+NOTE: Add new changes ABOVE THIS COMMENT.
+-->
+
 
 
 ## [v0.107.25] - 2023-02-21
@@ -452,11 +159,11 @@ See also the [v0.107.24 GitHub milestone][ms-v0.107.24].
 ### Added
 
 - The ability to disable statistics by using the new `statistics.enabled`
-  property.  Previously it was necessary to set the `statistics_interval` to 0,
+  field.  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.
+  the new `querylog.ignored` or `statistics.ignored` fields ([#1717], [#4299]).
+  The UI changes are coming in the upcoming releases.
 
 ### Changed
 
@@ -481,7 +188,7 @@ In this release, the schema version has changed from 14 to 16.
 
   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`,
+- The fields `dns.querylog_enabled`, `dns.querylog_file_enabled`,
   `dns.querylog_interval`, and `dns.querylog_size_memory` have been moved to the
   new `querylog` object.
 
@@ -539,8 +246,8 @@ 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
+  field 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
@@ -1198,7 +905,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
@@ -1448,7 +1155,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]).
@@ -1864,7 +1571,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]).
 
@@ -1901,8 +1608,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
@@ -1972,7 +1679,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
@@ -2080,16 +1787,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.33...HEAD
-[v0.107.33]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...v0.107.33
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...HEAD
+[v0.107.28]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.27...v0.107.28
 -->
 
-[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
-[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
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.27...HEAD
 [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

Makefile

@@ -37,8 +37,6 @@ SIGN = 1
 VERSION = v0.0.0
 YARN = yarn
 
-NEXTAPI = 0
-
 # Macros for the build-release target.  If FRONTEND_PREBUILT is 0, the
 # default, the macro $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT)) expands
 # into BUILD_RELEASE_DEPS_0, and so both frontend and backend
@@ -66,7 +64,6 @@ ENV = env\
 	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
 	RACE='$(RACE)'\
 	SIGN='$(SIGN)'\
-	NEXTAPI='$(NEXTAPI)'\
 	VERBOSE="$(VERBOSE.MACRO)"\
 	VERSION='$(VERSION)'\
 

README.md

@@ -466,10 +466,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/bamboo.yaml

@@ -1,8 +1,5 @@
----
-!include release.yaml
-
----
-!include snapcraft.yaml
-
 ---
 !include test.yaml
+
+---
+!include release.yaml

bamboo-specs/release.yaml

@@ -1,290 +1,349 @@
 ---
 'version': 2
 'plan':
-    'project-key': 'AGH'
-    'key': 'AGHBSNAPSPECS'
-    'name': 'AdGuard Home - Build and publish release'
+  'project-key': 'AGH'
+  'key': 'AGHBSNAPSPECS'
+  'name': 'AdGuard Home - Build and publish release'
 # Make sure to sync any changes with the branch overrides below.
 'variables':
-    'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:6.7'
+  'channel': 'edge'
+  'dockerGo': 'adguard/golang-ubuntu:6.3'
 
 'stages':
-  - 'Build frontend':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Build frontend'
+- 'Build frontend':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Build frontend'
 
-  - 'Make release':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Make release'
+- 'Make release':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Make release'
 
-  - 'Make and publish docker':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Make and publish docker'
+- 'Make and publish docker':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Make and publish docker'
 
-  - 'Publish to static storage':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Publish to static storage'
+- 'Publish to static storage':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Publish to static storage'
 
-  - 'Publish to GitHub Releases':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Publish to GitHub Releases'
+- 'Publish to Snapstore':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Publish to Snapstore'
+
+- 'Publish to GitHub Releases':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Publish to GitHub Releases'
 
 'Build frontend':
-    'docker':
-        'image': '${bamboo.dockerGo}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-    'key': 'BF'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'docker':
+    'image': '${bamboo.dockerGo}'
+    'volumes':
+      '${system.YARN_DIR}': '${bamboo.cacheYarn}'
+  'key': 'BF'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                # Explicitly checkout the revision that we need.
-                git checkout "${bamboo.repository.revision.number}"
+        # Explicitly checkout the revision that we need.
+        git checkout "${bamboo.repository.revision.number}"
 
-                make js-deps js-build
-    'artifacts':
-      - 'name': 'AdGuardHome frontend'
-        'pattern': 'build/**'
-        'shared': true
-        'required': true
-    'requirements':
-      - 'adg-docker': 'true'
+        make js-deps js-build
+  'artifacts':
+  - 'name': 'AdGuardHome frontend'
+    'pattern': 'build*/**'
+    'shared': true
+    'required': true
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Make release':
-    'docker':
-        'image': '${bamboo.dockerGo}'
-        'volumes':
-            '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
-            '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
-    'key': 'MR'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'docker':
+    'image': '${bamboo.dockerGo}'
+    'volumes':
+      '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+      '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+  'key': 'MR'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                # Explicitly checkout the revision that we need.
-                git checkout "${bamboo.repository.revision.number}"
+        # Explicitly checkout the revision that we need.
+        git checkout "${bamboo.repository.revision.number}"
 
-                # Run the build with the specified channel.
-                echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
-                        | awk '{ gsub(/\\n/, "\n"); print; }'\
-                        | gpg --import --batch --yes
+        # Run the build with the specified channel.
+        echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
+                | awk '{ gsub(/\\n/, "\n"); print; }'\
+                | gpg --import --batch --yes
 
-                make\
-                        CHANNEL=${bamboo.channel}\
-                        GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
-                        FRONTEND_PREBUILT=1\
-                        PARALLELISM=1\
-                        VERBOSE=2\
-                        build-release
-    # TODO(a.garipov): Use more fine-grained artifact rules.
-    'artifacts':
-      - 'name': 'AdGuardHome dists'
-        'pattern': 'dist/**'
-        'shared': true
-        'required': true
-    'requirements':
-      - 'adg-docker': 'true'
+        make\
+                CHANNEL=${bamboo.channel}\
+                GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
+                FRONTEND_PREBUILT=1\
+                PARALLELISM=1\
+                VERBOSE=2\
+                build-release
+  # TODO(a.garipov): Use more fine-grained artifact rules.
+  'artifacts':
+  - 'name': 'AdGuardHome dists'
+    'pattern': 'dist/**'
+    'shared': true
+    'required': true
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Make and publish docker':
-    'key': 'MPD'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'key': 'MPD'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                COMMIT="${bamboo.repository.revision.number}"
-                export COMMIT
-                readonly COMMIT
+        COMMIT="${bamboo.repository.revision.number}"
+        export COMMIT
+        readonly COMMIT
 
-                # Explicitly checkout the revision that we need.
-                git checkout "$COMMIT"
+        # Explicitly checkout the revision that we need.
+        git checkout "$COMMIT"
 
-                # Install Qemu, create builder.
-                docker version -f '{{ .Server.Experimental }}'
-                docker buildx rm buildx-builder || :
-                docker buildx create --name buildx-builder --driver docker-container\
-                                --use
-                docker buildx inspect --bootstrap
+        # Install Qemu, create builder.
+        docker version -f '{{ .Server.Experimental }}'
+        docker buildx rm buildx-builder || :
+        docker buildx create --name buildx-builder --driver docker-container\
+                --use
+        docker buildx inspect --bootstrap
 
-                # Login to DockerHub.
-                docker login -u="${bamboo.dockerHubUsername}"\
-                        -p="${bamboo.dockerHubPassword}"
+        # Login to DockerHub.
+        docker login -u="${bamboo.dockerHubUsername}"\
+                -p="${bamboo.dockerHubPassword}"
 
-                # Boot the builder.
-                docker buildx inspect --bootstrap
+        # Boot the builder.
+        docker buildx inspect --bootstrap
 
-                # Print Docker info.
-                docker info
+        # Print Docker info.
+        docker info
 
-                # Prepare and push the build.
-                env\
-                        CHANNEL="${bamboo.channel}"\
-                        DIST_DIR='dist'\
-                        DOCKER_IMAGE_NAME='adguard/adguardhome'\
-                        DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
-                        VERBOSE='1'\
-                        sh ./scripts/make/build-docker.sh
-            'environment':
-                DOCKER_CLI_EXPERIMENTAL=enabled
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        # Prepare and push the build.
+        env\
+                CHANNEL="${bamboo.channel}"\
+                DIST_DIR='dist'\
+                DOCKER_IMAGE_NAME='adguard/adguardhome'\
+                DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
+                VERBOSE='1'\
+                sh ./scripts/make/build-docker.sh
+      'environment':
+        DOCKER_CLI_EXPERIMENTAL=enabled
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Publish to static storage':
-    'key': 'PUB'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'clean'
-      - 'checkout':
-            'repository': 'bamboo-deploy-publisher'
-            'path': 'bamboo-deploy-publisher'
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'key': 'PUB'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'clean'
+  - 'checkout':
+      'repository': 'bamboo-deploy-publisher'
+      'path': 'bamboo-deploy-publisher'
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                cd ./dist/
+        cd ./dist/
 
-                CHANNEL="${bamboo.channel}"
-                export CHANNEL
+        CHANNEL="${bamboo.channel}"
+        export CHANNEL
 
-                ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
+
+'Publish to Snapstore':
+  'docker':
+    'image': '${bamboo.dockerGo}'
+  'key': 'PTS'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'clean'
+  - 'checkout':
+      'repository': 'bamboo-deploy-publisher'
+      'path': 'bamboo-deploy-publisher'
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
+
+        set -e -f -u -x
+
+        cd ./dist/
+
+        channel="${bamboo.channel}"
+        readonly channel
+
+        case "$channel"
+        in
+        ('release')
+              snapchannel='candidate'
+              ;;
+        ('beta')
+              snapchannel='beta'
+              ;;
+        ('edge')
+              snapchannel='edge'
+              ;;
+        (*)
+              echo "invalid channel '$channel'"
+              exit 1
+              ;;
+        esac
+
+        env\
+                SNAPCRAFT_CHANNEL="$snapchannel"\
+                SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
+                SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
+                SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\
+                ../bamboo-deploy-publisher/deploy.sh adguard-home-snap
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Publish to GitHub Releases':
-    'key': 'PTGR'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'clean'
-      - 'checkout':
-            'repository': 'bamboo-deploy-publisher'
-            'path': 'bamboo-deploy-publisher'
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'key': 'PTGR'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'clean'
+  - 'checkout':
+      'repository': 'bamboo-deploy-publisher'
+      'path': 'bamboo-deploy-publisher'
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                channel="${bamboo.channel}"
-                readonly channel
+        channel="${bamboo.channel}"
+        readonly channel
 
-                if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
-                then
-                        echo "don't publish to GitHub Releases for this channel"
+        if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
+        then
+              echo "don't publish to GitHub Releases for this channel"
 
-                        exit 0
-                fi
+              exit 0
+        fi
 
-                cd ./dist/
+        cd ./dist/
 
-                env\
-                        GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
-                        ../bamboo-deploy-publisher/deploy.sh adguard-home-github
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        env\
+                GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
+                ../bamboo-deploy-publisher/deploy.sh adguard-home-github
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'triggers':
-    # Don't use minute values that end with a zero or a five as these are often
-    # used in CI and so resources during these minutes can be quite busy.
-  - 'cron': '0 42 13 ? * MON-FRI *'
+# Don't use minute values that end with a zero or a five as these are often used
+# in CI and so resources during these minutes can be quite busy.
+- 'cron': '0 42 13 ? * MON-FRI *'
 'branches':
-    'create': 'manually'
-    'delete':
-        'after-deleted-days': 1
-        'after-inactive-days': 30
-    'integration':
-        'push-on-success': false
-        'merge-from': 'AdGuard Home   - Build and publish release'
-    'link-to-jira': true
+  'create': 'manually'
+  'delete':
+    'after-deleted-days': 1
+    'after-inactive-days': 30
+  'integration':
+    'push-on-success': false
+    'merge-from': 'AdGuard Home - Build and publish release'
+  'link-to-jira': true
 
 'notifications':
-  - 'events':
-      - 'plan-completed'
-    'recipients':
-      - 'webhook':
-            'name': 'Build webhook'
-            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
+- 'events':
+  - 'plan-completed'
+  'recipients':
+  - 'webhook':
+      'name': 'Build webhook'
+      'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
 
 'labels': []
 'other':
-    'concurrent-build-plugin': 'system-default'
+  'concurrent-build-plugin': 'system-default'
 
 'branch-overrides':
-    # beta-vX.Y branches are the branches into which the commits that are needed
-    # to release a new patch version are initially cherry-picked.
-  - '^beta-v[0-9]+\.[0-9]+':
-        # Build betas on release branches manually.
-        'triggers': []
-        # Set the default release channel on the release branch to beta, as we may
-        # need to build a few of these.
-        'variables':
-            'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:6.7'
-    # release-vX.Y.Z branches are the branches from which the actual final
-    # release is built.
-  - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
-        # Disable integration branches for release branches.
-        'branch-config':
-            'integration':
-                'push-on-success': false
-                'merge-from': 'beta-v0.107'
-        # Build final releases on release branches manually.
-        'triggers': []
-        # Set the default release channel on the final branch to release, as these
-        # are the ones that actually get released.
-        'variables':
-            'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:6.7'
+# beta-vX.Y branches are the branches into which the commits that are needed to
+# release a new patch version are initially cherry-picked.
+- '^beta-v[0-9]+\.[0-9]+':
+    # Build betas on release branches manually.
+    'triggers': []
+    # Set the default release channel on the release branch to beta, as we may
+    # need to build a few of these.
+    'variables':
+      'channel': 'beta'
+      'dockerGo': 'adguard/golang-ubuntu:6.3'
+# release-vX.Y.Z branches are the branches from which the actual final release
+# is built.
+- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
+    # Disable integration branches for release branches.
+    'branch-config':
+      'integration':
+        'push-on-success': false
+        'merge-from': 'beta-v0.107'
+    # Build final releases on release branches manually.
+    'triggers': []
+    # Set the default release channel on the final branch to release, as these
+    # are the ones that actually get released.
+    'variables':
+      'channel': 'release'
+      'dockerGo': 'adguard/golang-ubuntu:6.3'

bamboo-specs/snapcraft.yaml

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

bamboo-specs/test.yaml

@@ -1,64 +1,64 @@
 ---
 'version': 2
 'plan':
-    'project-key': 'AGH'
-    'key': 'AHBRTSPECS'
-    'name': 'AdGuard Home - Build and run tests'
+  'project-key': 'AGH'
+  'key': 'AHBRTSPECS'
+  'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerGo': 'adguard/golang-ubuntu:6.7'
+  'dockerGo': 'adguard/golang-ubuntu:6.3'
 
 'stages':
-  - 'Tests':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Test'
+- 'Tests':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Test'
 
 'Test':
-    'docker':
-        'image': '${bamboo.dockerGo}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-            '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
-            '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
-    'key': 'TEST'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'docker':
+    'image': '${bamboo.dockerGo}'
+    'volumes':
+      '${system.YARN_DIR}': '${bamboo.cacheYarn}'
+      '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+      '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+  'key': 'TEST'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                make VERBOSE=1 ci go-tools lint
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        make VERBOSE=1 ci go-tools lint
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'branches':
-    'create': 'for-pull-request'
-    'delete':
-        'after-deleted-days': 1
-        'after-inactive-days': 5
-    'integration':
-        'push-on-success': false
-        'merge-from': 'AdGuard Home - Build and run tests'
-    'link-to-jira': true
+  'create': 'for-pull-request'
+  'delete':
+    'after-deleted-days': 1
+    'after-inactive-days': 5
+  'integration':
+    'push-on-success': false
+    'merge-from': 'AdGuard Home - Build and run tests'
+  'link-to-jira': true
 
 'notifications':
-  - 'events':
-      - 'plan-status-changed'
-    'recipients':
-      - 'webhook':
-            'name': 'Build webhook'
-            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
+- 'events':
+  - 'plan-status-changed'
+  'recipients':
+  - 'webhook':
+      'name': 'Build webhook'
+      'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
 
 'labels': []
 'other':
-    'concurrent-build-plugin': 'system-default'
+  'concurrent-build-plugin': 'system-default'

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

@@ -635,6 +635,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

@@ -150,7 +150,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 +247,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}}",
@@ -568,7 +568,7 @@
     "check_desc": "Праверыць фільтрацыю імя хаста",
     "check": "Праверыць",
     "form_enter_host": "Увядзіце імя хаста",
-    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстальніцкіх правіл фільтрацыі",
+    "filtered_custom_rules": "Адфільтраваны з дапамогай карыстацкіх правілаў фільтрацыі",
     "choose_from_list": "Абраць са спіса",
     "add_custom_list": "Дадаць свой спіс",
     "host_whitelisted": "Хост занесены ў белы спіс",
@@ -642,6 +642,5 @@
     "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
     "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
     "cache_cleared": "Кэш DNS паспяхова ачышчаны",
-    "clear_cache": "Ачысціць кэш",
-    "protection_section_label": "Ахова"
+    "clear_cache": "Ачысціць кэш"
 }

client/src/__locales/cs.json

@@ -167,7 +167,6 @@
     "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",
     "enabled_table_header": "Zapnuto",
     "name_table_header": "Název",
     "list_url_table_header": "Seznam URL",
@@ -257,12 +256,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 +290,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",
@@ -526,10 +523,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ů",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Vymazat mezipaměť"
 }

client/src/__locales/da.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Ryd cache"
 }

client/src/__locales/de.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Cache leeren"
 }

client/src/__locales/en.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Clear cache"
 }

client/src/__locales/es.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Borrar caché"
 }

client/src/__locales/fa.json

@@ -268,8 +268,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": "منبع",
@@ -569,6 +567,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",
@@ -75,7 +75,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 +86,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 +146,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 +167,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 +253,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",
@@ -291,8 +290,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",
@@ -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",
@@ -526,10 +523,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",
@@ -627,7 +620,7 @@
     "cache_optimistic": "Optimistinen välimuisti",
     "cache_optimistic_desc": "Pakota AdGuard Home vastaamaan välimuistista vaikka tiedot olisivat vanhentuneet. Pyri samalla myös päivittämään tiedot.",
     "filter_category_general": "Yleiset",
-    "filter_category_security": "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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Tyhjennä välimuisti"
 }

client/src/__locales/fr.json

@@ -167,7 +167,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",
@@ -257,12 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Vider le cache"
 }

client/src/__locales/hr.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Očisti predmemoriju"
 }

client/src/__locales/hu.json

@@ -642,6 +642,5 @@
     "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"
+    "clear_cache": "Gyorsítótár törlése"
 }

client/src/__locales/id.json

@@ -641,6 +641,5 @@
     "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"
+    "clear_cache": "Hapus cache"
 }

client/src/__locales/it.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Cancella cache"
 }

client/src/__locales/ja.json

@@ -167,7 +167,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 +256,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 +290,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アドレス",
@@ -526,10 +523,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": "フィルタ設定",
@@ -649,30 +642,5 @@
     "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": "統計でこのクライアントを無視する"
+    "clear_cache": "キャッシュをクリアする"
 }

client/src/__locales/ko.json

@@ -167,7 +167,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 +256,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 +290,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 주소",
@@ -526,10 +523,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": "필터 구성",
@@ -649,30 +642,5 @@
     "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": "통계에서 이 클라이언트 무시"
+    "clear_cache": "캐시 지우기"
 }

client/src/__locales/nl.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Cache wissen"
 }

client/src/__locales/no.json

@@ -282,8 +282,6 @@
     "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",
@@ -616,6 +614,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

@@ -167,7 +167,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 +221,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 +256,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 +290,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",
@@ -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",
@@ -526,10 +523,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 +535,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Wyczyść pamięć podręczną"
 }

client/src/__locales/pt-br.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Limpar cache"
 }

client/src/__locales/pt-pt.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Limpar cache"
 }

client/src/__locales/ro.json

@@ -642,6 +642,5 @@
     "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"
+    "clear_cache": "Goliți memoria cache"
 }

client/src/__locales/ru.json

@@ -167,7 +167,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 +256,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 +290,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-запроса",
@@ -526,10 +523,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": "Настройка фильтров",
@@ -649,30 +642,5 @@
     "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": "Игнорировать этого клиента в статистике"
+    "clear_cache": "Очистить кеш"
 }

client/src/__locales/sk.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Vymazať vyrovnávaciu pamäť"
 }

client/src/__locales/sl.json

@@ -167,7 +167,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 +256,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 +290,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",
@@ -526,10 +523,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",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Počisti predpomnilnik"
 }

client/src/__locales/sr-cs.json

@@ -642,6 +642,5 @@
     "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"
+    "clear_cache": "Obriši keš memoriju"
 }

client/src/__locales/sv.json

@@ -523,7 +523,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",
@@ -643,14 +642,5 @@
     "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"
+    "clear_cache": "Rensa cache"
 }

client/src/__locales/tr.json

@@ -167,7 +167,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",
@@ -257,12 +256,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 +290,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",
@@ -526,10 +523,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ı",
@@ -649,30 +642,5 @@
     "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"
+    "clear_cache": "Önbelleği temizle"
 }

client/src/__locales/uk.json

@@ -167,7 +167,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 +290,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-адреса, яку потрібно видати для заблокованого АААА запиту",
@@ -526,10 +523,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": "Конфігурація фільтрів",
@@ -649,30 +642,5 @@
     "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": "Ігноруйте цей клієнт в статистиці"
+    "clear_cache": "Очистити кеш"
 }

client/src/__locales/vi.json

@@ -642,6 +642,5 @@
     "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ệ"
+    "clear_cache": "Xóa bộ nhớ cache"
 }

client/src/__locales/zh-cn.json

@@ -167,7 +167,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 +256,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 +290,6 @@
     "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 地址",
@@ -526,10 +523,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": "过滤器配置",
@@ -649,30 +642,5 @@
     "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": "在统计数据中忽略此客户端"
+    "clear_cache": "清除缓存"
 }

client/src/__locales/zh-tw.json

@@ -167,7 +167,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 +256,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 +290,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 位址",
@@ -526,10 +523,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": "過濾器配置",
@@ -649,30 +642,5 @@
     "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": "在統計資料中忽略此用戶端"
+    "clear_cache": "清除快取"
 }

client/src/actions/encryption.js

@@ -49,9 +49,6 @@ export const setTlsConfig = (config) => async (dispatch, getState) => {
 
         const dnsStatus = await apiClient.getGlobalStatus();
         if (dnsStatus) {
-            if (dnsStatus.protection_disabled_duration === 0) {
-                dnsStatus.protection_disabled_duration = null;
-            }
             dispatch(dnsStatusSuccess(dnsStatus));
         }
 

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');
@@ -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) {

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

@@ -208,40 +208,24 @@ 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
 
@@ -479,12 +463,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 +497,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 +508,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 +529,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 +543,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,
         };
@@ -620,15 +611,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' };
 

client/src/components/App/index.js

@@ -43,7 +43,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 = [
     {
@@ -165,7 +164,8 @@ const App = () => {
         }
 
         const colorSchemeMedia = window.matchMedia('(prefers-color-scheme: dark)');
-        setUITheme(theme);
+        const prefersDark = colorSchemeMedia.matches;
+        setUITheme(prefersDark ? THEMES.dark : THEMES.light);
 
         if (colorSchemeMedia.addEventListener !== undefined) {
             colorSchemeMedia.addEventListener('change', (e) => {
@@ -191,7 +191,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/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,11 +34,20 @@
     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 {

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,
     });
@@ -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}

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/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 || {}) },
         };
     };
 

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

@@ -11,7 +11,7 @@ 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, trimLinesAndRemoveEmpty } from '../../../helpers/helpers';
 import {
     renderInputField,
     renderGroupField,
@@ -40,16 +40,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 +139,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 +148,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 +163,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: {
@@ -407,7 +358,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/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 (
@@ -65,11 +39,8 @@ class Leases extends Component {
                     }, {
                         Header: <Trans>dhcp_table_expires</Trans>,
                         accessor: 'expires',
-                        minWidth: 220,
+                        minWidth: 130,
                         Cell: this.cellWrap,
-                    }, {
-                        Header: <Trans>actions_table_header</Trans>,
-                        Cell: this.makeStatic,
                     },
                 ]}
                 pageSize={LEASES_TABLE_DEFAULT_PAGE_SIZE}
@@ -86,8 +57,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/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/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;
@@ -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.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,7 +1,3 @@
-.dropdown-item {
-    cursor: pointer;
-}
-
 .dropdown-item.active,
 .dropdown-item:active {
     background-color: var(--btn-success-bgcolor);
@@ -10,55 +6,3 @@
 .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

@@ -71,38 +71,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,7 +1,7 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } 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 { LANGUAGES } from '../../helpers/twosky';
@@ -33,14 +33,16 @@ 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 currentTheme = useSelector((state) => (state.dashboard ? state.dashboard.theme : 'auto'));
+    const profileName = useSelector((state) => (state.dashboard ? state.dashboard.name : ''));
     const isLoggedIn = profileName !== '';
-    const [currentThemeLocal, setCurrentThemeLocal] = useState(THEMES.auto);
+    const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
+
+    useEffect(() => {
+        if (!isLoggedIn) {
+            setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
+        }
+    }, []);
 
     const getYear = () => {
         const today = new Date();
@@ -53,13 +55,15 @@ const Footer = () => {
         setHtmlLangAttr(value);
     };
 
-    const onThemeChange = (value) => {
-        if (isLoggedIn) {
-            dispatch(changeTheme(value));
-        } else {
-            setUITheme(value);
-            setCurrentThemeLocal(value);
-        }
+    const onThemeChanged = (event) => {
+        const { value } = event.target;
+        dispatch(changeTheme(value));
+    };
+
+    const onThemeChangedLocal = (event) => {
+        const { value } = event.target;
+        setUITheme(value);
+        setCurrentThemeLocal(value);
     };
 
     const renderCopyright = () => <div className="footer__column">
@@ -72,53 +76,41 @@ 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 themeSelectOptions = () => (
+        Object.values(THEMES)
+            .map((theme) => (
+                <option key={theme} value={theme}>
+                    {t(`theme_${theme}`)}
+                </option>
+            ))
+    );
 
-        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',
-            },
-        };
+    const renderThemeSelect = () => (
+        <select
+            className="form-control select select--theme"
+            value={currentTheme}
+            onChange={onThemeChanged}
+        >
+            {themeSelectOptions()}
+        </select>
+    );
 
-        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>
-                ))
-        );
-    };
+    const renderThemeSelectLocal = () => (
+        <select
+            className="form-control select select--theme"
+            value={currentThemeLocal}
+            onChange={onThemeChangedLocal}
+        >
+            {themeSelectOptions()}
+        </select>
+    );
 
     return (
         <>
@@ -129,11 +121,7 @@ const Footer = () => {
                             {renderLinks(linksData)}
                         </div>
                         <div className="footer__column footer__column--theme">
-                            <div className="footer__themes">
-                                <div className="btn-group">
-                                    {renderThemeButtons()}
-                                </div>
-                            </div>
+                            {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()}
                         </div>
                         <div className="footer__column footer__column--language">
                             <select

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

@@ -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">
             <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.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

client/src/components/ui/Overlay.css

@@ -13,7 +13,7 @@
     font-size: 28px;
     font-weight: 600;
     text-align: center;
-    background-color: var(--rt-nodata-bgcolor);
+    background-color: rgba(255, 255, 255, 0.8);
 }
 
 .overlay--visible {

client/src/components/ui/Tabler.css

@@ -10216,18 +10216,6 @@ body.fixed-header .page {
     line-height: 2.5rem;
 }
 
-.page-title__protection {
-    display: flex;
-    align-items: stretch;
-    margin: 0 0.5rem;
-}
-
-@media (max-width: 767.98px) {
-    .page-title__protection {
-        margin: 0.5rem 0;
-    }
-}
-
 .page-title-icon {
     color: #9aa0ac;
     font-size: 1.25rem;

client/src/helpers/constants.js

@@ -211,20 +211,9 @@ export const FILTERED = 'Filtered';
 export const NOT_FILTERED = 'NotFiltered';
 
 export const DISABLED_STATS_INTERVAL = 0;
+export const STATS_INTERVALS_DAYS = [1, 7, 30, 90];
 
-export const HOUR = 60 * 60 * 1000;
-
-export const DAY = HOUR * 24;
-
-export const STATS_INTERVALS_DAYS = [DAY, DAY * 7, DAY * 30, DAY * 90];
-
-export const QUERY_LOG_INTERVALS_DAYS = [HOUR * 6, DAY, DAY * 7, DAY * 30, DAY * 90];
-
-export const RETENTION_CUSTOM = 1;
-
-export const RETENTION_CUSTOM_INPUT = 'custom_retention_input';
-
-export const CUSTOM_INTERVAL = 'customInterval';
+export const QUERY_LOG_INTERVALS_DAYS = [0.25, 1, 7, 30, 90];
 
 export const FILTERS_INTERVALS_HOURS = [0, 1, 12, 24, 72, 168];
 
@@ -468,11 +457,6 @@ export const UINT32_RANGE = {
     MAX: 4294967295,
 };
 
-export const RETENTION_RANGE = {
-    MIN: 1,
-    MAX: 365 * 24,
-};
-
 export const DHCP_VALUES_PLACEHOLDERS = {
     ipv4: {
         subnet_mask: '255.255.255.0',
@@ -509,8 +493,6 @@ export const TOAST_TYPES = {
 };
 
 export const SUCCESS_TOAST_TIMEOUT = 5000;
-
-export const ONE_SECOND_IN_MS = 1000;
 export const FAILURE_TOAST_TIMEOUT = 30000;
 
 export const TOAST_TIMEOUTS = {
@@ -539,14 +521,3 @@ export const MOBILE_CONFIG_LINKS = {
     DOT: 'apple/dot.mobileconfig',
     DOH: 'apple/doh.mobileconfig',
 };
-
-// Timings for disable protection in milliseconds
-export const DISABLE_PROTECTION_TIMINGS = {
-    HALF_MINUTE: 30 * 1000,
-    MINUTE: 60 * 1000,
-    TEN_MINUTES: 10 * 60 * 1000,
-    HOUR: 60 * 60 * 1000,
-    TOMORROW: 24 * 60 * 60 * 1000,
-};
-
-export const LOCAL_STORAGE_THEME_KEY = 'account_theme';

client/src/helpers/filters/filters.js

@@ -100,12 +100,6 @@ export default {
             "homepage": "https://github.com/DandelionSprout/adfilt",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt"
         },
-        "POL_cert_polska_list_of_malicious_domains": {
-            "name": "POL: CERT Polska List of malicious domains",
-            "categoryId": "regional",
-            "homepage": "https://cert.pl/posts/2020/03/ostrzezenia_phishing/",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_41.txt"
-        },
         "POL_polish_filters_for_pi_hole": {
             "name": "POL: Polish filters for Pi-hole",
             "categoryId": "regional",
@@ -124,12 +118,6 @@ export default {
             "homepage": "https://github.com/bkrucarci/turk-adlist",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_26.txt"
         },
-        "TUR_turkish_ad_hosts": {
-            "name": "TUR: Turkish Ad Hosts",
-            "categoryId": "regional",
-            "homepage": "https://github.com/symbuzzer/Turkish-Ad-Hosts",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_40.txt"
-        },
         "VNM_abpvn": {
             "name": "VNM: ABPVN List",
             "categoryId": "regional",
@@ -197,13 +185,13 @@ export default {
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_32.txt"
         },
         "oisd_basic": {
-            "name": "OISD Blocklist Small",
+            "name": "OISD Blocklist Basic",
             "categoryId": "general",
             "homepage": "https://oisd.nl/",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_5.txt"
         },
         "oisd_full": {
-            "name": "OISD Blocklist Big",
+            "name": "OISD Blocklist Full",
             "categoryId": "general",
             "homepage": "https://oisd.nl/",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_27.txt"
@@ -226,12 +214,6 @@ export default {
             "homepage": "https://github.com/durablenapkin/scamblocklist",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_10.txt"
         },
-        "shadowwhisperers_malware_list": {
-            "name": "ShadowWhisperer's Malware List",
-            "categoryId": "security",
-            "homepage": "https://github.com/ShadowWhisperer/BlockLists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_42.txt"
-        },
         "staklerware_indicators_list": {
             "name": "Stalkerware Indicators List",
             "categoryId": "security",

client/src/helpers/helpers.js

@@ -25,8 +25,6 @@ import {
     STANDARD_HTTPS_PORT,
     STANDARD_WEB_PORT,
     SPECIAL_FILTER_ID,
-    THEMES,
-    LOCAL_STORAGE_THEME_KEY,
 } from './constants';
 
 /**
@@ -390,12 +388,6 @@ export const toggleAllServices = (services, change, isSelected) => {
     services.forEach((service) => change(`blocked_services.${service.id}`, isSelected));
 };
 
-export const msToSeconds = (milliseconds) => Math.floor(milliseconds / 1000);
-
-export const msToMinutes = (milliseconds) => Math.floor(milliseconds / 1000 / 60);
-
-export const msToHours = (milliseconds) => Math.floor(milliseconds / 1000 / 60 / 60);
-
 export const secondsToMilliseconds = (seconds) => {
     if (seconds) {
         return seconds * 1000;
@@ -404,8 +396,6 @@ export const secondsToMilliseconds = (seconds) => {
     return seconds;
 };
 
-export const msToDays = (milliseconds) => Math.floor(milliseconds / 1000 / 60 / 60 / 24);
-
 export const normalizeRulesTextarea = (text) => text?.replace(/^\n/g, '')
     .replace(/\n\s*\n/g, '\n');
 
@@ -680,61 +670,13 @@ export const setHtmlLangAttr = (language) => {
     window.document.documentElement.lang = language;
 };
 
-/**
- * Set local storage field
- *
- * @param {string} key
- * @param {string} value
- */
-
-export const setStorageItem = (key, value) => {
-    if (window.localStorage) {
-        window.localStorage.setItem(key, value);
-    }
-};
-
-/**
- * Get local storage field
- *
- * @param {string} key
- */
-
-export const getStorageItem = (key) => (window.localStorage
-    ? window.localStorage.getItem(key)
-    : null);
-
-/**
- * Set local storage theme field
- *
- * @param {string} theme
- */
-
-export const setTheme = (theme) => {
-    setStorageItem(LOCAL_STORAGE_THEME_KEY, theme);
-};
-
-/**
- * Get local storage theme field
- *
- * @returns {string}
- */
-
-export const getTheme = () => getStorageItem(LOCAL_STORAGE_THEME_KEY) || THEMES.light;
-
 /**
  * Sets UI theme.
  *
  * @param theme
  */
 export const setUITheme = (theme) => {
-    let currentTheme = theme || getTheme();
-
-    if (currentTheme === THEMES.auto) {
-        const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
-        currentTheme = prefersDark ? THEMES.dark : THEMES.light;
-    }
-    setTheme(currentTheme);
-    document.body.dataset.theme = currentTheme;
+    document.body.dataset.theme = theme;
 };
 
 /**

client/src/helpers/trackers/trackers.json

@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-06-01T00:12:12.660Z",
+    "timeUpdated": "2023-03-08T00:09:48.692Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -19225,13 +19225,6 @@
             "url": "http://www.zypmedia.com/",
             "companyId": "zypmedia"
         },
-        "abc": {
-            "name": "Australian Broadcasting Corporation",
-            "categoryId": 8,
-            "url": "https://www.abc.net.au/",
-            "companyId": "abc",
-            "source": "AdGuard"
-        },
         "adguard_dns": {
             "name": "AdGuard DNS",
             "categoryId": 8,
@@ -19323,13 +19316,6 @@
             "companyId": null,
             "source": "AdGuard"
         },
-        "domainglass": {
-            "name": "Domain Glass",
-            "categoryId": 8,
-            "url": "https://domain.glass/",
-            "companyId": "domainglass",
-            "source": "AdGuard"
-        },
         "edgio": {
             "name": "Edgio",
             "categoryId": 9,
@@ -19358,13 +19344,6 @@
             "companyId": "google",
             "source": "AdGuard"
         },
-        "freeview": {
-            "name": "Freeview",
-            "categoryId": 0,
-            "url": "https://freeview.com.au/",
-            "companyId": "freeview",
-            "source": "AdGuard"
-        },
         "gmail": {
             "name": "Gmail",
             "categoryId": 13,
@@ -19379,13 +19358,6 @@
             "companyId": "google",
             "source": "AdGuard"
         },
-        "iqiyi": {
-            "name": "iQiyi",
-            "categoryId": 0,
-            "url": "https://www.iqiyi.com/",
-            "companyId": "iqiyi",
-            "source": "AdGuard"
-        },
         "hockeyapp": {
             "name": "HockeyApp",
             "categoryId": 101,
@@ -19393,13 +19365,6 @@
             "companyId": null,
             "source": "AdGuard"
         },
-        "karambasecurity": {
-            "name": "Karamba Security",
-            "categoryId": 8,
-            "url": "https://karambasecurity.com/",
-            "companyId": "karambasecurity",
-            "source": "AdGuard"
-        },
         "kik": {
             "name": "Kik",
             "categoryId": 7,
@@ -19414,13 +19379,6 @@
             "companyId": "lets_encrypt",
             "source": "AdGuard"
         },
-        "lgads": {
-            "name": "LG Ad Solutions",
-            "categoryId": 4,
-            "url": "https://lgads.tv/",
-            "companyId": "lgcorp",
-            "source": "AdGuard"
-        },
         "lgtv": {
             "name": "LG TV",
             "categoryId": 8,
@@ -19470,13 +19428,6 @@
             "companyId": "nab",
             "source": "AdGuard"
         },
-        "netify": {
-            "name": "Netify",
-            "categoryId": 8,
-            "url": "https://www.netify.ai/",
-            "companyId": "netify",
-            "source": "AdGuard"
-        },
         "notion": {
             "name": "Notion",
             "categoryId": 8,
@@ -19526,13 +19477,6 @@
             "companyId": "qualcomm",
             "source": "AdGuard"
         },
-        "qualcomm_location_service": {
-            "name": "Qualcomm Location Service",
-            "categoryId": 15,
-            "url": "https://www.qualcomm.com/site/privacy/services",
-            "companyId": "qualcomm",
-            "source": "AdGuard"
-        },
         "recaptcha": {
             "name": "reCAPTCHA",
             "categoryId": 8,
@@ -19540,55 +19484,6 @@
             "companyId": "google",
             "source": "AdGuard"
         },
-        "samsung": {
-            "name": "Samsung",
-            "categoryId": 8,
-            "url": "https://www.samsung.com/",
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
-        "samsungads": {
-            "name": "Samsung Ads",
-            "categoryId": 4,
-            "url": "https://www.samsung.com/business/samsungads/",
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
-        "samsungapps": {
-            "name": "Samsung Apps",
-            "categoryId": 101,
-            "url": "https://www.samsung.com/au/apps/",
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
-        "samsungmobile": {
-            "name": "Samsung Mobile",
-            "categoryId": 101,
-            "url": "https://www.samsung.com/mobile/",
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
-        "samsungpush": {
-            "name": "Samsung Push",
-            "categoryId": 8,
-            "url": null,
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
-        "samsungsds": {
-            "name": "Samsung SDS",
-            "categoryId": 10,
-            "url": "https://www.samsungsds.com/",
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
-        "samsungtv": {
-            "name": "Samsung TV",
-            "categoryId": 15,
-            "url": "https://www.samsung.com/au/tvs/",
-            "companyId": "samsung",
-            "source": "AdGuard"
-        },
         "sectigo": {
             "name": "Sectigo Limited",
             "categoryId": 5,
@@ -19624,20 +19519,6 @@
             "companyId": "solaredge",
             "source": "AdGuard"
         },
-        "sonos": {
-            "name": "Sonos",
-            "categoryId": 8,
-            "url": "https://www.sonos.com/",
-            "companyId": "sonos",
-            "source": "AdGuard"
-        },
-        "switchtv": {
-            "name": "Switch Media",
-            "categoryId": 8,
-            "url": "https://www.switch.tv/",
-            "companyId": "switchtv",
-            "source": "AdGuard"
-        },
         "telstra": {
             "name": "Telstra",
             "categoryId": 8,
@@ -19645,13 +19526,6 @@
             "companyId": "telstra",
             "source": "AdGuard"
         },
-        "ubuntu": {
-            "name": "Ubuntu",
-            "categoryId": 8,
-            "url": "https://ubuntu.com/",
-            "companyId": "ubuntu",
-            "source": "AdGuard"
-        },
         "unity_ads": {
             "name": "Unity Ads",
             "categoryId": 4,
@@ -19707,20 +19581,6 @@
             "url": "https://appmetrica.yandex.com/",
             "companyId": "yandex",
             "source": "AdGuard"
-        },
-        "3gpp": {
-            "name": "3GPP Network",
-            "categoryId": 5,
-            "url": "https://www.3gpp.org/",
-            "companyId": "3gpp",
-            "source": "AdGuard"
-        },
-        "7plus": {
-            "name": "7plus",
-            "categoryId": 0,
-            "url": "https://7plus.com.au/",
-            "companyId": "7plus",
-            "source": "AdGuard"
         }
     },
     "trackerDomains": {
@@ -19913,8 +19773,8 @@
         "adfreestyle.pl": "adfreestyle",
         "adfront.org": "adfront",
         "adfrontiers.com": "adfrontiers",
-        "adgear.com": "samsungads",
-        "adgrx.com": "samsungads",
+        "adgear.com": "adgear",
+        "adgrx.com": "adgear",
         "adgebra.co.in": "adgebra",
         "adgenie.co.uk": "adgenie",
         "ad.adgile.com": "adgile",
@@ -24051,16 +23911,6 @@
         "zwaar.net": "zwaar",
         "zwaar.org": "zwaar",
         "extend.tv": "zypmedia",
-        "abc.net.au": "abc",
-        "ab.co": "abc",
-        "abc-cdn.net.au": "abc",
-        "abc-host.net": "abc",
-        "abc-host.net.au": "abc",
-        "abc-prod.net.au": "abc",
-        "abc-stage.net.au": "abc",
-        "abc-test.net.au": "abc",
-        "abcaustralia.net.au": "abc",
-        "abcradio.net.au": "abc",
         "adtidy.org": "adguard",
         "agrd.io": "adguard",
         "adguard.app": "adguard",
@@ -24126,10 +23976,6 @@
         "safebrowsing.g.applimg.com": "apple",
         "applvn.com": "applovin",
         "applovin.com": "applovin",
-        "bitbucket.org": "atlassian.net",
-        "jira.com": "atlassian.net",
-        "ss-inf.net": "atlassian.net",
-        "stspg-customer.com": "statuspage.io",
         "blob.core.windows.net": "azure_blob_storage",
         "azure.com": "azure",
         "trafficmanager.net": "azure",
@@ -24137,24 +23983,8 @@
         "mobileapptracking.com": "branch",
         "bttn.io": "button",
         "cloudflare-dns.com": "cloudflare",
-        "cloudflare-dm-cmpimg.com": "cloudflare",
-        "cloudflare-ipfs.com": "cloudflare",
-        "cloudflare-quic.com": "cloudflare",
-        "cloudflare-terms-of-service-abuse.com": "cloudflare",
-        "cloudflare.tv": "cloudflare",
-        "cloudflareaccess.com": "cloudflare",
-        "cloudflareclient.com": "cloudflare",
-        "cloudflareinsights.com": "cloudflare",
-        "cloudflareok.com": "cloudflare",
-        "cloudflareportal.com": "cloudflare",
-        "cloudflareresolve.com": "cloudflare",
-        "cloudflaressl.com": "cloudflare",
-        "cloudflarestatus.com": "cloudflare",
-        "pacloudflare.com": "cloudflare",
-        "sn-cloudflare.com": "cloudflare",
         "crashlytics.com": "crashlytics",
         "phicdn.net": "digicert_trust_seal",
-        "domain.glass": "domainglass",
         "alphacdn.net": "edgio",
         "edg.io": "edgio",
         "edgecast.com": "edgio",
@@ -24166,9 +23996,6 @@
         "app-measurement.com": "firebase",
         "flipboard.com": "flipboard",
         "flurry.com": "flurry",
-        "freeviewaustralia.tv": "freeview",
-        "freeview.com.au": "freeview",
-        "freeview.com": "freeview",
         "ghcr.io": "github",
         "github.dev": "github",
         "gmail.com": "gmail",
@@ -24178,21 +24005,12 @@
         "gvt3.com": "google_servers",
         "pki.goog": "google_trust_services",
         "hockeyapp.net": "hockeyapp",
-        "qy.net": "iqiyi",
-        "iqiyi.com": "iqiyi",
-        "iq.com": "iqiyi",
-        "ironsrc.com": "ironsource",
-        "ironsrc.net": "ironsource",
-        "supersonicads.com": "ironsource",
-        "karambasecurity.com": "karambasecurity",
         "kik.com": "kik",
         "apikik.com": "kik",
         "kik-live.com": "kik",
         "slatic.net": "lazada",
         "lencr.org": "lets_encrypt",
         "letsencrypt.org": "lets_encrypt",
-        "alphonso.tv": "lgads",
-        "lgads.tv": "lgads",
         "lgsmartad.com": "lgtv",
         "lgtvcommon.com": "lgtv",
         "lgtvsdp.com": "lgtv",
@@ -24213,25 +24031,7 @@
         "mozilla.com": "mozilla",
         "mozilla.net": "mozilla",
         "mozilla.org": "mozilla",
-        "flxvpn.net": "netflix",
-        "netflix.ca": "netflix",
-        "netflix.com.au": "netflix",
-        "netflix.net": "netflix",
-        "netflixdnstest1.com": "netflix",
-        "netflixdnstest10.com": "netflix",
-        "netflixdnstest2.com": "netflix",
-        "netflixdnstest3.com": "netflix",
-        "netflixdnstest4.com": "netflix",
-        "netflixdnstest5.com": "netflix",
-        "netflixdnstest6.com": "netflix",
-        "netflixdnstest7.com": "netflix",
-        "netflixdnstest8.com": "netflix",
-        "netflixdnstest9.com": "netflix",
-        "netflixinvestor.com": "netflix",
-        "netflixstudios.com": "netflix",
-        "netflixtechblog.com": "netflix",
         "nflximg.com": "netflix",
-        "netify.ai": "netify",
         "nab.com": "nab",
         "nab.com.au": "nab",
         "nab.net": "nab",
@@ -24253,69 +24053,9 @@
         "oztam.com.au": "oztam",
         "plex.tv": "plex",
         "plex.direct": "plex",
+        "xtracloud.net": "qualcomm",
         "qualcomm.com": "qualcomm",
-        "gpsonextra.net": "qualcomm_location_service",
-        "izatcloud.net": "qualcomm_location_service",
-        "xtracloud.net": "qualcomm_location_service",
         "recaptcha.net": "recaptcha",
-        "samsungacr.com": "samsungads",
-        "samsungadhub.com": "samsungads",
-        "samsungads.com": "samsungads",
-        "samsungtifa.com": "samsungads",
-        "game-mode.net": "samsung",
-        "gos-gsp.io": "samsung",
-        "lldns.net": "samsung",
-        "pavv.co.kr": "samsung",
-        "remotesamsung.com": "samsung",
-        "samsung-gamelauncher.com": "samsung",
-        "samsung.co.kr": "samsung",
-        "samsung.com": "samsung",
-        "samsung.com.cn": "samsung",
-        "samsungcloud.com": "samsung",
-        "samsungcloudcdn.com": "samsung",
-        "samsungcloudprint.com": "samsung",
-        "samsungcloudsolution.com": "samsung",
-        "samsungcloudsolution.net": "samsung",
-        "samsungelectronics.com": "samsung",
-        "samsunghealth.com": "samsung",
-        "samsungiotcloud.com": "samsung",
-        "samsungknox.com": "samsung",
-        "samsungnyc.com": "samsung",
-        "samsungosp.com": "samsung",
-        "samsungotn.net": "samsung",
-        "samsungpositioning.com": "samsung",
-        "samsungqbe.com": "samsung",
-        "samsungrm.net": "samsung",
-        "samsungrs.com": "samsung",
-        "samsungsemi.com": "samsung",
-        "samsungsetup.com": "samsung",
-        "samsungusa.com": "samsung",
-        "secb2b.com": "samsung",
-        "smartthings.com": "samsung",
-        "ospserver.net": "samsungmobile",
-        "samsungdms.net": "samsungmobile",
-        "samsungmax.com": "samsungmobile",
-        "samsungmobile.com": "samsungmobile",
-        "secmobilesvc.com": "samsungmobile",
-        "internetat.tv": "samsungtv",
-        "samsungcloud.tv": "samsungtv",
-        "samsungsds.com": "samsungsds",
-        "push.samsungosp.com": "samsungpush",
-        "pushmessage.samsung.com": "samsungpush",
-        "scs.samsungqbe.com": "samsungpush",
-        "ssp.samsung.com": "samsungpush",
-        "aibixby.com": "samsungapps",
-        "findmymobile.samsung.com": "samsungapps",
-        "samsapps.cust.lldns.net": "samsungapps",
-        "samsung-omc.com": "samsungapps",
-        "samsungapps.com": "samsungapps",
-        "samsungdiroute.net": "samsungapps",
-        "samsungdive.com": "samsungapps",
-        "samsungdm.com": "samsungapps",
-        "samsungdmroute.com": "samsungapps",
-        "samsungmdec.com": "samsungapps",
-        "samsungvisioncloud.com": "samsungapps",
-        "sbixby.com": "samsungapps",
         "sectigo.com": "sectigo",
         "showrss.info": "showrss",
         "similarweb.io": "similarweb",
@@ -24334,19 +24074,10 @@
         "snap-dev.net": "snap",
         "snapads.com": "snap",
         "snapkit.com": "snap",
-        "switch.tv": "switchtv",
         "solaredge.com": "solaredge",
-        "sonos.com": "sonos",
         "telstra.com.au": "telstra",
         "telstra.com": "telstra",
         "usertrust.com": "trustlogo",
-        "canonical.com": "ubuntu",
-        "launchpad.net": "ubuntu",
-        "launchpadcontent.net": "ubuntu",
-        "snapcraft.io": "ubuntu",
-        "snapcraftcontent.com": "ubuntu",
-        "ubuntu.com": "ubuntu",
-        "ubuntucompanyservices.co.za": "ubuntu",
         "unityads.unity3d.com": "unity_ads",
         "exp-tas.com": "vscode",
         "vscode-unpkg.net": "vscode",
@@ -24364,9 +24095,6 @@
         "yandex.com.tr": "yandex",
         "yandex.fr": "yandex",
         "yandex.kz": "yandex",
-        "appmetrica.yandex.com": "yandex_appmetrica",
-        "3gppnetwork.org": "3gpp",
-        "3gpp.org": "3gpp",
-        "swm.digital": "7plus"
+        "appmetrica.yandex.com": "yandex_appmetrica"
     }
-}
+}

client/src/install/Setup/index.js

@@ -22,7 +22,6 @@ import Progress from './Progress';
 
 import Toasts from '../../components/Toasts';
 import Footer from '../../components/ui/Footer';
-import Icons from '../../components/ui/Icons';
 import logo from '../../components/ui/svg/logo.svg';
 
 import './Setup.css';
@@ -124,7 +123,6 @@ class Setup extends Component {
                         </div>
                         <Footer />
                         <Toasts />
-                        <Icons />
                     </Fragment>
                 }
             </Fragment>

client/src/login/Login/index.js

@@ -8,7 +8,6 @@ import * as actionCreators from '../../actions/login';
 import logo from '../../components/ui/svg/logo.svg';
 import Toasts from '../../components/Toasts';
 import Footer from '../../components/ui/Footer';
-import Icons from '../../components/ui/Icons';
 import Form from './Form';
 
 import './Login.css';
@@ -70,7 +69,6 @@ class Login extends Component {
                 </div>
                 <Footer />
                 <Toasts />
-                <Icons />
             </div>
         );
     }

client/src/reducers/dashboard.js

@@ -25,7 +25,6 @@ const dashboard = handleActions(
                 dns_port: dnsPort,
                 dns_addresses: dnsAddresses,
                 protection_enabled: protectionEnabled,
-                protection_disabled_duration: protectionDisabledDuration,
                 http_port: httpPort,
                 language,
             } = payload;
@@ -37,11 +36,9 @@ const dashboard = handleActions(
                 dnsPort,
                 dnsAddresses,
                 protectionEnabled,
-                protectionDisabledDuration,
                 language,
                 httpPort,
             };
-
             return newState;
         },
 
@@ -106,22 +103,15 @@ const dashboard = handleActions(
             ...state,
             processingProtection: false,
         }),
-        [actions.toggleProtectionSuccess]: (state, { payload }) => {
+        [actions.toggleProtectionSuccess]: (state) => {
             const newState = {
                 ...state,
                 protectionEnabled: !state.protectionEnabled,
                 processingProtection: false,
-                protectionDisabledDuration: payload.disabledDuration,
             };
-
             return newState;
         },
 
-        [actions.setDisableDurationTime]: (state, { payload }) => ({
-            ...state,
-            protectionDisabledDuration: payload.timeToEnableProtection,
-        }),
-
         [actions.getClientsRequest]: (state) => ({
             ...state,
             processingClients: true,
@@ -166,8 +156,6 @@ const dashboard = handleActions(
         processingUpdate: false,
         processingProfile: true,
         protectionEnabled: false,
-        protectionDisabledDuration: null,
-        protectionCountdownActive: false,
         processingProtection: false,
         httpPort: STANDARD_WEB_PORT,
         dnsPort: STANDARD_DNS_PORT,
@@ -177,7 +165,7 @@ const dashboard = handleActions(
         autoClients: [],
         supportedTags: [],
         name: '',
-        theme: undefined,
+        theme: 'auto',
         checkUpdateFlag: false,
     },
 );

client/src/reducers/dhcp.js

@@ -124,11 +124,10 @@ const dhcp = handleActions(
             staticLeases: [],
         }),
 
-        [actions.toggleLeaseModal]: (state, { payload }) => {
+        [actions.toggleLeaseModal]: (state) => {
             const newState = {
                 ...state,
                 isModalOpen: !state.isModalOpen,
-                leaseModalConfig: payload,
             };
             return newState;
         },
@@ -201,7 +200,6 @@ const dhcp = handleActions(
         leases: [],
         staticLeases: [],
         isModalOpen: false,
-        leaseModalConfig: undefined,
         dhcp_available: false,
     },
 );

client/src/reducers/queryLogs.js

@@ -1,9 +1,7 @@
 import { handleActions } from 'redux-actions';
 
 import * as actions from '../actions/queryLogs';
-import {
-    DEFAULT_LOGS_FILTER, DAY, QUERY_LOG_INTERVALS_DAYS, HOUR,
-} from '../helpers/constants';
+import { DEFAULT_LOGS_FILTER } from '../helpers/constants';
 
 const queryLogs = handleActions(
     {
@@ -61,9 +59,6 @@ const queryLogs = handleActions(
         [actions.getLogsConfigSuccess]: (state, { payload }) => ({
             ...state,
             ...payload,
-            customInterval: !QUERY_LOG_INTERVALS_DAYS.includes(payload.interval)
-                ? payload.interval / HOUR
-                : null,
             processingGetConfig: false,
         }),
 
@@ -91,7 +86,7 @@ const queryLogs = handleActions(
         processingGetConfig: false,
         processingSetConfig: false,
         processingAdditionalLogs: false,
-        interval: DAY,
+        interval: 1,
         logs: [],
         enabled: true,
         oldest: '',
@@ -100,7 +95,6 @@ const queryLogs = handleActions(
         anonymize_client_ip: false,
         isDetailed: true,
         isEntireLog: false,
-        customInterval: null,
     },
 );
 

client/src/reducers/settings.js

@@ -22,11 +22,11 @@ const settings = handleActions(
         },
         [actions.toggleSettingStatus]: (state, { payload }) => {
             const { settingsList } = state;
-            const { settingKey, value } = payload;
+            const { settingKey } = payload;
 
             const setting = settingsList[settingKey];
 
-            const newSetting = value || {
+            const newSetting = {
                 ...setting,
                 enabled: !setting.enabled,
             };

client/src/reducers/stats.js

@@ -1,6 +1,5 @@
 import { handleActions } from 'redux-actions';
 import { normalizeTopClients } from '../helpers/helpers';
-import { DAY, HOUR, STATS_INTERVALS_DAYS } from '../helpers/constants';
 
 import * as actions from '../actions/stats';
 
@@ -26,10 +25,7 @@ const stats = handleActions(
         [actions.getStatsConfigFailure]: (state) => ({ ...state, processingGetConfig: false }),
         [actions.getStatsConfigSuccess]: (state, { payload }) => ({
             ...state,
-            ...payload,
-            customInterval: !STATS_INTERVALS_DAYS.includes(payload.interval)
-                ? payload.interval / HOUR
-                : null,
+            interval: payload.interval,
             processingGetConfig: false,
         }),
 
@@ -37,7 +33,7 @@ const stats = handleActions(
         [actions.setStatsConfigFailure]: (state) => ({ ...state, processingSetConfig: false }),
         [actions.setStatsConfigSuccess]: (state, { payload }) => ({
             ...state,
-            ...payload,
+            interval: payload.interval,
             processingSetConfig: false,
         }),
 
@@ -95,8 +91,7 @@ const stats = handleActions(
         processingSetConfig: false,
         processingStats: true,
         processingReset: false,
-        interval: DAY,
-        customInterval: null,
+        interval: 1,
         ...defaultStats,
     },
 );

docker/dns-bind.awk

@@ -1,29 +0,0 @@
-/^[^[:space:]]/ { is_dns = /^dns:/ }
-
-/^[[:space:]]+bind_hosts:/ { if (is_dns) prev_line = FNR }
-
-/^[[:space:]]+- .+/ {
-    if (FNR - prev_line == 1) {
-        addrs[$2] = true
-        prev_line = FNR
-
-        if ($2 == "0.0.0.0" || $2 == "'::'") {
-            # Drop all the other addresses.
-            delete addrs
-            addrs[""] = true
-            prev_line = -1
-        }
-    }
-}
-
-/^[[:space:]]+port:/ { if (is_dns) port = $2 }
-
-END {
-    for (addr in addrs) {
-        if (match(addr, ":")) {
-            print "[" addr "]:" port
-        } else {
-            print addr ":" port
-        }
-    }
-}

docker/healthcheck.sh

@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# AdGuard Home Docker healthcheck script
-
-# Exit the script if a pipeline fails (-e), prevent accidental filename
-# expansion (-f), and consider undefined variables as errors (-u).
-set -e -f -u
-
-# Function error_exit is an echo wrapper that writes to stderr and stops the
-# script execution with code 1.
-error_exit() {
-	echo "$1" 1>&2
-
-	exit 1
-}
-
-agh_dir="/opt/adguardhome"
-readonly agh_dir
-
-filename="${agh_dir}/conf/AdGuardHome.yaml"
-readonly filename
-
-if ! [ -f "$filename" ]
-then
-    wget "http://127.0.0.1:3000" -O /dev/null -q || exit 1
-
-    exit 0
-fi
-
-help_dir="${agh_dir}/scripts"
-readonly help_dir
-
-# Parse web host
-
-web_url="$( awk -f "${help_dir}/web-bind.awk" "$filename" )"
-readonly web_url
-
-if [ "$web_url" = '' ]
-then
-    error_exit "no web bindings could be retrieved from $filename"
-fi
-
-# TODO(e.burkov):  Deal with 0 port.
-case "$web_url"
-in
-(*':0')
-    error_exit '0 in web port is not supported by healthcheck'
-    ;;
-(*)
-    # Go on.
-    ;;
-esac
-
-# Parse DNS hosts
-
-dns_hosts="$( awk -f "${help_dir}/dns-bind.awk" "$filename" )"
-readonly dns_hosts
-
-if [ "$dns_hosts" = '' ]
-then
-    error_exit "no DNS bindings could be retrieved from $filename"
-fi
-
-first_dns="$( echo "$dns_hosts" | head -n 1 )"
-readonly first_dns
-
-# TODO(e.burkov):  Deal with 0 port.
-case "$first_dns"
-in
-(*':0')
-    error_exit '0 in DNS port is not supported by healthcheck'
-    ;;
-(*)
-    # Go on.
-    ;;
-esac
-
-# Check
-
-# Skip SSL certificate validation since there is no guarantee the container
-# trusts the one used.  It should be safe to drop the SSL validation since the
-# current script intended to be used from inside the container and only checks
-# the endpoint availability, ignoring the content of the response.
-#
-# See https://github.com/AdguardTeam/AdGuardHome/issues/5642.
-wget --no-check-certificate "$web_url" -O /dev/null -q || exit 1
-
-test_fqdn="healthcheck.adguardhome.test."
-readonly test_fqdn
-
-# The awk script currently returns only port prefixed with colon in case of
-# unspecified address.
-case "$first_dns"
-in
-(':'*)
-    nslookup -type=a "$test_fqdn" "127.0.0.1${first_dns}" > /dev/null ||\
-    nslookup -type=a "$test_fqdn" "[::1]${first_dns}" > /dev/null ||\
-        error_exit "nslookup failed for $host"
-    ;;
-(*)
-    echo "$dns_hosts" | while read -r host
-    do
-        nslookup -type=a "$test_fqdn" "$host" > /dev/null ||\
-            error_exit "nslookup failed for $host"
-    done
-    ;;
-esac

docker/web-bind.awk

@@ -1,13 +0,0 @@
-# Don't consider the HTTPS hostname since the enforced HTTPS redirection should
-# work if the SSL check skipped.  See file docker/healthcheck.sh.
-/^bind_host:/ { host = $2 }
-
-/^bind_port:/ { port = $2 }
-
-END {
-    if (match(host, ":")) {
-        print "http://[" host "]:" port
-     } else {
-        print "http://" host ":" port
-    }
-}

go.mod

@@ -3,38 +3,34 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.19
 
 require (
-	github.com/AdguardTeam/dnsproxy v0.50.2
-	github.com/AdguardTeam/golibs v0.13.3
+	github.com/AdguardTeam/dnsproxy v0.48.3
+	github.com/AdguardTeam/golibs v0.13.1
 	github.com/AdguardTeam/urlfilter v0.16.1
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ameshkov/dnscrypt/v2 v2.2.7
-	github.com/bluele/gcache v0.0.2
+	github.com/ameshkov/dnscrypt/v2 v2.2.6
 	github.com/digineo/go-ipset/v2 v2.2.1
-	github.com/dimfeld/httptreemux/v5 v5.5.0
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/go-ping/ping v1.1.0
 	github.com/google/go-cmp v0.5.9
 	github.com/google/gopacket v1.1.19
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.3.0
-	github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb
-	github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86
+	github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8
 	github.com/kardianos/service v1.2.2
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
-	github.com/mdlayher/netlink v1.7.2
-	github.com/mdlayher/packet v1.1.2
-	// TODO(a.garipov): This package is deprecated; find a new one or use our
-	// own code for that.  Perhaps, use gopacket.
+	github.com/mdlayher/netlink v1.7.1
+	// TODO(a.garipov): This package is deprecated; find a new one or use
+	// our own code for that.  Perhaps, use gopacket.
 	github.com/mdlayher/raw v0.1.0
-	github.com/miekg/dns v1.1.54
-	github.com/quic-go/quic-go v0.35.1
-	github.com/stretchr/testify v1.8.4
+	github.com/miekg/dns v1.1.50
+	github.com/quic-go/quic-go v0.33.0
+	github.com/stretchr/testify v1.8.2
 	github.com/ti-mo/netfilter v0.5.0
 	go.etcd.io/bbolt v1.3.7
-	golang.org/x/crypto v0.10.0
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	golang.org/x/net v0.11.0
-	golang.org/x/sys v0.9.0
+	golang.org/x/crypto v0.6.0
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+	golang.org/x/net v0.8.0
+	golang.org/x/sys v0.6.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	howett.net/plist v1.0.0
@@ -45,22 +41,25 @@ require (
 	github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
 	github.com/ameshkov/dnsstamps v1.0.3 // indirect
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
+	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
-	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.10.0 // indirect
+	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
+	github.com/josharian/native v1.1.0 // indirect
+	github.com/mdlayher/packet v1.1.1 // indirect
+	github.com/mdlayher/socket v0.4.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.8.3 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-	github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
-	golang.org/x/tools v0.9.3 // indirect
+	github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
+	github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
+	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
 )